X-Git-Url: https://git.ucc.asn.au/?p=uccvend-snackrom.git;a=blobdiff_plain;f=ROM2%2Fmain_basic.c;h=a6a8a155b576331c09034060224be66d75dcd97d;hp=1165326b3e0693eaa7e0e89770491c35fd2b802c;hb=24f4e50d8f5671b40d2662bbcd50e3859bcd5205;hpb=b0e717fbd07189603c7fcc51f55bc6f67119ead3

diff --git a/ROM2/main_basic.c b/ROM2/main_basic.c
index 1165326..a6a8a15 100644
--- a/ROM2/main_basic.c
+++ b/ROM2/main_basic.c
@@ -14,7 +14,7 @@
 #include "sci.h"
 #include "vend.h"
 #include "xmodem.h"
-//#include "sha1.h"
+#include "mic.h"
 
 u8 last_standalone;
 u8 last_switch_input;
@@ -63,6 +63,10 @@ void dispense_something() {
 	u8 slot;
 
 	if (check_standalone()) return;
+	if (must_verify() && !mic_verify((void*)sci_rx_buf)) {
+		send_string("019 Message verification failed." CRLF);
+		return;
+	}
 
 	if (my_strncmp("ALL", (char*)sci_rx_buf+1, 3)) {
 		char motor[3];
@@ -175,42 +179,56 @@ void send_door_msg(bool open) {
 		send_string(" door closed." CRLF);
 }
 
-u8 hexchar2u8(char b) {
-	if (b >= '0' && b <= '9') return b-'0';
-	if (b >= 'a' && b <= 'f') return b-'a'+0x0a;
-	if (b >= 'A' && b <= 'F') return b-'A'+0x0a;
-	return 0;
-}
-
-char nibble2hexchar(u8 b) {
-	if (b <= 9) return b+'0';
-	if (b >= 10 && b <= 15) return b+'A'-10;
-	return 'X';
-}
-
-u8 hex2u8(char msb, char lsb) {
-	return (hexchar2u8(msb) << 4) + hexchar2u8(lsb);
-}
-
-static char hexconv_buf[3];
-char* u82hex(u8 a) {
-	hexconv_buf[0] = nibble2hexchar((a&0xf0) >> 4);
-	hexconv_buf[1] = nibble2hexchar(a&0x0f);
-	hexconv_buf[2] = '\0';
-	return hexconv_buf;
-}
-
 void do_chime() {
 	if (check_standalone()) return;
 	if (sci_rx_buf[1] == '\0')
 		chime_start();
-	else if (sci_rx_buf[2] != '\0' && sci_rx_buf[3] == '\0')
+	else if (sci_rx_buf[1] == 'S') { /* synchronous beep */
+		if (sci_rx_buf[2] == '\0')
+			chime_start();
+		else if (sci_rx_buf[3] != '\0' && sci_rx_buf[4] == '\0')
+			chime_for(hex2u8(sci_rx_buf[2], sci_rx_buf[3]));
+		else {
+			send_string("510 Unknown chime duration." CRLF);
+			return;
+		}
+		while (chime_count); /* spin */
+		send_string("500 Chimed." CRLF);
+		return;
+	} else if (sci_rx_buf[2] != '\0' && sci_rx_buf[3] == '\0')
 		chime_for(hex2u8(sci_rx_buf[1], sci_rx_buf[2]));
 	else {
 		send_string("510 Unknown chime duration." CRLF);
 		return;
 	}
-	send_string("500 Chimed." CRLF);
+	send_string("500 Chime started." CRLF);
+	return;
+}
+
+void do_silence() {
+	if (check_standalone()) return;
+	if (sci_rx_buf[1] == '\0')
+		unchime_start();
+	else if (sci_rx_buf[1] == 'S') { /* synchronous beep */
+		if (sci_rx_buf[2] == '\0')
+			unchime_start();
+		else if (sci_rx_buf[3] != '\0' && sci_rx_buf[4] == '\0')
+			unchime_for(hex2u8(sci_rx_buf[2], sci_rx_buf[3]));
+		else {
+			send_string("511 Unknown silence duration." CRLF);
+			return;
+		}
+		while (unchime_count); /* spin */
+		send_string("501 Silenced." CRLF);
+		return;
+	} else if (sci_rx_buf[2] != '\0' && sci_rx_buf[3] == '\0')
+		unchime_for(hex2u8(sci_rx_buf[1], sci_rx_buf[2]));
+	else {
+		send_string("511 Unknown silence duration." CRLF);
+		return;
+	}
+	send_string("500 Silence started." CRLF);
+	return;
 }
 
 void print_switches(u8 prompted) {
@@ -235,7 +253,11 @@ void ping_pong() {
 }
 
 void send_prompt() {
-	send_string(is_standalone()?"$ ":"# ");
+	if (must_verify()) {
+		send_string(u82hex(mic_challenge >> 8));
+		send_string(u82hex(mic_challenge & 0xff));
+	}
+	send_string(is_standalone()?"% ":"# ");
 }
 
 void about() {
@@ -324,6 +346,9 @@ void getrom() {
 	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(" with signature ");
 	s[0] = _rom_src_data[0];
 	s[1] = _rom_src_data[1];
@@ -333,7 +358,10 @@ void getrom() {
 	send_string(CRLF " Type YES to download rom.tar.bz2 via XMODEM: ");
 	msg_clr();
 	while (!sci_have_packet); /* spin */
-	if (!my_strncmp("YES", (char*)sci_rx_buf, 3)) return;
+	if (!my_strncmp("YES", (char*)sci_rx_buf, 3)) {
+		send_string(CRLF "Transfer cancelled." CRLF);
+		return;
+	}
 
 	sci_init();
 	sci_doing_xmodem = 1;
@@ -346,16 +374,19 @@ void getrom() {
 	char *end = (char*)_rom_src_data+_rom_src_len;
 	bool aborted = 0;
 	while (1) {
-		if (!xmodem_send_packet((char*)p, 128)) {
-			aborted = 1;
-			break;
-		}
-		p += 128;
 		if (p + 128 > end) {
 			/* send partial packet */
 			if (!xmodem_send_packet((char*)p, end-p)) aborted = 1;
 			break;
+		} if ((u16)p == 0xb600) {
+			/* we have an eeprom here. skip it. */
+			p += 0x0200;
+			continue;
+		} else if (!xmodem_send_packet((char*)p, 128)) {
+			aborted = 1;
+			break;
 		}
+		p += 128;
 	}
 
 	xmodem_finish_xfer();
@@ -397,7 +428,6 @@ int main() {
 
 	set_msg("  CRUEL   ");
 
-	//comm_init();
 	//coinmech_init();
 	sci_init();
 	keypad_init();
@@ -412,6 +442,9 @@ int main() {
 	chime_start();
 
 	send_string("5N4X0RZ R US" CRLF);
+
+	mic_challenge = 0;
+	mic_set_secret("ABCDEFGH12345678");
 	
 	last_standalone = is_standalone();
 	if (last_standalone)
@@ -433,7 +466,8 @@ int main() {
 			last_door_open = door_open();
 			send_door_msg(last_door_open);
 			chime_start();
-			set_msg(last_door_open?"DOOR OPEN ":"DOOR CLOSE");
+			if (is_standalone())
+				set_msg(last_door_open?"DOOR OPEN ":"DOOR CLOSE");
 		}
 
 		if (last_standalone != is_standalone()) {
@@ -455,11 +489,6 @@ int main() {
 		}
 
 		if (sci_have_packet) {
-			if (must_verify()) {
-				//SHA1_Init(&ctx);
-				//SHA1_Update(&ctx, sci_rx_buf, my_strlen(sci_rx_buf));
-				//SHA1_Final(sha1_digest, &ctx);
-			}
 			switch (sci_rx_buf[0]) {
 				case '\0':
 				case '#':
@@ -480,6 +509,9 @@ int main() {
 				case 'B': 
 					do_chime();
 					break;
+				case 'C': 
+					do_silence();
+					break;
 				case 'P':
 					ping_pong();
 					break;