# HG changeset patch # User heinrichsweikamp # Date 1360497104 -3600 # Node ID 82f71a73f450aa57743f334b00ec90db504fa489 # Parent dc28ba4601ee3057c279182000a2926beb9db74c indicate first gas in surfacemode diff -r dc28ba4601ee -r 82f71a73f450 code_part1/OSTC_code_asm_part1/adc_rtc.asm --- a/code_part1/OSTC_code_asm_part1/adc_rtc.asm Thu Jan 31 09:39:14 2013 +0100 +++ b/code_part1/OSTC_code_asm_part1/adc_rtc.asm Sun Feb 10 12:51:44 2013 +0100 @@ -237,11 +237,11 @@ movwf mins movlw .12 movwf hours - movlw .8 + movlw .11 movwf day - movlw .8 + movlw .2 movwf month - movlw .12 + movlw .13 movwf year bsf PIE1, TMR1IE ; Enable clock int return diff -r dc28ba4601ee -r 82f71a73f450 code_part1/OSTC_code_asm_part1/changelog.txt --- a/code_part1/OSTC_code_asm_part1/changelog.txt Thu Jan 31 09:39:14 2013 +0100 +++ b/code_part1/OSTC_code_asm_part1/changelog.txt Sun Feb 10 12:51:44 2013 +0100 @@ -1,3 +1,7 @@ +New in 2.61: +BETA Version - Do NOT use for diving! +CHANGE: Set default for CF64 (Color inactive) to 103 (light blue) + New in 2.60: BETA Version - Do NOT use for diving! CHANGE: Removed "Mix type" Icons and CF43 diff -r dc28ba4601ee -r 82f71a73f450 code_part1/OSTC_code_asm_part1/german_text.asm --- a/code_part1/OSTC_code_asm_part1/german_text.asm Thu Jan 31 09:39:14 2013 +0100 +++ b/code_part1/OSTC_code_asm_part1/german_text.asm Sun Feb 10 12:51:44 2013 +0100 @@ -77,7 +77,7 @@ #DEFINE TXT_KGL4 "kg/l" ; "kg/l" #DEFINE TXT_VOLT2 "V " ; "V " #DEFINE TXT_VOLT1 "V" ; "V" -#DEFINE TXT_STEP5 "Step:" ; "Step:" +#DEFINE TXT_STEP5 "Stufe:" ; "Step:" #DEFINE TXT_CF2 "CF" ; "CF" #DEFINE TXT_O2_4 "O2: " ; "O2: " #DEFINE TXT_O2_3 "O2 " ; "O2 " @@ -262,7 +262,7 @@ TCODE .65, .65, "AN " ;130 ON TCODE .65, .65, "AUS" ;131 OFF TCODE .100, .50, "alle löschen" ;132 Del. all - TCODE .10, .0, "Unerwarteter Reset des" ;133 Unexpected reset from + TCODE .10, .0, "Unerwarteter Reset im" ;133 Unexpected reset from TCODE .10, .25, "TG-Modus! Bitte melden" ;134 Divemode! Please help TCODE .10, .50, "Sie die u.a. Debug " ;135 and report the Debug TCODE .10, .75, "Informationen!" ;136 Information below! diff -r dc28ba4601ee -r 82f71a73f450 code_part1/OSTC_code_asm_part1/italian_text.asm --- a/code_part1/OSTC_code_asm_part1/italian_text.asm Thu Jan 31 09:39:14 2013 +0100 +++ b/code_part1/OSTC_code_asm_part1/italian_text.asm Sun Feb 10 12:51:44 2013 +0100 @@ -451,7 +451,7 @@ TCODE .0, .2, "OCR Gas Usage:" ;301 OCR Gas Usage: (Planned gas consumtion by tank). ; 115k Bootloader support: TCODE .45, .100, "Bootloader" ;302 Bootloader - TCODE .40, .130, "Perfavore aspetta!" ;303 Please wait! + TCODE .40, .110, "Perfavore aspetta!" ;303 Please wait! TCODE .50, .130, "Aborted!" ;304 Aborted ; @5 variant TCODE .0, .0, "TTS Futuro" ;305 Future TTS (=10 chars. Title for @5 customview). diff -r dc28ba4601ee -r 82f71a73f450 code_part1/OSTC_code_asm_part1/menu_reset.asm --- a/code_part1/OSTC_code_asm_part1/menu_reset.asm Thu Jan 31 09:39:14 2013 +0100 +++ b/code_part1/OSTC_code_asm_part1/menu_reset.asm Sun Feb 10 12:51:44 2013 +0100 @@ -191,7 +191,7 @@ ;---- BANK2 custom function defaults ------------------------------------- cf_default_table2: - CF_DEFAULT CF_COLOR, d'74', 0, 0 ; CF64 color_inactive Color inactive: grey + CF_DEFAULT CF_COLOR, d'103', 0, 0 ; CF64 color_inactive Color inactive: grey CF_DEFAULT CF_BOOL, 0, 0, 0 ; CF65 Show safety stop CF_DEFAULT CF_BOOL, 0, 0, 0 ; CF66 Show GF in NDL (If GF > CF08) CF_DEFAULT CF_PERCENT, d'30', d'5', d'90' ; CF67 aGF_low_default 30% diff -r dc28ba4601ee -r 82f71a73f450 code_part1/OSTC_code_asm_part1/outputs.asm --- a/code_part1/OSTC_code_asm_part1/outputs.asm Thu Jan 31 09:39:14 2013 +0100 +++ b/code_part1/OSTC_code_asm_part1/outputs.asm Sun Feb 10 12:51:44 2013 +0100 @@ -1545,29 +1545,58 @@ return ; Done. DISP_active_gas_surfmode2: + clrf EEADRH ; Select EEPROM lower page. + read_int_eeprom d'33' ; Get First gas (1-5) + movff EEDATA,hi ; into register hi + WIN_TOP .175 WIN_FONT FT_SMALL - WIN_INVERT .0 ; Init new Wordprocessor + WIN_INVERT .0 ; Init new Wordprocessor movlw .0 call DISP_grey_inactive_gas ; Sets Greyvalue for inactive gases WIN_LEFT .115 STRCPY_PRINT "1" movlw .1 + cpfseq hi ; Is "first gas"? + bra DISP_active_gas_surfmode3 ; No, skip box + WIN_FRAME_STD .174, .196, .114, .122 ;top, bottom, left, right +DISP_active_gas_surfmode3: + movlw .1 call DISP_grey_inactive_gas ; Sets Greyvalue for inactive gases WIN_LEFT .124 STRCPY_PRINT "2" movlw .2 + cpfseq hi ; Is "first gas"? + bra DISP_active_gas_surfmode4 ; No, skip box + WIN_FRAME_STD .174, .196, .123, .131 ;top, bottom, left, right +DISP_active_gas_surfmode4: + movlw .2 call DISP_grey_inactive_gas ; Sets Greyvalue for inactive gases WIN_LEFT .133 STRCPY_PRINT "3" movlw .3 + cpfseq hi ; Is "first gas"? + bra DISP_active_gas_surfmode5 ; No, skip box + WIN_FRAME_STD .174, .196, .132, .140 ;top, bottom, left, right +DISP_active_gas_surfmode5: + movlw .3 call DISP_grey_inactive_gas ; Sets Greyvalue for inactive gases WIN_LEFT .142 STRCPY_PRINT "4" movlw .4 + cpfseq hi ; Is "first gas"? + bra DISP_active_gas_surfmode6 ; No, skip box + WIN_FRAME_STD .174, .196, .141, .149 ;top, bottom, left, right +DISP_active_gas_surfmode6: + movlw .4 call DISP_grey_inactive_gas ; Sets Greyvalue for inactive gases WIN_LEFT .151 STRCPY_PRINT "5" + movlw .5 + cpfseq hi ; Is "first gas"? + bra DISP_active_gas_surfmode7 ; No, skip box + WIN_FRAME_STD .174, .196, .150, .158 ;top, bottom, left, right +DISP_active_gas_surfmode7: WIN_TOP .130 WIN_LEFT .100 @@ -1612,26 +1641,26 @@ movlw d'21' cpfseq lo ; Air? (O2=21%) - bra DISP_active_gas_surfmode4 ; No! + bra DISP_active_gas_surfmode8 ; No! tstfsz hi ; Air? (He=0%) - bra DISP_active_gas_surfmode4 ; No! + bra DISP_active_gas_surfmode8 ; No! ; Yes, display "Air" instead of 21/0 DISPLAYTEXTH d'265' ;"Air ", y-scale=2 return ; Done. -DISP_active_gas_surfmode4: +DISP_active_gas_surfmode8: lfsr FSR2,letter bsf leftbind ; left orientated output output_99 ; O2 ratio is still in "lo" movff char_I_He_ratio,lo ; copy He ratio into lo tstfsz lo ; He>0? - bra DISP_active_gas_surfmode5 ; Yes. - bra DISP_active_gas_surfmode6 ; No, skip He -DISP_active_gas_surfmode5: + bra DISP_active_gas_surfmode9 ; Yes. + bra DISP_active_gas_surfmode10 ; No, skip He +DISP_active_gas_surfmode9: PUTC '/' output_99 -DISP_active_gas_surfmode6: +DISP_active_gas_surfmode10: bcf leftbind call word_processor