Mercurial > public > mk2

changeset 436:8c0bb701b925

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author heinrichsweikamp
date Sat, 06 Aug 2011 08:28:44 +0200
parents 9597829f1e0c (current diff) efe06a146773 (diff)
children c54d32ec2133
files
diffstat 2 files changed, 53 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/french_text.asm	Thu Aug 04 22:35:12 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/french_text.asm	Sat Aug 06 08:28:44 2011 +0200
@@ -391,12 +391,12 @@
 	TCODE	 .40,	.130,	 "Attendez SVP!"			 ;303 Please wait!
 	TCODE	 .50,	.130,	 "Annulée!"					 ;304 Aborted
 ;@5 variant
-    TCODE    .0,    .0,      "DTR Réchap"                ;305 Future TTS            (=10 chars. Title for @5 customview).
+    TCODE    .0,    .0,      " Futur DTR"                ;305 Future TTS            (=10 chars. Title for @5 customview).
 ;
-    TCODE    .100,  .125,    "Sort.Sim"                  ;306 Quit Sim 				(=8char max. Quit Simulator mode)
+    TCODE    .100,  .125,    "Stop Sim"                  ;306 Quit Sim 				(=8char max. Quit Simulator mode)
 ;Dive interval
-    TCODE    .20,   .35,     "Intervalle: "              ;307 Interval:
-    TCODE    .0,    .0,      "Maintenant"                ;308 Now (7 chars min)
+    TCODE    .20,   .35,     "Intervale:"                ;307 Interval:
+    TCODE    .0,    .0,      "Non    "                   ;308 Now (7 chars min)
 	TCODE	 .108,	.112,	 "Moyenne"			 		 ;309 Average
 	TCODE	 .116,	.54,	 "Chrono"		 		 	 ;310 Stopwatch (BIG Stopwatch in Gauge mode)
 ;=============================================================================
--- a/code_part1/OSTC_code_asm_part1/menu.asm	Thu Aug 04 22:35:12 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/menu.asm	Sat Aug 06 08:28:44 2011 +0200
@@ -419,14 +419,31 @@
 
 	call	PLED_static_raw_data
 
+    
 	clrf	timeout_counter2
 	bcf		sleepmode
-	bcf		menubit2
 	bcf		menubit3
 	bsf		menubit
+	
+show_rawdata_loop:
+    rcall   show_rawdata_wait
+
+	btfsc	menubit2
+	bra     show_rawdata_next
+
+	btfsc	onesecupdate
+	call	PLED_update_raw_data
+
+	bcf		onesecupdate				; End of one second tasks, if any.
+
+    goto    show_rawdata_loop
+
+show_rawdata_wait:
+	bcf		menubit2
 	bcf		switch_left
 	bcf		switch_right
-show_rawdata_loop:
+
+show_rawdata_wait_1:
 	btfsc	uart_dump_screen                ; Asked to dump screen contains ?
 	call	dump_screen     			    ; Yes!
 
@@ -436,7 +453,7 @@
 	bsf		menubit2
 
 	btfsc	menubit2
-	bra		show_rawdata_exit
+	return
 
 	btfss	menubit
 	goto	restart						; exit menu, restart and enter surfmode
@@ -445,20 +462,43 @@
 	call	timeout_surfmode
 
 	btfsc	onesecupdate
-	call	PLED_update_raw_data
-
-	btfsc	onesecupdate
 	call	set_dive_modes
 
-	bcf		onesecupdate				; End of one second tasks
-
 	btfsc	sleepmode
 	bra		show_rawdata_exit			; Exit
 
 	btfsc	divemode
 	goto	restart						; exit menu, restart and enter divemode
 
-	bra		show_rawdata_loop
+	btfsc	onesecupdate
+	return
+
+	bra		show_rawdata_wait_1
+
+; Display blank/red/green/blue screens until click, to test OLED ageing.
+show_rawdata_next:
+    setf    WREG
+    WIN_BOX_COLOR   .0,.240,.0,.160
+    rcall   show_rawdata_screen_wait
+    movlw   color_red
+    WIN_BOX_COLOR   .0,.240,.0,.160
+    rcall   show_rawdata_screen_wait
+    movlw   color_green
+    WIN_BOX_COLOR   .0,.240,.0,.160
+    rcall   show_rawdata_screen_wait
+    movlw   color_blue
+    WIN_BOX_COLOR   .0,.240,.0,.160
+    rcall   show_rawdata_screen_wait
+    bra     show_rawdata_exit
+
+show_rawdata_screen_wait:
+    rcall   show_rawdata_wait
+	bcf		onesecupdate				; No dynamic update here...
+
+	btfsc	menubit2
+    return
+
+    bra     show_rawdata_screen_wait
 
 show_rawdata_exit:	
 	movlw	d'4'