diff src/testmode.asm @ 94:f2201aa374db

BUGFIX: compass calibration does now timeout automatically after 60s BUGFIX: decoplan re-calculation in bailout case
author heinrichsweikamp
date Tue, 22 Apr 2014 12:59:14 +0200
parents 917393caf559
children e3ac5b2021bc
line wrap: on
line diff
--- a/src/testmode.asm	Thu Apr 17 10:28:04 2014 +0200
+++ b/src/testmode.asm	Tue Apr 22 12:59:14 2014 +0200
@@ -178,11 +178,11 @@
     bra         $-4
 
     call	TFT_standard_color
-	WIN_SMALL	.0,.215
-    STRCPY_TEXT_PRINT  tExit
+;	WIN_SMALL	.0,.215
+;    STRCPY_TEXT_PRINT  tExit
     WAITMS  d'255'
     WAITMS  d'255'
-    movlw   .8                          ; Gain init
+    movlw   .7                          ; Gain init
     movff   WREG,opt_compass_gain
 compass_calibration_gainset:            ; Reduce the gain, set bank here!
     banksel opt_compass_gain
@@ -292,14 +292,17 @@
     btfsc	sleepmode					; Sleepmode active?
     bra     compass_calibration_exit    ; Yes, exit
 
-    btfsc   switch_left                 ; Button pressed?
-    bra     compass_calibration_exit    ; Yes, exit
+;    btfsc   switch_left                 ; Button pressed?
+;    bra     compass_calibration_exit    ; Yes, exit
 
     btfss	onesecupdate				; do every second tasks?
     bra     compass_calibration_loop2   ; no, loop here
 
-	movlw	.240
+	movlw	.60
     call	timeout_testmode			; check timeout
+    movlw   .60
+    call    TFT_show_timeout_testmode   ; Show the timeout
+
     bcf     onesecupdate                ; clear flag
 
     bra     compass_calibration_loop2   ; loop here