X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=ROM2%2Fmain_basic.c;h=ae25a79390b385c49d07c30991d4fa9535368522;hb=b3523cf99eff476642609ad6537e460595f84e72;hp=1f2f7d10640d80fc84f9665edd4a03ed2a023815;hpb=f617d42026fbf5d614c85686ba1f26eb47853658;p=uccvend-snackrom.git

diff --git a/ROM2/main_basic.c b/ROM2/main_basic.c
index 1f2f7d1..ae25a79 100644
--- a/ROM2/main_basic.c
+++ b/ROM2/main_basic.c
@@ -190,15 +190,15 @@ int main() {
 		if (door_open() != last_door_open) {
 			last_door_open = door_open();
 			send_door_msg(last_door_open);
+			chime_start();
 			if (last_door_open) {
-				chime_start();
 				set_msg("DOOR OPEND");
 			} else {
-				chime_start();
 				set_msg("DOOR CLOSE");
 			}
 		}
 
+		/*
 		if (rx_queue_state) {
 			switch (msg_buf[0]) {
 				case 'V':
@@ -220,12 +220,13 @@ int main() {
 					ping_pong();
 					break;
 				default:
-				/* shrug */
+					// shurg
 					send_nack();
 					break;
 			}
 			msg_clr();
 		}
+		*/
 
 		keypad_read();
 		if (keypad_pressed()) {
@@ -233,11 +234,29 @@ int main() {
 				cur_motor[0] = 0xff;
 			} else {
 				if (cur_motor[0]) {
+					u8 motor_num;
 					cur_motor[1] = last_key%10;
 					display_buf[1] = cur_motor[1]+'0';
 					set_msg(display_buf);
-					dispense_motor((cur_motor[0]%10)*10 + cur_motor[1]);
-					set_msg("THANK  YOU");
+
+					motor_num = cur_motor[0]%10;
+					motor_num *= 10;
+					motor_num += cur_motor[1];
+					switch (dispense_motor(motor_num)) {
+						case MOTOR_HOME_FAIL:
+							set_msg(" HOME FAIL ");
+							break;
+						case MOTOR_CURRENT_FAIL:
+							set_msg(" OVER CRNT ");
+							break;
+						case MOTOR_SUCCESS:
+							set_msg("THANK  YOU");
+							break;
+						default:
+							set_msg("ERRRRRRRR?");
+							break;
+					}
+
 					display_buf[0] = ' ';
 					display_buf[1] = ' ';
 					cur_motor[0] = 0xff;
@@ -251,9 +270,11 @@ int main() {
 			send_keypress(last_key);
 		}
 
+		/*
 		if (coin_value != last_coin_value) {
 			send_balance();
 			last_coin_value = coin_value;
 		}
+		*/
 	}
 }