X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=ROM2%2Fmain.c;h=81919f03e3e5b9db33e3f0a29b3dc473c0a43958;hb=2b2e02c163f430f0745e5d7ed081fb7c65f85fc3;hp=0026edcde149e7695d6734acc673bf4802d40349;hpb=71e8027de3a3694e5b763657dcd30e85ed5b85c0;p=uccvend-snackrom.git diff --git a/ROM2/main.c b/ROM2/main.c index 0026edc..81919f0 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; @@ -98,18 +99,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 +132,7 @@ void selection_menu() { break; default: selection = selection * 10 + (last_key%10); - make_request(uid, pin, selection); + make_request(selection); selection = 0; } }