FIX: off by one error, when checking key bits

[uccvend-snackrom.git] / ROM2 / keypad.c

diff --git a/ROM2/keypad.c b/ROM2/keypad.c
index 8f50c19..0e03095 100644 (file)
--- a/ROM2/keypad.c
+++ b/ROM2/keypad.c
@@ -3,7 +3,7 @@
 #include "keypad.h"
 
 u8 last_key; /* the last key registered */
-bool new_key = 0;
+bool new_key;
 
 /* first 8 from the first row, then 3 from the second row */
 /* keys are 1-9, 0, reset */
@@ -28,20 +28,20 @@ extern inline u8 keypad_read_row(u8 row) {
        while(!(_io_ports[M6811_SPDR]&M6811_SPIE)); /* wait for completion */
 
        for (i = _io_ports[M6811_SPDR], num = 0;
-               (i&0x1 == 0) && (num < 7);
+               ((i&0x1) == 0) && (num < 8);
                i=i>>1, num++);
 
        return num;
 }
 
-/* returns a key 1..10 or 11 for reset */
+/* sets last_key to 1..10 or 11 for reset */
 void keypad_read() {
        /* FIXME: need to do debouncing of some sort? */
        u8 key;
        key = keypad_read_row(0);
        if (NO_KEY == key) {
                key = keypad_read_row(1);
-               if (key >= 0 && key <= 2)
+               if (key <= 2)
                        key = keymap1[key];
                else
                        key = 0;
@@ -62,3 +62,8 @@ bool keypad_pressed() {
        new_key = 0;
        return 1;
 }
+
+void keypad_init() {
+       last_key = 0;
+       new_key = 0;
+}