X-Git-Url: https://git.ucc.asn.au/?p=uccvend-snackrom.git;a=blobdiff_plain;f=ROM2%2Fmain.c;h=81919f03e3e5b9db33e3f0a29b3dc473c0a43958;hp=c2758019387da8443fa96bd909b820ac3937774e;hb=2e7a8beb908896930042bc0564fbd16f3e0b0b62;hpb=3781ef6863f304c8242fc1216cddbdbb0c74bebe

diff --git a/ROM2/main.c b/ROM2/main.c
index c275801..81919f0 100644
--- a/ROM2/main.c
+++ b/ROM2/main.c
@@ -2,10 +2,12 @@
 #include "keypad.h"
 #include "chime.h"
 #include "server.h"
+#include "coinmech.h"
 #include "vend.h"
 
 u16 uid;
 u16 pin;
+u8 selection;
 
 u16 scroll_timer;
 
@@ -29,10 +31,9 @@ bool uid_enter() {
 		uid = (uid*10) + (last_key%10);
 		set_char((last_key%10)+'0', 4+uidpos);
 	}
-	return 1;
+	return (uid!=0);
 }
 
-
 bool pin_enter() {
 	u8 pinpos;
 	/* We ask for a pin, display a PIN: prompt. PINs must be a 4 digit number.
@@ -41,8 +42,9 @@ bool pin_enter() {
 	 *
 	 * Also display X's on screen as the pin is entered.
 	 */
+	pin = 0;
 	set_msg("PIN?      ", WRAP_NONE);
-	for (pinpos = 1; pinpos <= 5; pinpos++) {
+	for (pinpos = 1; pinpos <= 4; pinpos++) {
 		keypad_getkey();
 		if (last_key == KEY_RESET) {
 			pin = 0;
@@ -54,8 +56,112 @@ bool pin_enter() {
 	return 1;
 }
 
+void make_request(u8 selection) {
+	set_msg("REQUESTING", WRAP_NONE); /* XXX: maybe this isn't needed? */
+	switch(server_request(uid, pin, selection)) {
+		case REQUEST_OK:
+			set_msg("THANK YOU!", WRAP_NONE);
+			break;
+		case REQUEST_NO_MONEY:
+			set_msg("NO MONEY!", WRAP_NONE);
+			break;
+		case REQUEST_SERVFAIL:
+			set_msg("SERV FAIL!", WRAP_NONE);
+			break;
+		case REQUEST_EMPTY:
+			set_msg("NONE LEFT!", WRAP_NONE);
+			break;
+		case REQUEST_INVAL:
+			set_msg(" BAD SELN ", WRAP_NONE);
+			break;
+	}
+	delay(1000);
+}
+
 void selection_menu() {
-	set_msg("ENTER SELECTION OR INSERT COINS", WRAP_SCROLL);
+	/* we have a valid username & PIN number */
+	/* either ask for a 2-digit selection, or wait for coins to be entered */
+	/* get the username somehow? */
+	set_msg("ENTER SELECTION OR INSERT COINS  ", WRAP_SCROLL);
+	selection = 0;
+	while(1) {
+		if (coin_value) { /* we have coins inserted */
+			int prev_coin = 0;
+			/* alternate between the price and a confirm message */
+			while (coin_value) {
+				if (prev_coin != coin_value) {
+					print_amount(coin_value);
+					append_msg("0: CONFIRM", WRAP_ALTERNATE);
+					prev_coin = coin_value;
+				}
+				keypad_read();
+				if (keypad_pressed()) {
+					switch (last_key) {
+						case KEY_RESET:
+							scroll_msg("PRESS COIN REFUND");
+							while (coin_value);
+							break;
+						case KEY_0:
+							switch (server_credit_account(uid, pin, coin_value)) {
+								case CREDIT_OK:
+									coin_eat();
+									set_msg(" SUCCESS! ", WRAP_NONE);
+									delay(1000);
+									break;
+								case CREDIT_FAIL:
+									set_msg(" FAILED!  " "PRESS COIN" "  REFUND  ",
+											WRAP_ALTERNATE);
+									while (coin_value);
+									break;
+							}
+							break;
+					}
+				}
+			}
+			/* coins were refunded */
+		}
+
+		if (selection) { /* half way through a selection */
+			keypad_read();
+			if (keypad_pressed()) {
+				switch (last_key) {
+					case KEY_RESET:
+						selection = 0;
+						break;
+					case 0:
+						break;
+					default:
+						selection = selection * 10 + (last_key%10);
+						make_request(selection);
+						selection = 0;
+				}
+			}
+		} else { /* else listen for the first key of a selection */
+			keypad_read();
+			if (keypad_pressed()) {
+				switch (last_key) {
+					case KEY_RESET:
+						return;
+					case 0:
+						break;
+					default:
+						selection = last_key%10;
+				}
+			}
+		}
+	}
+}
+
+void load_default_msg() {
+	/* FIXME: want this message to be changeable from the server */
+	set_msg("UNIVERSITY COMPUTER CLUB *** INSERT COINS OR USER-ID *** ",
+			WRAP_SCROLL);
+}
+
+void service_menu() {
+	while (door_open()) { /* don't quit until door is closed */
+
+	}
 }
 
 int main() {
@@ -67,9 +173,7 @@ int main() {
 	set_msg("   CLUB   ", WRAP_NONE);
 	delay(1000);
 
-	/* FIXME: want this message to be changeable from the server */
-	set_msg("UNIVERISTY COMPUTER CLUB *** INSERT COINS OR USER-ID ***",
-			WRAP_SCROLL);
+	load_default_msg();
 	while(1) {
 		/* this needs to be a relatively tight loop to make sure we catch
 		 * keypresses at the main menu
@@ -82,6 +186,7 @@ int main() {
 					switch (server_authenticate(uid, pin)) {
 						case AUTH_GOOD:
 							selection_menu();
+							break;
 						case AUTH_BAD:
 							set_msg(" BAD USER ", WRAP_NONE);
 							delay(1000);
@@ -100,7 +205,16 @@ int main() {
 				pin = 0;
 				/* move on */
 			}
+			load_default_msg();
+		}
+
+		/* test door switch   */
+		if (door_open()) {
+			service_menu();
+			load_default_msg();
 		}
+
+		/* check on coin mech */
 	}
 }