X-Git-Url: https://git.ucc.asn.au/?p=uccvend-snackrom.git;a=blobdiff_plain;f=ROM2%2Fkeypad.c;h=5bd5e2ed3ee6352400e6d3a32b7615129b5e491b;hp=6c047544237eade5a6398035b19c5ccc2e7a5c07;hb=b14807a016c121bc79efd5702ffba33c1dbd9be2;hpb=ffaed3398a8ed1c381f0f3f316b4720caf025d22 diff --git a/ROM2/keypad.c b/ROM2/keypad.c index 6c04754..5bd5e2e 100644 --- a/ROM2/keypad.c +++ b/ROM2/keypad.c @@ -8,8 +8,6 @@ volatile bool new_key; /* first 8 from the first row, then 3 from the second row */ /* keys are 1-9, 0, reset */ -//const u8 keymap0[8] = {KEY_8, KEY_7, KEY_6, KEY_5, KEY_4, KEY_3, KEY_2, KEY_1}; -//const u8 keymap1[3] = {KEY_RESET, KEY_0, KEY_9}; const u8 keymap0[8] = {KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8}; const u8 keymap1[3] = {KEY_9, KEY_0, KEY_RESET}; @@ -18,7 +16,7 @@ const u8 keymap1[3] = {KEY_9, KEY_0, KEY_RESET}; /* reads the keypad and returns the bit number that was turned on in the shift * register (from 0..7). If no bits were turned on, it returns 8 (aka NO_KEY) */ -extern inline u8 keypad_read_row(u8 row) { +extern inline u8 keypad_read_row(const u8 row) { u8 i, num; if (row)