X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=ROM2%2Fmain_basic.c;h=0f9d3eab01f5bddf7e057d16dc192a0b074fdbcf;hb=HEAD;hp=3896b3e8d4777d0194f547c3d615ecba5c7c41fd;hpb=2e98bf59fc918f4e3d0dcfda51b381c8ef853746;p=uccvend-snackrom.git

diff --git a/ROM2/main_basic.c b/ROM2/main_basic.c
index 3896b3e..0f9d3ea 100644
--- a/ROM2/main_basic.c
+++ b/ROM2/main_basic.c
@@ -4,8 +4,7 @@
  * and snacks.
  */
 
-#define VERSION_STRING "V 20040624"
-
+#include "version.h"
 #include "display_basic.h"
 #include "keypad.h"
 #include "chime.h"
@@ -82,10 +81,11 @@ void dispense_something() {
 		send_string("102 Vend all motors starting." CRLF);
 		for (motor[0] = '0'; motor[0] <= '9'; motor[0]++) {
 			for (motor[1] = '0'; motor[1] <= '9'; motor[1]++) {
+				if (motor[1] == '5') continue; /* there is now row 5 */
 				send_string("101 Vending ");
 				send_string(motor);
 				send_string(CRLF);
-				motor_reply(dispense_motor(motor[0]*10+motor[1]));
+				motor_reply(dispense_motor((motor[0]-'0')*10+(motor[1]-'0')));
 			}
 		}
 		send_string("102 Vend all motors complete." CRLF);
@@ -175,6 +175,20 @@ void send_keypress(u8 key) {
 	send_string(" key." CRLF);
 }
 
+void send_timer() {
+	/* send a packet of the form KX with X being the key, or R for reset */
+	unsigned int t=get_timer_counter();
+
+	send_string("013 ");
+	sci_tx_buf[0] = '0'+(t/10000)%10;
+	sci_tx_buf[1] = '0'+(t/1000)%10;
+	sci_tx_buf[2] = '0'+(t/100)%10;
+	sci_tx_buf[3] = '0'+(t/10)%10;
+	sci_tx_buf[4] = '0'+t%10;
+	sci_tx_buf[5] = 0;
+	send_buffer(1);
+}
+
 void send_door_msg(bool open) {
 	if (is_standalone()) return;
 	sci_tx_buf[0] = '4';
@@ -235,7 +249,7 @@ void do_silence() {
 		send_string("511 Unknown silence duration." CRLF);
 		return;
 	}
-	send_string("500 Silence started." CRLF);
+	send_string("501 Silence started." CRLF);
 	return;
 }
 
@@ -354,19 +368,18 @@ void about() {
 		return;
 	}
 	send_string(
-		"-----------------------------------------------------------------" CRLF
-		"    ROM2 (C) 2004 Bernard Blackham <dagobah@ucc.gu.uwa.edu.au>" CRLF
-		"-----------------------------------------------------------------" CRLF
-		"                                        Revision " VERSION_STRING CRLF
-		"" CRLF
+		CRLF
+		" ROM2 (C) 2004 Bernard Blackham <dagobah@ucc.gu.uwa.edu.au>" CRLF
+		" Revision: " VERSION_STRING "  Built: " DATEBUILT_STRING CRLF "" CRLF CRLF
 		"   This snack machine was brought to you by " CRLF
 		"    Bernard Blackham" CRLF
-		"    Mark Tearle" CRLF
 		"    Harry McNally" CRLF
+		"    Mark Tearle" CRLF
 		"    Michal Gornisiewicz" CRLF
+		"    Nick Bannon" CRLF
 		"    and others." CRLF
 		"" CRLF
-		" Another UCC project in action.         http://www.ucc.asn.au/" CRLF
+		" Another UCC project in action.      http://www.ucc.asn.au/" CRLF
 	);
 }
 
@@ -406,6 +419,12 @@ void moo() {
 	);
 }
 
+void identify() {
+	send_string(
+		"086 ROM " VERSION_STRING " " DATEBUILT_STRING CRLF
+	);
+}
+
 void help() {
 	send_string(
 		"Valid commands are:" CRLF
@@ -416,7 +435,8 @@ void help() {
 		" ECHO {ON|OFF} turn echo on or off" CRLF
 		" GETROM        download the ROM source code using xmodem" CRLF
 		" H[...]        this help screen" CRLF
-		"*JUMPxxxx      jumps to a subroute at location xxxx" CRLF
+		" IDENTIFY      report ROM version" CRLF
+		"*JUMPxxxx      jumps to a subroutine at location xxxx" CRLF
 		"*PEEKxxxx      returns the value of the byte at location xxxx" CRLF
 		"*POKExxxxyy    sets the value of location xxxx to yy" CRLF
 		" PING          pongs" CRLF
@@ -424,6 +444,7 @@ void help() {
 		"+Vnn           vend an item" CRLF
 		"+VALL          vend all items" CRLF
 		"*Wxxxxxxxxxxxx set a new password for authenticated vends. xxx=16 chars" CRLF
+		"               password will be converted to uppercase" CRLF
 		"" CRLF
 		"Very few functions are available when the machine is in standalone " CRLF
 		"mode (DIP SW 1 is set)" CRLF
@@ -441,19 +462,23 @@ void getrom() {
 		return;
 	}
 	char s[4];
+	
+	u16 rom_addr;
+	rom_addr = (u16)(&_rom_src_data);
+
 	send_string("Writing to serial port (maybe). Size is 0x");
 	send_string(u82hex(_rom_src_len >> 8));
 	send_string(u82hex(_rom_src_len & 0xff));
 	send_string("@0x");
-	send_string(u82hex((u16)(&_rom_src_data) >> 8));
-	send_string(u82hex((u16)(&_rom_src_data) & 0xff));
+	send_string(u82hex(rom_addr >> 8));
+	send_string(u82hex(rom_addr & 0xff));
 	send_string(" with signature ");
 	s[0] = _rom_src_data[0];
 	s[1] = _rom_src_data[1];
 	s[2] = _rom_src_data[2];
 	s[3] = '\0';
 	send_string(s);
-	send_string(CRLF " Type YES to download rom.tar.bz2 via XMODEM: ");
+	send_string(CRLF " Type YES to download rom.tar.lz via XMODEM: ");
 	msg_clr();
 	while (!sci_have_packet); /* spin */
 	if (!my_strncmp("YES", (char*)sci_rx_buf, 3)) {
@@ -538,8 +563,6 @@ int main() {
 
 	send_string("5N4X0RZ R US" CRLF);
 
-	mic_challenge = 0;
-	
 	last_standalone = is_standalone();
 	if (last_standalone)
 		cur_motor[0] = 0xff;
@@ -583,6 +606,7 @@ int main() {
 		}
 
 		if (sci_have_packet) {
+			send_string(CRLF);
 			switch (sci_rx_buf[0]) {
 				case '\0':
 				case '#':
@@ -609,6 +633,9 @@ int main() {
 				case 'H':
 					help();
 					break;
+				case 'I':
+					identify();
+					break;
 				case 'M':
 					moo();
 					break;
@@ -689,6 +716,7 @@ int main() {
 				}
 			} else
 				send_keypress(last_key);
+				send_timer();
 		}
 
 		/*