X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=ROM2%2Fkeypad.c;h=8ffa664e773a66511481802a2d37d4094f26d012;hb=27fb8a023fa0572ef4171624781460bc59537d49;hp=359e18929a501be7c2eb0737a20df570894df9d7;hpb=c99662693a4d79f65d406473647debbd33ec521e;p=uccvend-snackrom.git

diff --git a/ROM2/keypad.c b/ROM2/keypad.c
index 359e189..8ffa664 100644
--- a/ROM2/keypad.c
+++ b/ROM2/keypad.c
@@ -1,44 +1,81 @@
 #include "chime.h"
 #include "vend.h"
 #include "keypad.h"
+#include "display_basic.h"
 
-u8 last_key; /* the last key registered */
-bool new_key = 0;
+volatile u8 last_key; /* the last key registered */
+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};
 
+#define	NO_KEY	8
+
+/* 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) {
-	u8 i, num;
+	u8 i, j, num;
+
 	if (row)
 		bset((void*)&_io_ports[M6811_PORTD], PORTD_KEYPAD_ROW);
 	else
-		bclr((void*)&_io_ports[M6811_PORTD], ~PORTD_KEYPAD_ROW);
+		bclr((void*)&_io_ports[M6811_PORTD], PORTD_KEYPAD_ROW);
+
+	spi_enable();
+
+	bset_misc_output(A3800_KEYPAD_STROBE);
+	bclr_misc_output(A3800_KEYPAD_STROBE);
 
 	bclr_misc_output(A3800_DISPLAY_WRITE);  /* disable the display clock */
 
-	_io_ports[M6811_SPDR] = 0;
-	while(!(_io_ports[M6811_SPDR]&M6811_SPIE)); /* wait for completion */
+	/* _io_ports[M6811_SPDR] = 0; */
+	asm volatile (
+		"ldab #0\n"
+		"stab %0\n"
+		: "=m" (_io_ports[M6811_SPDR])
+		:
+		: "b"
+			);
+	while(!(_io_ports[M6811_SPSR]&M6811_SPIF)); /* wait for completion */
+
+	/* SPDR read to clear SPIF flag is performed below: */
+	i = _io_ports[M6811_SPDR];
 
-	for (i = _io_ports[M6811_SPDR], num = 0;
-		(i&0x1) == 0;
-		i=i>>1, num++);
+	/* print out the row & read in key in binary */
+	char msg_buf[11] = "XKXXXXXXXX";
+	msg_buf[0] = row?'1':'0';
+	for (j = 1, num = 0; num < 8; j = j << 1, num++) {
+		msg_buf[num+2] = (i & j)?'1':'0';
+	}
+	set_msg(msg_buf);
+
+	num = 0;
+	while (((i & 0x01) == 0) && (num < 8)) {
+		i = i >> 1;
+		num++;
+	}
+
+	spi_disable();
 
 	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 (!key) {
+	if (NO_KEY == key) {
 		key = keypad_read_row(1);
+		if (key <= 2)
+			key = keymap1[key];
+		else
+			key = 0;
+	} else
 		key = keymap0[key];
-	}
-	key = keymap1[key];
 
 	if (key != last_key) {
 		last_key = key;
@@ -55,8 +92,7 @@ bool keypad_pressed() {
 	return 1;
 }
 
-u8 keypad_getkey() {
-	while (!keypad_pressed())
-		keypad_read();
-	return last_key;
+void keypad_init() {
+	last_key = 0;
+	new_key = 0;
 }