Mercurial > public > mk2

changeset 719:ad5ab9910820

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
decoplan bargraph
author heinrichsweikamp
date Thu, 23 May 2013 21:43:08 +0200
parents e633a1aa6b09
children 4452837aff37
files code_part1/OSTC_code_asm_part1/display_lowlevel.asm code_part1/OSTC_code_asm_part1/outputs.asm code_part1/OSTC_code_asm_part1/simulator.asm
diffstat 3 files changed, 13 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/display_lowlevel.asm	Thu May 23 11:07:32 2013 +0200
+++ b/code_part1/OSTC_code_asm_part1/display_lowlevel.asm	Thu May 23 21:43:08 2013 +0200
@@ -521,8 +521,7 @@
 	rcall	DISP_CmdWrite
 
 	clrf	PRODH                       ; Column counter.
-	bsf		DISPLAY_rs                     ; Data!
-
+	bsf		DISPLAY_rs                  ; Data!
 DISP_box2:                              ; Loop height times
 	movff	win_height,PRODL
     
--- a/code_part1/OSTC_code_asm_part1/outputs.asm	Thu May 23 11:07:32 2013 +0200
+++ b/code_part1/OSTC_code_asm_part1/outputs.asm	Thu May 23 21:43:08 2013 +0200
@@ -2099,7 +2099,8 @@
 update_batt_voltage3:
 	GETCUSTOM8	d'34'			; Color battery
 	btfsc	cc_active
-	movlw	color_yellow		; CC active
+;	movlw	color_yellow		; CC active
+    movlw   color_orange        ; CC active
 	btfsc	charge_done
 	movlw	color_green			; Charge done.
     call	DISP_set_color
@@ -2714,15 +2715,16 @@
         STRCAT_PRINT TXT_METER2
 
         ;---- Print duration -------------------------------------------------
-	    WIN_LEFT	.140
+	    WIN_LEFT	.139
 	    lfsr	FSR2,letter
 	    
 	    movf    lo,W                    ; Swap hi & lo
 	    movff   hi,lo
 	    movwf   hi
 
-	    output_8					    ; Allow up to 240'
-        STRCAT_PRINT "'  "              ; 1 to 3 chars for depth.
+        bsf     leftbind
+	    output_99					    ; Allow up to 99'
+        STRCAT_PRINT "'"                ; 1 to 3 chars for depth.
 
 	    movf    lo,W                    ; Swap back hi & lo
 	    movff   hi,lo
@@ -2744,7 +2746,9 @@
         movlw	d'16'                   ; Limit length (16min)
         cpfslt	hi
         movwf	hi
-        movff	hi,win_bargraph         ; Active width, the rest is cleared.
+        movff   hi,win_bargraph         ; Active width, the rest is cleared.
+
+        call    DISP_standard_color
         call	DISP_box
 
         ; Restore win_top
@@ -2755,7 +2759,7 @@
         return
 
 ;-----------------------------------------------------------------------------
-; Clear unused area belw last stop
+; Clear unused area below last stop
 ; Inputs: win_top : last used area...
 DISP_decoplan_clear_bottom:
         movff   win_top,WREG            ; Get back from bank0
--- a/code_part1/OSTC_code_asm_part1/simulator.asm	Thu May 23 11:07:32 2013 +0200
+++ b/code_part1/OSTC_code_asm_part1/simulator.asm	Thu May 23 21:43:08 2013 +0200
@@ -323,9 +323,9 @@
 	cpfseq	wait_temp                   ; All gases shown?
 	bra		simulator_show_decoplan5_loop	; No
 	
-	WIN_INVERT 1
+    call	DISP_divemask_color
 	DISPLAYTEXTH .301                   ; OCR Gas Usage:
-	WIN_INVERT 0
+    call	DISP_standard_color
 
 	bra		simulator_show_decoplan1