checkatleasts have to be in descending order

diff --git a/iwjpictest/harness.asm b/iwjpictest/harness.asm
index 6d6c7857337160142a480ccfb413f85c47d348f1..09716c18fd824e7cf038d5b2a95fa8b11376c42c 100644 (file)
--- a/iwjpictest/harness.asm
+++ b/iwjpictest/harness.asm
@@ -166,14 +166,21 @@ check_last set minvalue
        checkequal      'Z',    command_trislat_z
        checkequal      'T',    command_trislat_t
 
+       ; these checkatleast ranges have to be in descending
+       ; order because of the way that checkatleast works
+
+       checkatleast    'f'+1, command_ifnot_letterhexdigit
+       checkatleast    'a', command_letterhexdigit
+command_ifnot_letterhexdigit
+
        checkatleast    'E'+1, command_ifnot_portaddr
        checkatleast    'A', command_portaddr
 command_ifnot_portaddr
 
-       checkatleast    'f'+1, command_wrong
-       checkatleast    'a', command_letterhexdigit
-       checkatleast    '9'+1, command_wrong
+       checkatleast    '9'+1, command_ifnot_digit
        checkatleast    '0', command_digit
+command_ifnot_digit
+
 command_wrong
        mov_lw          '?'
        rcall           serial_write_char