Mercurial > public > mk2

changeset 687:a8a36c85e031

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ignore screenshots with display1 (for now)
author heinrichsweikamp
date Sat, 26 Jan 2013 16:25:19 +0100
parents 8ffbd5cb4b42
children c04e5c18acf9
files code_part1/OSTC_code_asm_part1/display_lowlevel.asm code_part1/OSTC_code_asm_part1/dump_screen.asm
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/display_lowlevel.asm	Sat Jan 26 14:36:26 2013 +0100
+++ b/code_part1/OSTC_code_asm_part1/display_lowlevel.asm	Sat Jan 26 16:25:19 2013 +0100
@@ -764,6 +764,9 @@
 ; NOTE: you should "setf TRISD" before calling this function,
 ;       to make PortD an input port...
 DISP_DataRead:
+    movff   win_flags,WREG          ; Display1? win_flags is in bank0...
+    btfsc   WREG,1                  ; Display1?
+    return                          ; Yes, done.
 	bsf		DISPLAY_rs					; Data register.
 	bcf		DISPLAY_e_nwr              ; Read enable.
 	nop
--- a/code_part1/OSTC_code_asm_part1/dump_screen.asm	Sat Jan 26 14:36:26 2013 +0100
+++ b/code_part1/OSTC_code_asm_part1/dump_screen.asm	Sat Jan 26 16:25:19 2013 +0100
@@ -45,7 +45,9 @@
 	bsf		    LED_blue                ; LEDusb ON
 	call		rs232_wait_tx           ; wait for UART
 
-    call        dump_screen_0
+    movff       win_flags,WREG          ; BEWARE: bank0 bit-test
+    btfss       WREG,1                  ; Display1?
+    call        dump_screen_0           ; No, dump screen
 
 	bcf		    no_sensor_int           ; Restore Sensor Interrupt
 	bcf			LED_blue                ; Clear led