Mercurial > public > mk2

changeset 313:11be2470b9eb @5 variant

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix @5 preventing main computation New display style New display deco_state in debug mode.
author JeanDo
date Tue, 03 May 2011 15:54:09 +0200
parents b7e4e74c0e17
children c61d94186f8f
files code_part1/OSTC_code_asm_part1/divemode.asm code_part1/OSTC_code_asm_part1/pled_outputs.asm
diffstat 2 files changed, 21 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/divemode.asm	Tue May 03 00:52:42 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/divemode.asm	Tue May 03 15:54:09 2011 +0200
@@ -456,6 +456,11 @@
 	return
 
  	ostc_debug	'B'		; Sends debug-information to screen if debugmode active
+    ; Send nes state to screen, if debugmode active	
+	movff   char_O_deco_status,WREG ; Status before call
+	addlw   '0'                     ; Convert to ascii char
+	call    ostc_debug1             ; and send.
+
 	call	divemode_prepare_flags_for_deco
 	clrf	WREG
 	movff	WREG,char_I_step_is_1min    ; Force 2 second deco mode
@@ -531,7 +536,7 @@
     btfss   tts_extra_time              ; Is @5 displayed ?
 	return                              ; No: don't compute it.
 	
-	dcfsnz  apnoe_mins                  ; Reached count-down ?
+	decfsz  apnoe_mins                  ; Reached count-down ?
 	return                              ; No: don't compute yet.
 	
 	movlw   .6
@@ -540,6 +545,7 @@
     movlw   .2                          ; Restart countdown.
     movwf   apnoe_mins
     return
+    
 ;-----------------------------------------------------------------------------
 
 divemode_prepare_flags_for_deco:
--- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Tue May 03 00:52:42 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Tue May 03 15:54:09 2011 +0200
@@ -3127,32 +3127,37 @@
 	call		PLED_divemask_color     ; Set Color for Divemode mask
 
 	WIN_FONT    FT_SMALL
-	WIN_LEFT	.95
-	WIN_TOP		.216
+    WIN_LEFT    .160-.63                ; 9 chars aligned right.
+    WIN_TOP     .170
+    STRCPY_PRINT "ExtraTime"            ; Title
+
+    WIN_LEFT	.102
+    WIN_TOP     .194
     STRCPY      "@"
 	GETCUSTOM8  d'58'
 	movwf       lo
 	bsf         leftbind
 	output_8
 	bcf         leftbind
-	STRCAT_PRINT "': "
+	STRCAT_PRINT "':"
+    
+	WIN_LEFT    .102+7*5                ; "@10':" is 5 chars long
+	call        PLED_standard_color 
 	
-	WIN_LEFT	.95+7*5
-	call        PLED_standard_color
 	lfsr        FSR2,letter
 	movff       int_O_extra_ascenttime+0,lo
-	movff       int_O_extra_ascenttime+1,hi
-	movf        lo,W
+    movff       int_O_extra_ascenttime+1,hi
+    movf        lo,W
 	iorwf       hi,W
 	bz          PLED_show_@5_wait
 	bsf         leftbind
 	output_16
 	bcf         leftbind
-	STRCAT_PRINT "'   "         ; From "xxx'" to "1'  " we need 2 trailing spaces
+	STRCAT_PRINT "'  "                  ; From "999'" to "1'  " we need 2 trailing spaces
 	return
 
 PLED_show_@5_wait:
-    STRCPY_PRINT "xxx'"
+    STRCPY_PRINT "xx' "
     return
 
 ;=============================================================================