X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=ROM2%2Fmain.c;h=61de403bc86b000cf7c6f7436f7dcd653cb18ae1;hb=84d9b234f38e34e5a72faed1badf2044191db18a;hp=0026edcde149e7695d6734acc673bf4802d40349;hpb=65f351eccb34b310c15e3cd38dcae5b152187092;p=uccvend-snackrom.git

diff --git a/ROM2/main.c b/ROM2/main.c
index 0026edc..61de403 100644
--- a/ROM2/main.c
+++ b/ROM2/main.c
@@ -2,6 +2,7 @@
 #include "keypad.h"
 #include "chime.h"
 #include "server.h"
+#include "coinmech.h"
 #include "vend.h"
 
 u16 uid;
@@ -9,6 +10,7 @@ u16 pin;
 u8 selection;
 
 u16 scroll_timer;
+u16 coin_value;
 
 bool uid_enter() {
 	u8 uidpos;
@@ -98,18 +100,19 @@ void selection_menu() {
 					switch (last_key) {
 						case KEY_RESET:
 							scroll_msg("PRESS COIN REFUND");
-							goto reset;
+							while (coin_value);
+							break;
 						case KEY_0:
 							switch (server_credit_account(uid, pin, coin_value)) {
 								case CREDIT_OK:
 									coin_eat();
-									set_msg(" SUCCESS! ");
+									set_msg(" SUCCESS! ", WRAP_NONE);
 									delay(1000);
 									break;
 								case CREDIT_FAIL:
-									coin_refund();
-									set_msg("  FAILED! ");
-									delay(1000);
+									set_msg(" FAILED!  " "PRESS COIN" "  REFUND  ",
+											WRAP_ALTERNATE);
+									while (coin_value);
 									break;
 							}
 							break;
@@ -130,7 +133,7 @@ void selection_menu() {
 						break;
 					default:
 						selection = selection * 10 + (last_key%10);
-						make_request(uid, pin, selection);
+						make_request(selection);
 						selection = 0;
 				}
 			}