Mercurial > public > hwos_code
comparison src/divemode.asm @ 543:a92cecf8cee4
BUGFIX: "lost gas" showed current set of gases (Diluents in CC, OC in Bailout) for both "lost gas" menus
author | heinrichsweikamp |
---|---|
date | Wed, 06 Sep 2017 11:08:59 +0200 |
parents | ad7dc231c180 |
children | 7e6df19264b6 |
comparison
equal
deleted
inserted
replaced
542:a346aff513c4 | 543:a92cecf8cee4 |
---|---|
1209 check_gas_change2: | 1209 check_gas_change2: |
1210 btfsc is_bailout ; Bailout? | 1210 btfsc is_bailout ; Bailout? |
1211 bra check_gas_change_OC_bail; Yes, check for OC or bailout | 1211 bra check_gas_change_OC_bail; Yes, check for OC or bailout |
1212 | 1212 |
1213 ; Check Diluents | 1213 ; Check Diluents |
1214 bsf ccr_diluent_setup ; in CCR menus | |
1215 movlw .0 | 1214 movlw .0 |
1216 rcall check_dil_common ; With Gas 0-4 in WREG | 1215 rcall check_dil_common ; With Gas 0-4 in WREG |
1217 movlw .1 | 1216 movlw .1 |
1218 rcall check_dil_common ; With Gas 0-4 in WREG | 1217 rcall check_dil_common ; With Gas 0-4 in WREG |
1219 movlw .2 | 1218 movlw .2 |
1223 movlw .4 | 1222 movlw .4 |
1224 rcall check_dil_common ; With Gas 0-4 in WREG | 1223 rcall check_dil_common ; With Gas 0-4 in WREG |
1225 bra check_gas_change_exit | 1224 bra check_gas_change_exit |
1226 | 1225 |
1227 check_gas_change_OC_bail: | 1226 check_gas_change_OC_bail: |
1228 bcf ccr_diluent_setup ; in OC menus | |
1229 movlw .0 | 1227 movlw .0 |
1230 rcall check_gas_common ; With Gas 0-4 in WREG | 1228 rcall check_gas_common ; With Gas 0-4 in WREG |
1231 movlw .1 | 1229 movlw .1 |
1232 rcall check_gas_common ; With Gas 0-4 in WREG | 1230 rcall check_gas_common ; With Gas 0-4 in WREG |
1233 movlw .2 | 1231 movlw .2 |
1623 bra divemode_boot1 | 1621 bra divemode_boot1 |
1624 ; Overwrite some parameters in Apnoe mode.... | 1622 ; Overwrite some parameters in Apnoe mode.... |
1625 movlw samplingrate_apnoe | 1623 movlw samplingrate_apnoe |
1626 movwf samplesecs_value ; to avoid EEPROM access in the ISR | 1624 movwf samplesecs_value ; to avoid EEPROM access in the ISR |
1627 divemode_boot1: | 1625 divemode_boot1: |
1626 bsf ccr_diluent_setup ; For CCR mode (Required to have better gas working) | |
1628 btfsc FLAG_ccr_mode ; =1: CCR mode (Fixed ppO2 or Sensor) active | 1627 btfsc FLAG_ccr_mode ; =1: CCR mode (Fixed ppO2 or Sensor) active |
1629 bra divemode_boot2 | 1628 bra divemode_boot2 |
1630 btfsc FLAG_pscr_mode | 1629 btfsc FLAG_pscr_mode |
1631 bra divemode_boot2 | 1630 bra divemode_boot2 |
1632 | 1631 |
1633 ; in OC Mode, disable ppO2 logging | 1632 ; in OC Mode, disable ppO2 logging |
1634 movlw .0 | 1633 movlw .0 |
1635 movwf divisor_ppo2_sensors | 1634 movwf divisor_ppo2_sensors |
1635 | |
1636 bcf ccr_diluent_setup ; For OC mode (Required to have better gas working) | |
1636 divemode_boot2: | 1637 divemode_boot2: |
1637 | 1638 |
1638 bcf LEDg | 1639 bcf LEDg |
1639 bcf LEDr | 1640 bcf LEDr |
1640 bcf realdive | 1641 bcf realdive |