Rearrange code to work around compiler parsing bugs

[uccvend-snackrom.git] / ROM2 / main_basic.c

diff --git a/ROM2/main_basic.c b/ROM2/main_basic.c
index 84372ce..a63c858 100644 (file)
--- a/ROM2/main_basic.c
+++ b/ROM2/main_basic.c
@@ -82,6 +82,7 @@ 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);
@@ -235,7 +236,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;
 }
 
@@ -442,12 +443,16 @@ 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];