more changes

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

diff --git a/ROM2/main.c b/ROM2/main.c
index 2960c52..0026edc 100644 (file)
--- a/ROM2/main.c
+++ b/ROM2/main.c
@@ -30,10 +30,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.
@@ -57,6 +56,7 @@ bool pin_enter() {
 }
 
 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);
@@ -84,7 +84,7 @@ void selection_menu() {
        set_msg("ENTER SELECTION OR INSERT COINS  ", WRAP_SCROLL);
        selection = 0;
        while(1) {
-               if (coin_value) {
+               if (coin_value) { /* we have coins inserted */
                        int prev_coin = 0;
                        /* alternate between the price and a confirm message */
                        while (coin_value) {
@@ -97,7 +97,7 @@ void selection_menu() {
                                if (keypad_pressed()) {
                                        switch (last_key) {
                                                case KEY_RESET:
-                                                       coin_refund();
+                                                       scroll_msg("PRESS COIN REFUND");
                                                        goto reset;
                                                case KEY_0:
                                                        switch (server_credit_account(uid, pin, coin_value)) {