From: ian <ian>
Date: Sun, 3 Jul 2005 20:02:12 +0000 (+0000)
Subject: checkatleasts have to be in descending order
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=b3d7acd247c767f60d263afded7e2dd1eb2e922d;p=trains.git

checkatleasts have to be in descending order
---

diff --git a/iwjpictest/harness.asm b/iwjpictest/harness.asm
index 6d6c785..09716c1 100644
--- 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