# HG changeset patch # User heinrichsweikamp # Date 1336916421 -7200 # Node ID 1b021a280e158ef4012e2dc28f95160da1d0e2e4 # Parent b4a4aa5d169a349066fb4024033a84e018b56f09 NEW CF64: Configures color for inactive gases diff -r b4a4aa5d169a -r 1b021a280e15 code_part1/OSTC_code_asm_part1/changelog.txt --- a/code_part1/OSTC_code_asm_part1/changelog.txt Tue May 08 14:11:49 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/changelog.txt Sun May 13 15:40:21 2012 +0200 @@ -1,3 +1,7 @@ +New in 2.23: +BETA Version - Do NOT use for diving! +NEW: CF64: Configures color for inactive gases + New in 2.22: BETA Version - Do NOT use for diving! NEW: Custom Functions III menu (CF64-CF95) diff -r b4a4aa5d169a -r 1b021a280e15 code_part1/OSTC_code_asm_part1/english_text.asm --- a/code_part1/OSTC_code_asm_part1/english_text.asm Tue May 08 14:11:49 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/english_text.asm Sun May 13 15:40:21 2012 +0200 @@ -326,7 +326,7 @@ TCODE .0, .0, "Dil." ;192 Dil. (Rebreather diluent) ; 32 custom function descriptors III (FIXED LENGTH = 15 chars). - TCODE .40, .35, "unused " ;193 unused + TCODE .40, .35, "Color# inactive" ;193 Color# inactive TCODE .40, .35, "unused " ;194 unused TCODE .40, .35, "unused " ;195 unused TCODE .40, .35, "unused " ;196 unused diff -r b4a4aa5d169a -r 1b021a280e15 code_part1/OSTC_code_asm_part1/french_text.asm --- a/code_part1/OSTC_code_asm_part1/french_text.asm Tue May 08 14:11:49 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/french_text.asm Sun May 13 15:40:21 2012 +0200 @@ -327,7 +327,7 @@ TCODE .0, .0, "Dil." ;192 Dil. (Rebreather diluant) ; 32 custom function descriptors III (FIXED LENGTH = 15 chars). - TCODE .40, .35, "unused " ;193 unused + TCODE .40, .35, "Color# inactive" ;193 Color# inactive TCODE .40, .35, "unused " ;194 unused TCODE .40, .35, "unused " ;195 unused TCODE .40, .35, "unused " ;196 unused diff -r b4a4aa5d169a -r 1b021a280e15 code_part1/OSTC_code_asm_part1/german_text.asm --- a/code_part1/OSTC_code_asm_part1/german_text.asm Tue May 08 14:11:49 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/german_text.asm Sun May 13 15:40:21 2012 +0200 @@ -326,7 +326,7 @@ TCODE .0, .0, "Dil." ;192 Dil. (Rebreather diluent) ; 32 custom function descriptors III (FIXED LENGTH = 15 chars). - TCODE .40, .35, "unbenutzt " ;193 unused + TCODE .40, .35, "Farbe# inaktiv " ;193 Color# inactive TCODE .40, .35, "unbenutzt " ;194 unused TCODE .40, .35, "unbenutzt " ;195 unused TCODE .40, .35, "unbenutzt " ;196 unused diff -r b4a4aa5d169a -r 1b021a280e15 code_part1/OSTC_code_asm_part1/menu_custom.asm --- a/code_part1/OSTC_code_asm_part1/menu_custom.asm Tue May 08 14:11:49 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu_custom.asm Sun May 13 15:40:21 2012 +0200 @@ -111,13 +111,13 @@ movwf EEADRH ; bank 1 movlw d'32' subwf customfunction_temp1,F - movlw d'63' + movlw d'31' cpfsgt customfunction_temp1 - bra getcustom8_3 ; bank 1 + bra getcustom8_3 movlw d'2' movwf EEADRH ; bank 2 - movlw d'64' + movlw d'32' subwf customfunction_temp1,F getcustom8_3: movf customfunction_temp1,W diff -r b4a4aa5d169a -r 1b021a280e15 code_part1/OSTC_code_asm_part1/menu_reset.asm --- a/code_part1/OSTC_code_asm_part1/menu_reset.asm Tue May 08 14:11:49 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu_reset.asm Sun May 13 15:40:21 2012 +0200 @@ -189,7 +189,7 @@ CF_DEFAULT CF_PERCENT, .4, .0, .100 ; CF62 pSCR O2 Drop CF_DEFAULT CF_INT8, .10, .0, .100 ; CF63 pSCR counterlung ratio cf_default_table2: - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF64 unused + CF_DEFAULT CF_COLOR, d'74', 0, 0 ; CF64 color_inactive Color inactive: grey CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF65 unused CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF66 unused CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF67 unused diff -r b4a4aa5d169a -r 1b021a280e15 code_part1/OSTC_code_asm_part1/pled_outputs.asm --- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm Tue May 08 14:11:49 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm Sun May 13 15:40:21 2012 +0200 @@ -1286,7 +1286,7 @@ goto PLED_set_color ; grey out inactive gases! PLED_grey_gas: - movlw color_grey + GETCUSTOM8 d'64' ;movlw color_grey goto PLED_set_color ; grey out inactive gases! ;----------------------------------------------------------------------------- @@ -2372,7 +2372,7 @@ WIN_INVERT .0 ; Init new Wordprocessor ifdef __DEBUG - movlw color_grey ; Write header in blue when + GETCUSTOM8 d'64' ; Write header in blue when call PLED_set_color ; compiled in DEBUG mode... else call PLED_standard_color @@ -2739,7 +2739,7 @@ bc PLED_de_activelist_white PLED_de_activelist_grey: ; grey out inactive gases! - movlw color_grey + GETCUSTOM8 d'64' ;movlw color_grey call PLED_set_color PLED_de_activelist_white: @@ -2834,10 +2834,9 @@ decfsz lo,F ; max. 5 times... bra PLED_gas_list_loop1 - movlw color_grey btfss STATUS,C ; test carry - call PLED_set_color ; grey out inactive gases! - + rcall PLED_gas_list_grey + call word_processor call PLED_standard_color @@ -2848,6 +2847,11 @@ DISPLAYTEXT d'122' ; More return ; return (OC mode) +PLED_gas_list_grey: + GETCUSTOM8 d'64' ;movlw color_grey + call PLED_set_color ; grey out inactive gases! + return + PLED_splist_start: WIN_LEFT .100 WIN_FONT FT_SMALL @@ -2943,7 +2947,7 @@ btfss divemode bra PLED_no_graph_grid - movlw color_grey + GETCUSTOM8 d'64' ;movlw color_grey call PLED_set_color movlw .169+.1 ; divemode @@ -3791,7 +3795,7 @@ bra PLED_simdata_white ; Is not zero PLED_simdata_grey: - movlw color_grey + GETCUSTOM8 d'64' ;movlw color_grey call PLED_set_color ; grey out inactive gases! bra PLED_simdata_color_done diff -r b4a4aa5d169a -r 1b021a280e15 code_part1/OSTC_code_asm_part1/russian_text.asm --- a/code_part1/OSTC_code_asm_part1/russian_text.asm Tue May 08 14:11:49 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/russian_text.asm Sun May 13 15:40:21 2012 +0200 @@ -329,7 +329,7 @@ TCODE .0, .0, "Дил." ;192 Dil. (Rebreather diluent) ; 32 custom function descriptors III (FIXED LENGTH = 15 chars). - TCODE .40, .35, "unused " ;193 unused + TCODE .40, .35, "Color# inactive" ;193 Color# inactive TCODE .40, .35, "unused " ;194 unused TCODE .40, .35, "unused " ;195 unused TCODE .40, .35, "unused " ;196 unused diff -r b4a4aa5d169a -r 1b021a280e15 code_part1/OSTC_code_asm_part1/spanish_text.asm --- a/code_part1/OSTC_code_asm_part1/spanish_text.asm Tue May 08 14:11:49 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/spanish_text.asm Sun May 13 15:40:21 2012 +0200 @@ -325,7 +325,7 @@ TCODE .0, .0, "Dil." ;192 Dil. (Rebreather diluent) ; 32 custom function descriptors III (FIXED LENGTH = 15 chars). - TCODE .40, .35, "unused " ;193 unused + TCODE .40, .35, "Color# inactive" ;193 Color# inactive TCODE .40, .35, "unused " ;194 unused TCODE .40, .35, "unused " ;195 unused TCODE .40, .35, "unused " ;196 unused diff -r b4a4aa5d169a -r 1b021a280e15 code_part1/OSTC_code_asm_part1/turkish_text.asm --- a/code_part1/OSTC_code_asm_part1/turkish_text.asm Tue May 08 14:11:49 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/turkish_text.asm Sun May 13 15:40:21 2012 +0200 @@ -328,7 +328,7 @@ TCODE .0, .0, "Dil." ;192 Dil. (Rebreather diluent) ; 32 custom function descriptors III (FIXED LENGTH = 15 chars). - TCODE .40, .35, "unused " ;193 unused + TCODE .40, .35, "Color# inactive" ;193 Color# inactive TCODE .40, .35, "unused " ;194 unused TCODE .40, .35, "unused " ;195 unused TCODE .40, .35, "unused " ;196 unused