Mercurial > public > hwos_code

diff src/tft_outputs.asm @ 260:e1cd6848863d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
increase immunity against false Qi data
author heinrichsweikamp
date Tue, 24 Mar 2015 19:48:17 +0100
parents 5b4ef0b9090d
children e2fd372a917a
line wrap: on
line diff
--- a/src/tft_outputs.asm	Mon Mar 23 19:58:19 2015 +0100
+++ b/src/tft_outputs.asm	Tue Mar 24 19:48:17 2015 +0100
@@ -2460,15 +2460,33 @@
 TFT_serial:		
     WIN_TINY	.5,.225
     STRCPY  "OSTC"                    ; Won't translate that...
-    btfsc   rechargeable
+
+    movlw   0x0A
+    cpfseq  hardware_flag
     bra     TFT_serial2
     STRCAT  "3 #"
+    bra     TFT_serial_common
+TFT_serial2:
+    movlw   0x05
+    cpfseq  hardware_flag
     bra     TFT_serial3
-TFT_serial2:
     STRCAT  " cR #"
+    bra     TFT_serial_common
 TFT_serial3:
+    movlw   0x11
+    cpfseq  hardware_flag
+    bra     TFT_serial4
+    STRCAT  "2 #"
+    bra     TFT_serial_common
+TFT_serial4:
+    movlw   0x1A
+    cpfseq  hardware_flag
+    bra     TFT_serial5
+    STRCAT  "3 #"
+;    bra     TFT_serial_common
+TFT_serial5:
+TFT_serial_common:
     rcall   TFT_cat_serial
-    
     STRCAT  " v"
     WIN_COLOR   color_greenish
     rcall   TFT_cat_firmware