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

diff --git a/ROM2/main_basic.c b/ROM2/main_basic.c
index d848401..ae25a79 100644
--- a/ROM2/main_basic.c
+++ b/ROM2/main_basic.c
@@ -138,35 +138,26 @@ void ping_pong() {
 	send_packet();
 }
 
-int main() {
-	u16 last_coin_value;
-	bool last_door_open;
-	int display_pos;
-	unsigned int i;
-	char display_buf[11];
-	for (display_pos = 0; display_pos < 11; display_pos++)
-		display_buf[display_pos] = '\0';
-	display_pos = 0;
+u16 last_coin_value;
+bool last_door_open;
+char display_buf[11];
+/* cur_motor[0] is 0 for nothing, or 1..10, or 0xff to say redraw.
+ * cur_motor[1] is 0..9 and only meaningful is cur_motor[0] != 0. */
+u8 cur_motor[2];
 
-	delay(1000);
+int main() {
+	u8 i;
+	for (i = 0; i < 11; i++)
+		display_buf[i] = ' ';
+	display_buf[10] = '\0';
 
-	chime_on();
-	for (i = 0; i < 40000; i++) {}
-	chime_off();
-	for (i = 0; i < 20000; i++) {}
-	chime_on();
-	for (i = 0; i < 60000; i++) {}
-	
 	changer_output = 0x7f;
-	//_io_ports[M6811_PORTA] = 0xc8; /* for talking to coin mech */
-	_io_ports[M6811_PORTA] = 0xc0; /* for talking to serial port */
+	_io_ports[M6811_PORTA] = 0xc0; /* display on. talking to serial port */
 	_io_ports[M6811_DDRA] = 0xfc;
 	_io_ports[M6811_DDRD] = 0x3e;
 	_io_ports[M6811_SPCR] = 0x12;
 	set_misc_output(0x00);
 	
-	chime_off(); /* mainly for debugging */
-
 	display_init();
 	set_msg(" HELLO    ");
 
@@ -175,42 +166,39 @@ int main() {
 	comm_init();
 	coinmech_init();
 	keypad_init();
-
-	chime_count = 100;
-	while (chime_count != 0);
-
-	set_msg("  CRUEL   ");
-
 	last_coin_value = 0;
 	last_door_open = 0;
 
-	dispense_motor(22);
+	delay(1000);
+
+	set_msg("  CRUEL   ");
 
-	chime_count = 50;
-	while (chime_count != 0);
+	delay(1000);
 
 	set_msg("   WORLD  ");
 	delay(1000);
-	set_msg("*5N4X0RZ* ");
-	delay(1000);
 
+	chime_start();
+
+	cur_motor[0] = 0xff;
 	while(1) {
+		if (cur_motor[0] == 0xff) { /* signal to say redraw screen */
+			set_msg("*5N4X0RZ* ");
+			cur_motor[0] = 0;
+		}
+
 		if (door_open() != last_door_open) {
 			last_door_open = door_open();
 			send_door_msg(last_door_open);
+			chime_start();
 			if (last_door_open) {
-				chime_on();
 				set_msg("DOOR OPEND");
-				delay(100);
-				chime_off();
 			} else {
-				chime_on();
 				set_msg("DOOR CLOSE");
-				delay(100);
-				chime_off();
 			}
 		}
 
+		/*
 		if (rx_queue_state) {
 			switch (msg_buf[0]) {
 				case 'V':
@@ -232,29 +220,61 @@ int main() {
 					ping_pong();
 					break;
 				default:
-				/* shrug */
+					// shurg
 					send_nack();
 					break;
 			}
 			msg_clr();
 		}
+		*/
 
 		keypad_read();
 		if (keypad_pressed()) {
-			if (last_key == KEY_RESET)
-				display_buf[display_pos] = 'R';
-			else
-				display_buf[display_pos] = '0'+(last_key%10);
-			display_pos++;
-			display_pos %= 10;
-			set_msg(display_buf);
+			if (last_key == KEY_RESET) {
+				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);
+
+					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;
+					delay(500);
+				} else {
+					cur_motor[0] = last_key;
+					display_buf[0] = (last_key%10)+'0';
+					set_msg(display_buf);
+				}
+			}
 			send_keypress(last_key);
 		}
 
+		/*
 		if (coin_value != last_coin_value) {
 			send_balance();
 			last_coin_value = coin_value;
 		}
+		*/
 	}
 }
-