From: Bernard Blackham <dagobah@ucc.asn.au>
Date: Thu, 24 Jun 2004 11:06:49 +0000 (+0000)
Subject: A bunch of UI glitches and silly errors.
X-Git-Tag: ROMW
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=4155996fc1643ebf9f53b17fd0e9ad8782728a58;p=uccvend-snackrom.git

A bunch of UI glitches and silly errors.
---

diff --git a/ROM2/main_basic.c b/ROM2/main_basic.c
index 3896b3e..4f347bf 100644
--- a/ROM2/main_basic.c
+++ b/ROM2/main_basic.c
@@ -85,7 +85,7 @@ void dispense_something() {
 				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);
@@ -424,6 +424,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
@@ -538,8 +539,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 +582,7 @@ int main() {
 		}
 
 		if (sci_have_packet) {
+			send_string(CRLF);
 			switch (sci_rx_buf[0]) {
 				case '\0':
 				case '#':
diff --git a/ROM2/src2asm.pl b/ROM2/src2asm.pl
index b723c6d..0f41a71 100644
--- a/ROM2/src2asm.pl
+++ b/ROM2/src2asm.pl
@@ -18,7 +18,7 @@ my $a;
 while (read STDIN,$a,1) {
 	if ($origin+$size == $hole_start) {
 		for($i = 0; $i < $hole_size; $i++) {
-			print "\t.byte 0xff\n";
+			print "\t.byte 0x00\n";
 		}
 		$size += $hole_size;
 	}