Mercurial > public > mk2
changeset 141:622da16b768f
LowBatt! Warning in divemode
| author | heinrichsweikamp |
|---|---|
| date | Thu, 06 Jan 2011 18:36:22 +0100 |
| parents | 87a53efbb5ba |
| children | 8b75ba28d641 |
| files | code_part1/OSTC_code_asm_part1/MAIN.ASM code_part1/OSTC_code_asm_part1/changelog.txt code_part1/OSTC_code_asm_part1/divemode.asm code_part1/OSTC_code_asm_part1/pled_outputs.asm code_part1/OSTC_code_asm_part1/text_table.asm |
| diffstat | 5 files changed, 13 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/MAIN.ASM Thu Jan 06 18:12:15 2011 +0100 +++ b/code_part1/OSTC_code_asm_part1/MAIN.ASM Thu Jan 06 18:36:22 2011 +0100 @@ -32,7 +32,7 @@ #include definitions.asm ; Defines, I/O Ports and variables reset_v code 0x0000 - goto start ; Start! +e goto start ; Start! inter_v code 0x0008 bra HighInt ;High Priority Interrups
--- a/code_part1/OSTC_code_asm_part1/changelog.txt Thu Jan 06 18:12:15 2011 +0100 +++ b/code_part1/OSTC_code_asm_part1/changelog.txt Thu Jan 06 18:36:22 2011 +0100 @@ -2,6 +2,7 @@ BETA Version - Do NOT use for diving! NEW: "beta" is shown for beta versions CHANGE: NoFly and Desaturation time only visible when > 0 +CHANGE: "LowBatt!" Warning in Divemode New in 1.75 Beta:
--- a/code_part1/OSTC_code_asm_part1/divemode.asm Thu Jan 06 18:12:15 2011 +0100 +++ b/code_part1/OSTC_code_asm_part1/divemode.asm Thu Jan 06 18:36:22 2011 +0100 @@ -96,7 +96,7 @@ diveloop_loop1x: call timeout_divemode ; dive finished? This routine sets the required flags btfsc low_battery_state ; If battery is low, then... - call update_batt_voltage_divemode ; Display Battery Symbol/Voltage! + call update_batt_voltage_divemode ; Display Battery Warning Text btfsc premenu ; is Menu? displayed? call timeout_premenu_divemode ; No, so check for timeout premenu btfsc menubit ; is the Dive mode menu displayed?
--- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm Thu Jan 06 18:12:15 2011 +0100 +++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm Thu Jan 06 18:36:22 2011 +0100 @@ -1568,7 +1568,8 @@ PLED_nofly_time: movff nofly_time+0,lo movff nofly_time+1,hi ; Copy - tstfsz lo ; =0? + movlw d'1' + cpfseq lo ; =1? bra PLED_nofly_time2 ; No! tstfsz hi ; =0? bra PLED_nofly_time2 ; No! @@ -1625,6 +1626,10 @@ return update_batt_voltage_divemode: + call PLED_warnings_color + DISPLAYTEXT d'246' ; LowBatt! + call PLED_standard_color + return update_batt_voltage: ostc_debug 'f'
--- a/code_part1/OSTC_code_asm_part1/text_table.asm Thu Jan 06 18:12:15 2011 +0100 +++ b/code_part1/OSTC_code_asm_part1/text_table.asm Thu Jan 06 18:36:22 2011 +0100 @@ -83,7 +83,7 @@ DB .20,.20,.20,.20,.20,.20 ;t228......t233 DB .20,.20,.10,.10,.10,.8 ;t234;t235;t236;t237;t238;t239 DB .10,.8,.8,.6,.6,.20 ;t240;t241;t242;t243;t244;t245 - DB .16,.10,.16,.12,.6,.6 ;t246;t247;t248;t249;t250;t251 + DB .10,.10,.16,.12,.6,.6 ;t246;t247;t248;t249;t250;t251 DB .6,.6,.6,.6 ;t252;t253;t254;t255 ; Text Bank2 (Texts 256-511): @@ -359,8 +359,8 @@ DB .120,.0 ;243 beta DB .100,.100 ;244 Exit DB .20,.65 ;245 - DB .2,.30 ;246 - DB .20,.125 ;247 Simulator + DB .50,.145 ;246 LowBatt! + DB .20,.125 ;247 Simulator DB .30,.2 ;248 DB .20,.35 ;249 DB .100,.25 ;250 Divemode_Simulator_Menu @@ -671,7 +671,7 @@ DA "beta}}" ;243 l=6 DA "unuse}" ;244 l=6 DA "Reset CF,Gas & Deco}" ;245 l=20 - DA "Disable module}}" ;246 l=16 + DA "LowBatt!}}" ;246 l=10 DA "Simulator}" ;247 l=10 DA "OSTC Simulator}}" ;248 l=16 DA "Start Dive}}" ;249 l=12