X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=ROM2%2Fkeypad.c;h=359e18929a501be7c2eb0737a20df570894df9d7;hb=7a70df954df9999622924660001197b245675ba2;hp=e87715d1df1ba33885db817af61a601cd83b941a;hpb=cef1445c4f1ebaa38f9e6561b4fd15f164a27dcd;p=uccvend-snackrom.git

diff --git a/ROM2/keypad.c b/ROM2/keypad.c
index e87715d..359e189 100644
--- a/ROM2/keypad.c
+++ b/ROM2/keypad.c
@@ -1,19 +1,21 @@
+#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 */
-const u8 keymap0[8] = {8, 7, 6, 5, 4, 3, 2, 1};
-const u8 keymap1[3] = {11, 10, 9};
+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};
 
-extern inline int keypad_read_row(int row) {
-	int i, num;
+extern inline u8 keypad_read_row(u8 row) {
+	u8 i, num;
 	if (row)
-		_io_ports[M6811_PORTD] |= PORTD_KEYPAD_ROW;
+		bset((void*)&_io_ports[M6811_PORTD], PORTD_KEYPAD_ROW);
 	else
-		_io_ports[M6811_PORTD] &= ~PORTD_KEYPAD_ROW;
+		bclr((void*)&_io_ports[M6811_PORTD], ~PORTD_KEYPAD_ROW);
 
 	bclr_misc_output(A3800_DISPLAY_WRITE);  /* disable the display clock */
 
@@ -27,18 +29,34 @@ 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;
+	u8 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;
+}
+
+u8 keypad_getkey() {
+	while (!keypad_pressed())
+		keypad_read();
+	return last_key;
+}