More keypad fixes.

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

diff --git a/ROM2/keypad.c b/ROM2/keypad.c
index e87715d..b36b326 100644 (file)
--- a/ROM2/keypad.c
+++ b/ROM2/keypad.c
@@ -1,7 +1,9 @@
+#include "chime.h"
 #include "vend.h"
+#include "keypad.h"
 
 u8 last_key; /* the last key registered */
-u8 curr_key; /* the key currently being held down */
+bool new_key = 0;
 
 /* first 8 from the first row, then 3 from the second row */
 /* keys are 1-9, 0, reset */
@@ -27,18 +29,28 @@ extern inline int keypad_read_row(int row) {
        return num;
 }
 
-/* returns a key 0..9 or 11 for reset */
+/* returns a key 1..10 or 11 for reset */
 void keypad_read() {
        /* FIXME: need to do debouncing of some sort? */
        int key;
        key = keypad_read_row(0);
        if (!key) {
                key = keypad_read_row(1);
-               curr_key = keymap0[key];
+               key = keymap0[key];
        }
-       curr_key = keymap1[key];
-
-       if (curr_key != last_key) {
-               last_key = curr_key;
+       key = keymap1[key];
+
+       if (key != last_key) {
+               last_key = key;
+               if (key != 0) {
+                       new_key = 1;
+                       chime_start();
+               }
        }
 }
+
+bool keypad_pressed() {
+       if (!new_key) return 0;
+       new_key = 0;
+       return 1;
+}