Mercurial > public > mk2
changeset 788:9eba1eb8ca38
BUGFIX: False bailout flag in logbook
author | heinrichsweikamp |
---|---|
date | Mon, 11 Aug 2014 12:18:48 +0200 |
parents | 9c52519871ba |
children | 380a07e4fc15 |
files | code_part1/OSTC_code_asm_part1/changelog.txt code_part1/OSTC_code_asm_part1/definitions.asm code_part1/OSTC_code_asm_part1/divemode_menu.asm |
diffstat | 3 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/changelog.txt Tue Jul 01 13:36:22 2014 +0200 +++ b/code_part1/OSTC_code_asm_part1/changelog.txt Mon Aug 11 12:18:48 2014 +0200 @@ -1,3 +1,7 @@ +New in 2.94: +BETA Version +BUGFIX: False bailout flag in logbook + New in 2.93: BETA Version NEW: Show Gas change countdown if CF55>0
--- a/code_part1/OSTC_code_asm_part1/definitions.asm Tue Jul 01 13:36:22 2014 +0200 +++ b/code_part1/OSTC_code_asm_part1/definitions.asm Mon Aug 11 12:18:48 2014 +0200 @@ -22,7 +22,7 @@ ; ToDo: #DEFINE softwareversion_x d'2' ; Software version XX.YY -#DEFINE softwareversion_y d'93' ; Software version XX.YY +#DEFINE softwareversion_y d'94' ; Software version XX.YY #DEFINE softwareversion_beta 1 ; (and 0 for release)
--- a/code_part1/OSTC_code_asm_part1/divemode_menu.asm Tue Jul 01 13:36:22 2014 +0200 +++ b/code_part1/OSTC_code_asm_part1/divemode_menu.asm Mon Aug 11 12:18:48 2014 +0200 @@ -756,9 +756,12 @@ bra divemode_set_xgas ; Configure the extra gas divemenu_set_gas2b: + btfss FLAG_const_ppO2_mode ; In CCR mode ? + bra divemenu_set_gas2c ; No bsf is_bailout ;=1: CC mode, but bailout active! bsf store_bailout_event bsf event_occured ; set global event flag +divemenu_set_gas2c: clrf lo ; clear Setpoint, DISP_const_ppO2_value now displayes "Bail" movff lo,char_I_const_ppO2