Mercurial > public > hwos_code
diff src/menu_tree.asm @ 623:c40025d8e750
3.03 beta released
| author | heinrichsweikamp |
|---|---|
| date | Mon, 03 Jun 2019 14:01:48 +0200 |
| parents | 7b3903536213 |
| children | cd58f7fc86db |
line wrap: on
line diff
--- a/src/menu_tree.asm Wed Apr 10 10:51:07 2019 +0200 +++ b/src/menu_tree.asm Mon Jun 03 14:01:48 2019 +0200 @@ -1,8 +1,8 @@ ;============================================================================= ; -; File menu_tree.asm REFACTORED VERSION V2.99g +; File menu_tree.asm next combined generation V3.03.3 ; -; OSTC menus +; OSTC Surface Menus ; ; Copyright (c) 2011, JD Gascuel, HeinrichsWeikamp, all right reserved. ;============================================================================= @@ -19,11 +19,13 @@ #include "eeprom_rs232.inc" #include "external_flash.inc" #include "shared_definitions.h" ; mailbox from/to p2_deco.c -#include "isr.inc" #include "ghostwriter.inc" #include "adc_lightsensor.inc" #include "wait.inc" #include "i2c.inc" +#include "calibrate.inc" +#include "math.inc" +#include "rtc.inc" extern do_demo_divemode @@ -31,19 +33,28 @@ extern option_save_all extern option_reset extern do_demo_planner - extern calibrate_mix - extern comm_mode0 + extern comm_mode_ble ; will also set CPU speed to normal extern piezo_config - extern compass_calibration_loop extern option_reset_all extern rtc_set_rtc extern surfloop extern oColorSetDive + extern vault_decodata_into_eeprom + + IFDEF _ccr_pscr extern option_cleanup_oCCRMode + ENDIF + + IFDEF _compass + extern compass_calibration_loop + ENDIF menu_tree CODE +;----------------------------------------------------------------------------- + + ;============================================================================= ; Main Menu @@ -53,15 +64,16 @@ global do_main_menu do_main_menu: - movff menupos3,customview_surfmode ; save last customview + movff active_customview,customview_surfmode ; save last custom view + clrf MS_flags_imprint ; clear all flags for data imprinting global do_main_menu2 do_main_menu2: ; entry point used by logbook.asm - call TFT_boot - bcf sleepmode ; for timeout - call menu_processor_reset ; restart from first icon + call TFT_boot ; initialize display + call menu_processor_reset ; reset menu stack do_main_menu_common: + IFDEF _ccr_pscr MENU_BEGIN tMainMenu, .7 MENU_CALL tLogbook, logbook MENU_CALL tGasSetup, do_gas_menu @@ -69,26 +81,40 @@ MENU_CALL tPlan, do_planner_menu MENU_CALL tDiveModeMenu, do_divemode_menu MENU_CALL tSystSets, do_settings_menu - MENU_CALL tExit, restart + MENU_CALL tExit, do_restart MENU_END + ELSE + MENU_BEGIN tMainMenu, .6 + MENU_CALL tLogbook, logbook + MENU_CALL tGasSetup, do_gas_menu + MENU_CALL tPlan, do_planner_menu + MENU_CALL tDiveModeMenu, do_divemode_menu + MENU_CALL tSystSets, do_settings_menu + MENU_CALL tExit, do_restart + MENU_END + ENDIF +do_restart: + bsf restart_fast ; skip logos and waits an restart + goto restart ; restart into surface mode + ;============================================================================= ; CCR Setup + IFDEF _ccr_pscr + do_return_ccr_menu: call menu_processor_double_pop ; drop exit line and back to last line do_ccr_menu: - bcf menu_update_sensor_mv ; stop imprinting of live sensor values call option_cleanup_oCCRMode ; in pSCR mode, revert AutoSP (2) to calculated SP (0) + IFDEF _external_sensor + bcf imprint_sensor_mv ; stop imprinting of live O2 sensor mV data btfsc analog_o2_input bra do_ccr_menu_cR - - ; COMMENTED OUT - currently there is no difference between the OSTC 2 and 3 regarding this menu - ; btfss optical_input - ; bra do_ccr_menu_ostc2 + ENDIF MENU_BEGIN tCCRSetup, .6 ; OSTC3 menu (and currently also the OSTC2 menu) MENU_OPTION tCCRMode, oCCRMode, 0 @@ -100,6 +126,8 @@ MENU_END + IFDEF _external_sensor + do_ccr_menu_cR: ; cR menu MENU_BEGIN tCCRSetup, .7 MENU_OPTION tCCRMode, oCCRMode, 0 @@ -111,28 +139,17 @@ MENU_CALL tBack, do_return_main_menu MENU_END -; COMMENTED OUT - currently there is no difference between the OSTC 2 and 3 regarding this menu -;do_ccr_menu_ostc2: -; MENU_BEGIN tCCRSetup, .6 ; ostc2 menu -; MENU_OPTION tCCRMode, oCCRMode, 0 -; MENU_CALL tDiluentSetup, do_diluent_setup -; MENU_CALL tFixedSetpoints, do_fixed_setpoints -; MENU_CALL tPSCRMenu, do_PSCR_menu -; MENU_OPTION tCCmaxFracO2, oCCmaxFracO2, 0 -; MENU_CALL tBack, do_return_main_menu -; MENU_END - do_calibrate_menu: call enable_ir_s8 ; enable IR/S8-Port - bsf menu_update_sensor_mv ; start imprinting of live sensor values + bsf imprint_sensor_mv ; start imprinting of live O2 sensor mV data do_calibrate_menu2: MENU_BEGIN tCalibrateMenu, .6 MENU_CALL tDiveHudMask1, 0 MENU_CALL tDiveHudMask2, 0 MENU_CALL tDiveHudMask3, 0 - MENU_OPTION tCalibrationGas,oCalGasO2, 0 + MENU_OPTION tCalibrationGas, oCalGasO2, 0 MENU_CALL tCalibrate, do_calibrate_mix MENU_CALL tBack, do_return_ccr_menu MENU_END @@ -143,12 +160,15 @@ WAITMS d'250' ; wait for HUD v3 movlw .9 movff WREG,customview_surfmode ; show sensor mV custom view after restart + bsf restart_fast ; skip logos and waits an restart goto restart ; restart into surface mode + ENDIF ; _external_sensor + do_diluent_setup: - bsf FLAG_diluent_setup ; setting up diluents - bcf short_gas_decriptions ; do not use short versions of gaslist_strcat_gas_cd and gaslist_strcat_setpoint + bsf is_diluent_menu ; setting up diluents + bcf short_gas_descriptions ; do not use short versions of gaslist_strcat_gas_cd and gaslist_strcat_setpoint bcf better_gas_hint ; do not mark the best gas/diluent (to be used in dive mode only) call gaslist_cleanup_list ; take care that only one gas can be first @@ -166,7 +186,7 @@ call menu_processor_double_pop ; drop exit line and back to last line do_fixed_setpoints: - bcf short_gas_decriptions ; =1: use short versions of gaslist_strcat_gas_cd and gaslist_strcat_setpoint + bcf short_gas_descriptions ; =1: use short versions of gaslist_strcat_gas_cd and gaslist_strcat_setpoint bcf better_gas_hint ; do not mark the best gas/diluent (to be used in dive mode only) MENU_BEGIN tFixedSetpoints, .6 @@ -198,18 +218,22 @@ MENU_CALL tBack, do_return_ccr_menu MENU_END + ENDIF ; _ccr_pscr + ;============================================================================= ; OC Gas Setup do_return_gas_menu: call menu_processor_double_pop ; drop exit line and back to last line - btfsc FLAG_diluent_setup ; return to CCR-Menu? + IFDEF _ccr_pscr + btfsc is_diluent_menu ; return from setting up diluents? bra do_diluent_setup ; YES + ENDIF do_gas_menu: - bcf FLAG_diluent_setup ; not setting up diluents - bcf short_gas_decriptions ; do not use short versions of gaslist_strcat_gas_cd and gaslist_strcat_setpoint + bcf is_diluent_menu ; setting up OC gases + bcf short_gas_descriptions ; do not use short versions of gaslist_strcat_gas_cd and gaslist_strcat_setpoint bcf better_gas_hint ; do not mark the best gas/diluent (to be used in dive mode only) call gaslist_cleanup_list ; takes care that only one gas can be first @@ -225,17 +249,16 @@ do_return_edit_gas_menu: IFDEF _rx_functions - bcf menu_update_tank_pres ; stop imprinting of tank pressure updates - bcf FLAG_pairing_mode ; not in pairing menu any more (back to normal timeout) + bcf imprint_xmitter_pres ; stop imprinting of transmitter pressure data + bcf imprint_xmitter_ID ; not in transmitter selection menu any more (back to normal timeout) ENDIF - call menu_processor_pop ; drop exit line and ... -do_abort_gas_depth_menu: - call menu_processor_pop ; back to last line + call menu_processor_double_pop ; drop exit line and back to last line bra do_edit_gas_menu_common + do_edit_gas_menu: movff PRODL,gaslist_gas ; get menu item we came from (0-4) movlw .5 ; offset between gases and diluents - btfsc FLAG_diluent_setup ; in CCR menu? + btfsc is_diluent_menu ; setting up diluents? addwf gaslist_gas,F ; YES - add the offset do_edit_gas_menu_common: @@ -251,6 +274,7 @@ do_setup_mix_menu: + IFDEF _helium MENU_BEGIN tGasEdit, .7 MENU_DYNAMIC gaslist_gastitle, 0 MENU_DYNAMIC gaslist_MOD_END, 0 @@ -260,14 +284,24 @@ MENU_CALL tHeMinus, gaslist_mHe MENU_CALL tBack, do_return_edit_gas_menu MENU_END + ELSE + MENU_BEGIN tGasEdit, .5 + MENU_DYNAMIC gaslist_gastitle, 0 + MENU_DYNAMIC gaslist_MOD_END, 0 + MENU_CALL tO2Plus, gaslist_pO2 + MENU_CALL tO2Minus, gaslist_mO2 + MENU_CALL tBack, do_return_edit_gas_menu + MENU_END + ENDIF do_setup_tank_menu: IFDEF _rx_functions - btfsc FLAG_tr_enabled ; TR functions enabled? + TSTOSC opt_TR_mode ; TR functions switched on? bra do_setup_tank_menu_rx ; YES ENDIF + IFDEF _ccr_pscr MENU_BEGIN tSetup_Tank, .6 MENU_DYNAMIC gaslist_gastitle, 0 MENU_DYNAMIC gaslist_tank_size_pres, 0 @@ -276,13 +310,21 @@ MENU_CALL tCopyDilToOC, gaslist_copy_dil_to_oc MENU_CALL tBack, do_return_edit_gas_menu MENU_END + ELSE + MENU_BEGIN tSetup_Tank, .5 + MENU_DYNAMIC gaslist_gastitle, 0 + MENU_DYNAMIC gaslist_tank_size_pres, 0 + MENU_CALL tTankSize, gaslist_tank_size + MENU_CALL tTankUsablePress, gaslist_tank_pres + MENU_CALL tBack, do_return_edit_gas_menu + MENU_END + ENDIF IFDEF _rx_functions - do_setup_tank_menu_rx: setf pairing_slot ; prime slot number with 255 aka -1, used in pairing function - bsf FLAG_pairing_mode ; in pairing menu (longer timeout) + bsf imprint_xmitter_ID ; in transmitter selection menu (longer timeout) MENU_BEGIN tSetup_Tank, .7 MENU_DYNAMIC gaslist_gastitle, 0 @@ -293,7 +335,6 @@ MENU_CALL tTankUsablePress, gaslist_tank_pres MENU_CALL tBack, do_return_edit_gas_menu MENU_END - ENDIF @@ -322,9 +363,9 @@ bra do_planner_common do_planner_menu: - ; to have correct simulator results after mode changes without prior excursion to surfacemode + ; ensure correct simulator results after mode changes without prior excursion to surface mode call option_save_all - call restart_set_modes_and_flags + ; reset dive time/depth to default values lfsr FSR0,odiveInterval call option_reset @@ -336,6 +377,7 @@ call option_reset do_planner_common: + call restart_set_modes_and_flags ; initialize dive mode settings movff opt_dive_mode,WREG ; get dive mode: 0=OC, 1=CCR, 2=Gauge, 3=Apnea, 4=pSCR dcfsnz WREG,W ; subtract one, became zero? bra do_planner_common_ccr ; YES - use CCR version @@ -388,14 +430,24 @@ do_ppo2_menu: + IFDEF _ccr_pscr MENU_BEGIN tppO2settings, .6 - MENU_DYNAMIC divesets_ppo2_max, do_toggle_ppo2_max + MENU_DYNAMIC divesets_ppo2_max, do_toggle_ppo2_max_work MENU_DYNAMIC divesets_ppo2_max_deco, do_toggle_ppo2_max_deco MENU_DYNAMIC divesets_ppo2_min, do_toggle_ppo2_min MENU_DYNAMIC divesets_ppo2_min_cc, do_toggle_ppo2_min_cc MENU_OPTION tShowppO2, oShowppO2, 0 MENU_CALL tBack, do_return_divemode_menu MENU_END + ELSE + MENU_BEGIN tppO2settings, .5 + MENU_DYNAMIC divesets_ppo2_max, do_toggle_ppo2_max_work + MENU_DYNAMIC divesets_ppo2_max_deco, do_toggle_ppo2_max_deco + MENU_DYNAMIC divesets_ppo2_min, do_toggle_ppo2_min + MENU_OPTION tShowppO2, oShowppO2, 0 + MENU_CALL tBack, do_return_divemode_menu + MENU_END + ENDIF do_return_decoparameters_menu: @@ -429,10 +481,13 @@ do_decoparameters_menu_more: - MENU_BEGIN tDecoparameters, .4 + MENU_BEGIN tDecoparameters, .7 MENU_OPTION tLastDecostop, oLastDeco, 0 MENU_OPTION tAscentSpeed, oAscentSpeed, 0 MENU_OPTION tGasChangeTime, oGasChangeTime, 0 + MENU_OPTION tExtendedStops, oExtendedStops, 0 + MENU_OPTION tTimeoutDive, oDiveTimeout, 0 + MENU_OPTION tStoreApnoeDive, oStoreApnoeDive, 0 MENU_CALL tBack, do_return_decoparameters_menu MENU_END @@ -459,21 +514,20 @@ ;============================================================================= ; Setup Menu -do_return_settings_deeper: ; entry point for return from set time/date sub-menu - bcf settime_setdate ; clear flag - call menu_processor_pop ; drop one more stack entry - do_return_settings: + bcf imprint_time_date ; stop imprinting of current time & date call menu_processor_double_pop ; drop exit line and back to last line IFDEF _rx_mode - bcf FLAG_tr_enabled ; clear TR functions flag by default - movff opt_TR_mode,WREG ; get TR functions mode - tstfsz WREG ; TR functions enabled? - bsf FLAG_tr_enabled ; YES + bcf tr_functions_activated ; set TR functions as deactivated by default + btfss ostc_rx_present ; TR model / TR module up & running? + bra do_settings_menu ; NO + movff opt_TR_mode,WREG ; YES - get TR mode + tstfsz WREG ; - TR mode <> off ? + bsf tr_functions_activated ; YES - set TR functions as activated ENDIF do_settings_menu: - btfsc ble_available ; ble available? + btfsc ble_available ; BLE available? bra do_settings_menu_ble ; YES MENU_BEGIN tSystSets, .5 @@ -486,13 +540,13 @@ do_settings_menu_ble: IFDEF _rx_functions - btfsc ostc_rx_present ; RX model? + btfsc ostc_rx_present ; TR model? bra do_settings_menu_rx ; YES ENDIF MENU_BEGIN tSystSets, .6 MENU_CALL tInfoMenu, do_info_menu - MENU_CALL tBleTitle, comm_mode0 + MENU_CALL tBleTitle, comm_mode_ble MENU_CALL tSetTimeDate, do_date_time_menu MENU_CALL tDispSets, do_dispsets_menu MENU_CALL tMore, do_settings_menu_more @@ -503,7 +557,7 @@ do_settings_menu_rx: MENU_BEGIN tSystSets, .7 MENU_CALL tInfoMenu, do_info_menu - MENU_CALL tBleTitle, comm_mode0 + MENU_CALL tBleTitle, comm_mode_ble MENU_CALL tTrSettings, do_settings_menu_TR MENU_CALL tSetTimeDate, do_date_time_menu MENU_CALL tDispSets, do_dispsets_menu @@ -543,6 +597,7 @@ IFDEF _rx_functions + do_settings_menu_TR: movff opt_dive_mode,WREG ; get dive mode: 0=OC, 1=CCR, 2=Gauge, 3=Apnea, 4=pSCR incf WREG,W ; add 1 @@ -601,7 +656,8 @@ do_toggle_max_pres_diff_1: movff lo,char_I_max_pres_diff ; write back new value return ; done - ENDIF + + ENDIF ; _rx_functions do_return_settings_more_deeper: ; entry point for returns from reset sub-menu @@ -611,19 +667,27 @@ call menu_processor_double_pop ; drop exit line and back to last line do_settings_menu_more: - btfsc battery_gauge_available ; piezo buttons available - bra do_settings_menu_more_piezo - btfsc ble_available ; ble available - bra do_settings_menu_more_ostc3p - ; All MENU_CALLs that are - MENU_BEGIN tSystSets, .6 ; in all of this 3 menus - MENU_CALL tCompassMenu, do_compass_menu ; need to stay together - MENU_CALL tLogOffset, do_log_offset_menu ; on this menu level in - MENU_OPTION tAltMode, oAltMode, 0 ; oder to not mess up the - MENU_OPTION tDvSalinity, oDiveSalinity, 0 ; menu stack on doing the - MENU_CALL tResetMenu, do_reset_menu ; do_return_settings ! - MENU_CALL tBack, do_return_settings + btfsc battery_gauge_available ; piezo buttons available? + bra do_settings_menu_more_piezo ; YES + + IFDEF _compass + MENU_BEGIN tSystSets, .6 ; All MENU_CALLs + MENU_CALL tCompassMenu, do_compass_menu ; in this menu need to + MENU_CALL tLogOffset, do_log_offset_menu ; stay together on this + MENU_OPTION tAltMode, oAltMode, 0 ; menu level in order to + MENU_OPTION tDvSalinity, oDiveSalinity, 0 ; not mess up the menu + MENU_CALL tResetMenu, do_reset_menu ; stack on doing the + MENU_CALL tBack, do_return_settings ; do_return_settings ! MENU_END + ELSE + MENU_BEGIN tSystSets, .5 ; see above + MENU_CALL tLogOffset, do_log_offset_menu ; + MENU_OPTION tAltMode, oAltMode, 0 ; + MENU_OPTION tDvSalinity, oDiveSalinity, 0 ; + MENU_CALL tResetMenu, do_reset_menu ; + MENU_CALL tBack, do_return_settings ; + MENU_END + ENDIF ; _compass do_return_settings_menu_more_pz: @@ -632,25 +696,26 @@ call menu_processor_double_pop ; drop exit line and back to last line do_settings_menu_more_piezo: + IFDEF _compass MENU_BEGIN tSystSets, .7 MENU_CALL tCompassMenu, do_compass_menu ; see above MENU_CALL tLogOffset, do_log_offset_menu ; - MENU_OPTION tAltMode, oAltMode, 0 - MENU_OPTION tDvSalinity, oDiveSalinity, 0 + MENU_OPTION tAltMode, oAltMode, 0 ; + MENU_OPTION tDvSalinity, oDiveSalinity, 0 ; MENU_CALL tResetMenu, do_reset_menu ; MENU_CALL tMore, do_settings_piezo_menu ; - MENU_CALL tBack, do_return_settings + MENU_CALL tBack, do_return_settings ; MENU_END - -do_settings_menu_more_ostc3p: ; menu with BLE feature + ELSE MENU_BEGIN tSystSets, .6 - MENU_CALL tCompassMenu, do_compass_menu ; see above - MENU_CALL tLogOffset, do_log_offset_menu ; - MENU_OPTION tAltMode, oAltMode, 0 - MENU_OPTION tDvSalinity, oDiveSalinity, 0 + MENU_CALL tLogOffset, do_log_offset_menu ; see above + MENU_OPTION tAltMode, oAltMode, 0 ; + MENU_OPTION tDvSalinity, oDiveSalinity, 0 ; MENU_CALL tResetMenu, do_reset_menu ; - MENU_CALL tBack, do_return_settings + MENU_CALL tMore, do_settings_piezo_menu ; + MENU_CALL tBack, do_return_settings ; MENU_END + ENDIF do_settings_piezo_menu: @@ -662,9 +727,11 @@ MENU_END + IFDEF _compass + do_compass_menu: MENU_BEGIN tSystSets, .5 - MENU_CALL tCompassMenu, compass_calibration_loop ; exits to surfloop + MENU_CALL tCompassMenu, compass_calibration_loop ; exits to surface loop ; MENU_OPTION tCompassGain, oCompassGain, 0 MENU_DYNAMIC menu_cal_x, 0 MENU_DYNAMIC menu_cal_y, 0 @@ -672,6 +739,8 @@ MENU_CALL tBack, do_return_settings_more MENU_END + ENDIF ; _compass + ;============================================================================= ; Reset and confirmation menu @@ -679,35 +748,35 @@ do_reset_menu: MENU_BEGIN tResetMenu, .6 MENU_CALL tBack, do_return_settings_more - MENU_CALL tReboot, do_reset_menu2 ; confirm - MENU_CALL tResetDeco, do_reset_menu3 ; confirm - MENU_CALL tResetSettings, do_reset_menu4 ; confirm - MENU_CALL tResetLogbook, do_reset_menu5 ; confirm + MENU_CALL tReboot, do_reset_menu_reboot ; confirm + MENU_CALL tResetDeco, do_reset_menu_deco ; confirm + MENU_CALL tResetSettings, do_reset_menu_settings ; confirm + MENU_CALL tResetLogbook, do_reset_menu_logbook ; confirm MENU_CALL tResetBattery, do_new_battery_menu ; confirm MENU_END -do_reset_menu2: +do_reset_menu_reboot: MENU_BEGIN tResetMenu2, .2 MENU_CALL tAbort, do_return_settings_more_deeper - MENU_CALL tReboot, do_reboot ; reboot + MENU_CALL tReboot, do_reboot ; reboot (cold start) MENU_END -do_reset_menu3: +do_reset_menu_deco: MENU_BEGIN tResetMenu2, .2 MENU_CALL tAbort, do_return_settings_more_deeper - MENU_CALL tResetDeco, do_reset_deco ; reset deco + MENU_CALL tResetDeco, do_reset_deco ; reset deco and return to main reset menu MENU_END -do_reset_menu4: +do_reset_menu_settings: MENU_BEGIN tResetMenu2, .2 MENU_CALL tAbort, do_return_settings_more_deeper - MENU_CALL tResetSettings, do_reset_settings ; reset all settings + MENU_CALL tResetSettings, do_reset_settings ; reset all settings and go to surface mode MENU_END -do_reset_menu5: +do_reset_menu_logbook: MENU_BEGIN tResetMenu2, .2 MENU_CALL tAbort, do_return_settings_more_deeper - MENU_CALL tResetLogbook, do_reset_logbook ; reset logbook + MENU_CALL tResetLogbook, do_reset_logbook ; reset logbook and return to main reset menu MENU_END @@ -729,65 +798,64 @@ do_reset_deco: - SAFE_2BYTE_COPY last_surfpressure_30min,int_I_pres_respiration ; copy surface pressure to deco routine - SAFE_2BYTE_COPY last_surfpressure_30min,int_I_pres_surface ; copy surface pressure to deco routine - - call deco_clear_tissue ; set all tissues to Pamb * N2_ratio (C-Code) - call deco_calc_dive_interval_1min; calculate deco in surface mode - call deco_calc_desaturation_time ; calculate desaturation and no-fly time + call deco_clear_tissue ; set all tissues to absolute pressure * N2_ratio (C-code) + call deco_calc_dive_interval_1min ; update tissues by 1 minute to calculate current GF factor (C-code) + call deco_calc_desaturation_time ; calculate desaturation and no-fly/no-altitude time (C-code) banksel common + call vault_decodata_into_eeprom ; store updated deco data to EEPROM bra do_return_settings_more_deeper do_reset_settings: call TFT_ClearScreen ; clear screen call option_reset_all ; reset all options to factory default - goto restart ; restart into surfacemode + call do_logoffset_reset ; reset log offset + goto restart ; restart into surface mode do_reboot: - call ext_flash_enable_protection ; enables write protection + call ext_flash_enable_protection ; set write protection on external EEPROM + call rtc_init ; reset the real time clock (will reset to firmware creation date) reset +do_return_date_time_menu: + call menu_processor_double_pop ; drop exit line and back to last line do_date_time_menu: + bsf imprint_time_date ; start imprinting current time & date + bcf block_option_value ; allow display of option values again + MENU_BEGIN tSetTimeDate, .4 MENU_CALL tSetTime, do_time_menu MENU_CALL tSetDate, do_date_menu - MENU_OPTION tDateFormat, oDateFormat, 0 + MENU_OPTION tDateFormat, oDateFormat, 0 MENU_CALL tBack, do_return_settings MENU_END do_date_menu: - bsf settime_setdate + bsf block_option_value ; suspend display of option values MENU_BEGIN tSetDate, .4 MENU_OPTION tSetDay, oSetDay, 0 MENU_OPTION tSetMonth, oSetMonth, 0 MENU_OPTION tSetYear, oSetYear, 0 - MENU_CALL tBack, do_return_settings_deeper + MENU_CALL tBack, do_return_date_time_menu MENU_END -do_reset_seconds: - clrf secs - call rtc_set_rtc ; writes mins, sec, hours, day, month and year to RTC module - call menu_processor_pop ; clear the MENU_CALL for do_reset_seconds from the stack - ;bra do_time_menu ; direct jump-back into the menu - do_time_menu: - bsf settime_setdate + bsf block_option_value ; suspend display of option values MENU_BEGIN tSetTime, .4 MENU_OPTION tSetHours, oSetHours, 0 MENU_OPTION tSetMinutes, oSetMinutes, 0 - MENU_CALL tSetSeconds, do_reset_seconds - MENU_CALL tBack, do_return_settings_deeper + MENU_OPTION tSetSeconds, oClearSeconds, 0 + MENU_CALL tBack, do_return_date_time_menu MENU_END -do_toggle_ppo2_max: ; add 0.1 bar, with hard-coded max. - movff char_I_ppO2_max,lo ; banksafe +do_toggle_ppo2_max_work: ; add 0.1 bar, with hard-coded max. + movff char_I_ppO2_max_work,lo ; bank-safe copy movlw .10 addwf lo,F movlw ppo2_warning_high_highest @@ -796,11 +864,11 @@ movlw ppo2_warning_high_lowest movwf lo do_toggle_ppo2_max2: - movff lo,char_I_ppO2_max + movff lo,char_I_ppO2_max_work return do_toggle_ppo2_max_deco: ; add 0.1 bar, with hard-coded max. - movff char_I_ppO2_max_deco,lo ; banksafe + movff char_I_ppO2_max_deco,lo ; bank-safe copy movlw .10 addwf lo,F movlw ppo2_warning_deco_highest @@ -813,7 +881,7 @@ return do_toggle_ppo2_min: ; sub 0.1 bar, with hard-coded min. - movff char_I_ppO2_min,lo ; banksafe + movff char_I_ppO2_min,lo ; bank-safe copy incf lo,F movlw ppo2_warning_low_highest cpfsgt lo @@ -825,7 +893,7 @@ return do_toggle_ppo2_min_cc: ; sub 0.1 bar, with hard-coded min. - movff char_I_ppO2_min_loop,lo ; banksafe + movff char_I_ppO2_min_loop,lo ; bank-safe copy incf lo,F movlw ppo2_warning_loop_highest cpfsgt lo @@ -839,61 +907,82 @@ ; Logbook offset sub-menu do_log_offset_menu: - MENU_BEGIN tLogOffset, .6 - MENU_DYNAMIC TFT_LogOffset_Logtitle, 0 - MENU_CALL tLogOffsetp1, do_logoffset_plus1 - MENU_CALL tLogOffsetp10, do_logoffset_plus10 - MENU_CALL tLogOffsetm1, do_logoffset_minus1 - MENU_CALL tLogOffsetm10, do_logoffset_minus10 + + clrf WREG ; select an initial step size of 1 + movff WREG,opt_logoffset_step ; bank-safe write to option variable + + MENU_BEGIN tLogOffset, .5 + MENU_DYNAMIC TFT_LogOffset, 0 + MENU_OPTION tLogOffStepSize, oLogOffsetStep, 0 + MENU_CALL tLogOffsetplus, do_logoffset_plus + MENU_CALL tLogOffsetminus, do_logoffset_minus MENU_CALL tBack, do_return_settings_more MENU_END -do_logoffset_minus1: - call do_logoffset_common_read ; read into lo:hi - movlw .1 - subwf lo - movlw .0 - subwfb hi - btfss hi,7 ; < 0 ? - bra do_logoffset_exit ; store and return - clrf lo - clrf hi - bra do_logoffset_exit ; store and return +do_logoffset_common: + call do_logoffset_common_read ; read current offset into mpr+1:mpr+0 + movff opt_logoffset_step,ul ; get step size: 0=1, 1=10, 2=100, 3=1000 + incf ul,F ; 0...3 -> 1...4 + clrf mpr+3 ; clear step size, high byte + movlw .1 ; set a step size of 1 + movwf mpr+2 ; copy to step size, low byte + dcfsnz ul,F ; ul--, did ul became 0, i.e. step size = 1 ? + return ; YES - done + movlw .10 ; NO - set a step size of 10 + movwf mpr+2 ; - copy to step size, low byte + dcfsnz ul,F ; ul--, did ul became 0, i.e. step size = 10 ? + return ; YES - done + movlw .100 ; NO - set a step size of 100 + movwf mpr+2 ; - copy to step size, low byte + dcfsnz ul,F ; ul--, did ul became 0, i.e. step size = 100 ? + return ; YES - done + movlw LOW .1000 ; NO - set a step size of 1000, low byte + movwf mpr+2 ; - copy to step size, low byte + movlw HIGH .1000 ; - set a step size of 1000, high byte + movwf mpr+3 ; - copy to step size, high byte + return ; - done -do_logoffset_minus10: - call do_logoffset_common_read ; read into lo:hi - movlw .10 - subwf lo - movlw .0 - subwfb hi - btfss hi,7 ; < 0 ? - bra do_logoffset_exit ; store and return - clrf lo - clrf hi - bra do_logoffset_exit ; store and return +do_logoffset_plus: + rcall do_logoffset_common ; load current offset and step size + ; add step size to current offset + movf mpr+2,W ; get step size, low byte + addwf mpr+0,F ; add to offset, low byte + movf mpr+3,W ; get step size, high byte + addwfc mpr+1,F ; add to offset, high byte, considering carry flag + ; check if new offset is within limit + MOVLI .9999,sub_a ; load max limit into sub_a + MOVII mpr, sub_b ; copy new offset into sub_b + call cmpU16 ; compute sub_a - sub_b, setting neg_flag if result becomes negative + btfss neg_flag ; neg_flag set, i.e. new offset > 9999 ? + bra do_logoffset_exit ; NO - store offset and return + MOVLI .9999,mpr ; YES - limit offset to 9999 + bra do_logoffset_exit ; - store offset and return -do_logoffset_plus1: - call do_logoffset_common_read ; read into lo:hi - infsnz lo,F - incf hi,F - bra do_logoffset_exit ; store and return +do_logoffset_minus: + rcall do_logoffset_common ; load current offset and step size + ; subtract step size from current offset + movf mpr+2,W ; get step size, low byte + subwf mpr+0,F ; subtract from offset, low byte + movf mpr+3,W ; get step size, high byte + subwfb mpr+1,F ; subtract from offset, high byte, considering borrow flag + ; check if new offset is within limit + btfsc STATUS,C ; borrow to propagate (B == /CARRY) ? + bra do_logoffset_exit ; NO - result >= 0, store and return +do_logoffset_reset: + clrf mpr+0 ; YES - revert offset to 0, low byte + clrf mpr+1 ; - ... high byte + ;bra do_logoffset_exit ; - store offset and return -do_logoffset_plus10: - call do_logoffset_common_read ; read into lo:hi - movlw .10 - addwf lo - movlw .0 - addwfc hi do_logoffset_exit: - goto do_logoffset_common_write ; store and return + goto do_logoffset_common_write ; store offset and return + do_return_dispsets_menu: - bcf in_color_menu + bcf imprint_color_schemes ; not in color schemes menu any more call menu_processor_double_pop ; drop exit line and back to last line do_dispsets_menu: - IF _language_2!=none MENU_BEGIN tDispSets, .7 MENU_OPTION tBright, oBrightness, 0 @@ -917,19 +1006,32 @@ do_dispsets_menu_more: + IFDEF _helium MENU_BEGIN tDispSets, .7 MENU_OPTION tMODwarning, oMODwarning, 0 - MENU_OPTION tIBCDwarning, oEnable_IBCD, 0 +; MENU_OPTION tIBCDwarning, oEnable_IBCD, 0 ; taken out in favor of option oLayout MENU_OPTION tVSItext2, oVSItextv2, 0 MENU_OPTION tVSIgraph, oVSIgraph, 0 - MENU_OPTION tTimeoutDive, oDiveTimeout, 0 + MENU_OPTION tLayout, oLayout, 0 + MENU_OPTION t2ndDepth, o2ndDepthDisp, 0 + MENU_OPTION tTissueGraphics, oTissueGraphics, 0 + MENU_CALL tBack, do_return_dispsets_menu + MENU_END + ELSE + MENU_BEGIN tDispSets, .6 + MENU_OPTION tMODwarning, oMODwarning, 0 +; MENU_OPTION tIBCDwarning, oEnable_IBCD, 0 ; taken out in favor of option oLayout + MENU_OPTION tVSItext2, oVSItextv2, 0 + MENU_OPTION tVSIgraph, oVSIgraph, 0 + MENU_OPTION tLayout, oLayout, 0 MENU_OPTION t2ndDepth, o2ndDepthDisp, 0 MENU_CALL tBack, do_return_dispsets_menu MENU_END + ENDIF do_color_scheme: - bsf in_color_menu + bsf imprint_color_schemes ; in color schemes menu MENU_BEGIN tColorScheme, .2 MENU_OPTION tColorSetDive, oColorSetDive, 0 @@ -942,133 +1044,120 @@ do_new_battery_menu: MENU_BEGIN tNewBattTitle, .2 MENU_CALL tAbort, do_return_settings_more_deeper - MENU_CALL tYes, do_new_battery_select + MENU_CALL tYes, do_new_battery_select_1 MENU_END + global do_new_battery_select do_new_battery_select: + call TFT_boot ; initialize TFT (includes clear screen) + call TFT_Display_FadeIn ; dim up the display + call menu_processor_reset ; reset menu stack + +do_new_battery_select_1: + ; make sure to reset battery percentage + movlw .100 + movwf batt_percent ; set battery level to full + + ; default (in cases of timeout or USB): use old battery + call retrieve_battery_registers ; retrieve stored battery gauge value from EEPROM IFDEF _screendump - bsf enable_screen_dumps ; to prevent exiting into COMM mode immediately + bsf screen_dump_avail ; enable screen dump function to prevent exiting into COMM mode immediately ELSE - bsf disable_comm_mode ; to prevent exiting into COMM mode immediately + bsf comm_mode_disabled ; disable COMM mode to prevent exiting into COMM mode immediately ENDIF - call TFT_boot ; initialize TFT (includes clear screen) - call TFT_Display_FadeIn ; switch on backlight - movlw .100 - movwf batt_percent ; make sure to reset batt_percent - - ; Default (in cases of timeout or USB): use old battery - clrf EEADRH - read_int_eeprom 0x07 - movff EEDATA,battery_gauge+0 - read_int_eeprom 0x08 - movff EEDATA,battery_gauge+1 - read_int_eeprom 0x09 - movff EEDATA,battery_gauge+2 - read_int_eeprom 0x0A - movff EEDATA,battery_gauge+3 - read_int_eeprom 0x0B - movff EEDATA,battery_gauge+4 - read_int_eeprom 0x0C - movff EEDATA,battery_gauge+5 - - call menu_processor_reset ; restart from first item - - ; hardware_flag1: battery changeable by user charger supported battery types + ; hardware descriptor: user changeable battery charger supported battery types ; ------------------------------------------------------------------------------------------------------------------------------------------------------- - ; 0x11: BLE and battery gauge ---> OSTC 2 (old model ) NO YES internal 18650 - ; 0x05: analog input and battery gauge ---> OSTC 2 cR NO YES internal 18650 - ; 0x33: BLE and xmitter input and ambient sensor and battery gauge ---> OSTC 2 TR NO YES internal 16650 - ; 0x13: BLE and ambient sensor and battery gauge -+-> OSTC 2 (new model ) NO YES internal 16650 - ; +-> OSTC Plus YES YES 1.5V ----- NO! ----- 3.6V rechargeable - ; 0x12; BLE and ambient sensor ---> OSTC Sport (both models) YES NO 1.5V 3.6V disposable 3.6V rechargeable - ; 0x0A: optical input and ambient sensor ---> OSTC 3 /USB YES NO 1.5V 3.6V disposable 3.6V rechargeable - ; 0x02: ambient sensor ---> OSTC sport /USB YES NO 1.5V 3.6V disposable 3.6V rechargeable - ; 0x1A: BLE and optical input and ambient sensor ---> OSTC 3 /BLE YES NO 1.5V 3.6V disposable 3.6V rechargeable + ; 0x11: BLE and battery gauge ---> OSTC 2 (old model) NO YES internal 18650 + ; 0x05: analog input and battery gauge ---> OSTC 2 cR NO YES internal 18650 + ; 0x33: BLE and RX module and ambient sensor and battery gauge ---> OSTC 2 TR NO YES internal 16650 + ; 0x13: BLE and ambient sensor and battery gauge -+-> OSTC 2 (new model) NO YES internal 16650 + ; +-> OSTC Plus YES YES 1.5V ----- NO! ----- 3.6V rechargeable + ; 0x0A: optical input and ambient sensor ---> OSTC 3 (USB model) YES NO 1.5V 3.6V disposable 3.6V rechargeable + ; 0x1A: BLE and optical input and ambient sensor ---> OSTC 3 (BLE model) YES NO 1.5V 3.6V disposable 3.6V rechargeable + ; 0x02: ambient sensor ---> OSTC Sport (USB model) YES NO 1.5V 3.6V disposable 3.6V rechargeable + ; 0x52: BLE and ambient sensor and low volt core ---> OSTC Sport (BLE model) YES NO 1.5V 3.6V disposable 3.6V rechargeable - movlw 0x0A ; OSTC 3 /USB - cpfseq hardware_flag1 + movlw 0x11 ; OSTC 2 (old model) + cpfseq HW_descriptor bra $+4 - bra menu_new_battery_AA + bra use_18650_battery - movlw 0x02 ; OSTC Sport (USB model) - cpfseq hardware_flag1 - bra $+4 - bra menu_new_battery_AA - - movlw 0x13 ; OSTC 2 and Plus - cpfseq hardware_flag1 + movlw 0x05 ; OSTC 2 cR + cpfseq HW_descriptor bra $+4 - bra menu_new_battery_AA_16650 + bra use_18650_battery movlw 0x33 ; OSTC 2 TR - cpfseq hardware_flag1 + cpfseq HW_descriptor bra $+4 - bra menu_new_battery_AA_16650 + bra use_16650_battery - movlw 0x12 ; OSTC Sport - cpfseq hardware_flag1 - bra $+4 - bra menu_new_battery_AA +; movlw 0xXX ; OSTC 2 (new model) TODO: define signature +; cpfseq HW_descriptor +; bra $+4 +; bra use_16650_battery - movlw 0x1A ; OSTC 3 /BLE - cpfseq hardware_flag1 + movlw 0x13 ; OSTC Plus TODO: and OSTC 2 new model as of now + cpfseq HW_descriptor bra $+4 - bra menu_new_battery_AA + bra menu_new_battery_AA_charger - movlw 0x11 ; OSTC 2 (old model) - cpfseq hardware_flag1 - bra $+4 - bra menu_new_battery_18650 + ; movlw 0x0A ; OSTC 3 (USB model) + ; cpfseq HW_descriptor + ; bra $+4 + ; bra menu_new_battery_AA_no_charger + + ; movlw 0x1A ; OSTC 3 (BLE model) + ; cpfseq HW_descriptor + ; bra $+4 + ; bra menu_new_battery_AA_no_charger - movlw 0x05 ; OSTC 2 cR - cpfseq hardware_flag1 - bra $+4 - bra menu_new_battery_18650 + ; movlw 0x02 ; OSTC Sport (USB model) + ; cpfseq HW_descriptor + ; bra $+4 + ; bra menu_new_battery_AA_no_charger - bra use_old_batteries ; any unsupported value + ; movlw 0x52 ; OSTC Sport (BLE model) + ; cpfseq HW_descriptor + ; bra $+4 + ; bra menu_new_battery_AA_no_charger + + bra menu_new_battery_AA_no_charger ; any other model -do_return_menu_new_bat_AA_16650: +do_return_menu_new_bat_AA_chrg: call menu_processor_double_pop ; drop exit line and back to last line - ; OSTC 2, TR and Plus -menu_new_battery_AA_16650: - MENU_BEGIN tNewBattTitle, .4 - MENU_CALL tNewBattOld, use_old_batteries - MENU_CALL tNewBattNew15, use_new_15V_batteries ; OSTC Plus : not rechargeable -; MENU_CALL tNewBattNew36, use_new_36V_batteries ; OSTC Plus : not rechargeable -> not allowed any more !!! - MENU_CALL tNewBattAccu, pre_36V_rechargeable ; OSTC Plus : rechargeable -> goto safety question - MENU_CALL tNew16650, use_16650_battery ; OSTC 2, TR: rechargeable - MENU_END - - ; OSTC 3 and Sport (no charging function) -menu_new_battery_AA: + ; OSTC Plus (charging function) TODO: and OSTC 2 new model as of now +menu_new_battery_AA_charger: MENU_BEGIN tNewBattTitle, .4 MENU_CALL tNewBattOld, use_old_batteries MENU_CALL tNewBattNew15, use_new_15V_batteries ; not rechargeable - MENU_CALL tNewBattNew36, use_new_36V_batteries ; not rechargeable - MENU_CALL tNewBattAccu, use_36V_rechargeable ; rechargeable +; MENU_CALL tNewBattNew36, use_36V_disposable ; not rechargeable -> not allowed any more !!! + MENU_CALL tNewBattAccu, pre_36V_rechargeable ; rechargeable -> goto safety question + MENU_CALL tNew16650, use_16650_battery ; OSTC 2 new model TODO: remove when OSTC 2 new model can be separated from Plus MENU_END - ; OSTC 2 (big housing) and cR -menu_new_battery_18650: - MENU_BEGIN tNewBattTitle, .2 - MENU_CALL tNewBattOld, use_old_batteries - MENU_CALL tNew18650, use_18650_battery ; rechargeable - MENU_END - - pre_36V_rechargeable: MENU_BEGIN tNewBattTitle, .5 MENU_CALL tConfirmChargeable1, 0 ; safety question, line 1 MENU_CALL tConfirmChargeable2, 0 ; safety question, line 2 MENU_CALL tConfirmChargeable3, 0 ; safety question, line 3 - MENU_CALL tNo, do_return_menu_new_bat_AA_16650 ; NO - go back - MENU_CALL tYes, use_36V_rechargeable ; YES - confirmed rechargeable + MENU_CALL tNo, do_return_menu_new_bat_AA_chrg ; NO - go back + MENU_CALL tYes, use_37V_rechargeable ; YES - confirmed rechargeable + MENU_END + + ; OSTC 3 and Sport (no charging function) +menu_new_battery_AA_no_charger: + MENU_BEGIN tNewBattTitle, .4 + MENU_CALL tNewBattOld, use_old_batteries + MENU_CALL tNewBattNew15, use_new_15V_batteries ; not rechargeable + MENU_CALL tNewBattNew36, use_36V_disposable ; not rechargeable + MENU_CALL tNewBattAccu, use_37V_rechargeable ; rechargeable MENU_END @@ -1080,7 +1169,7 @@ return ; NO - done call lt2942_get_status ; check for gauge IC - movlw .3 ; assume a 18650 + movlw .3 ; Assume a 18650 btfss battery_gauge_available ; cR/2 hardware? movlw .1 ; assume a Saft movwf EEDATA @@ -1088,165 +1177,118 @@ return - global use_old_batteries use_old_batteries: - clrf EEADRH - read_int_eeprom 0x07 - movff EEDATA,battery_gauge+0 - read_int_eeprom 0x08 - movff EEDATA,battery_gauge+1 - read_int_eeprom 0x09 - movff EEDATA,battery_gauge+2 - read_int_eeprom 0x0A - movff EEDATA,battery_gauge+3 - read_int_eeprom 0x0B - movff EEDATA,battery_gauge+4 - read_int_eeprom 0x0C - movff EEDATA,battery_gauge+5 - read_int_eeprom 0x0F - movff EEDATA,battery_type ; =0:1.5V, =1:3,6V Saft, =2:LiIon 3,7V/0.8Ah, =3:LiIon 3,7V/3.1Ah, =4: LiIon 3,7V/2.3Ah - - rcall setup_new_saft ; set a save default, not rechargeable - - incf EEDATA,F ; 1...5 - dcfsnz EEDATA,F - rcall setup_new_15v ; =0 - dcfsnz EEDATA,F - rcall setup_new_saft ; =1 - dcfsnz EEDATA,F - rcall setup_new_panasonic ; =2 - dcfsnz EEDATA,F - rcall setup_new_18650 ; =3 - dcfsnz EEDATA,F - rcall setup_new_16650 ; =4 - - bcf use_old_batt_flag ; clear flag - - IFNDEF _screendump - bcf disable_comm_mode ; re-enable COMM mode again - ENDIF - - goto surfloop ; jump to surface loop + rcall get_battery_data ; load data of old battery + goto surfloop ; proceed to surface loop + global get_battery_data +get_battery_data: + call retrieve_battery_registers ; retrieve stored battery gauge value from EEPROM + movff battery_type,lo ; copy retrieved battery type to lo + rcall setup_new_saft ; default battery configuration + incf lo,F ; (0-4) -> (1-5) + dcfsnz lo,F + rcall setup_new_15v ; =0 + dcfsnz lo,F + rcall setup_new_saft ; =1 + dcfsnz lo,F + rcall setup_new_panasonic ; =2 + dcfsnz lo,F + rcall setup_new_18650 ; =3 + dcfsnz lo,F + rcall setup_new_16650 ; =4 + bcf use_old_batt_flag ; clear flag + IFNDEF _screendump + bcf comm_mode_disabled ; re-enable COMM mode again + ENDIF + return ; done + + + ; disposable 1.5 Volt Alkaline setup_new_15v: - bsf charge_disable - bcf TRISE,2 + bsf charge_disable ; set charging-inhibit signal + bcf charge_enable ; activate charging-inhibit signal movlw .100 movwf batt_percent ; to have 1.5V batteries right after firmware update movlw .0 - movff WREG,battery_type + movwf battery_type + return + + ; disposable 3.6 Volt Lithium +setup_new_saft: + bsf charge_disable ; set charging-inhibit signal + bcf charge_enable ; activate charging-inhibit signal + MOVLI capacity_saft_internal, battery_capacity_internal + MOVLI capacity_saft, battery_capacity + MOVLI offset_saft, battery_offset + movlw .1 + movwf battery_type + return + + ; rechargeable user-changeable 3.7 Volt Lithium-ion +setup_new_panasonic: + bcf charge_disable ; release charging-inhibit signal + bsf charge_enable ; tristate charging-inhibit signal + MOVLI capacity_panasonic_internal, battery_capacity_internal + MOVLI capacity_panasonic, battery_capacity + MOVLI offset_panasonic, battery_offset + movlw .2 + movwf battery_type + return + + ; rechargeable internal Lithium-ion +setup_new_18650: + bcf charge_disable ; release charging-inhibit signal + bsf charge_enable ; tristate charging-inhibit signal + CLRI battery_capacity_internal + MOVLI capacity_ncr18650, battery_capacity + MOVLI offset_ncr18650, battery_offset + movlw .3 + movwf battery_type + return + + ; rechargeable internal Lithium-ion +setup_new_16650: + bcf charge_disable ; release charging-inhibit signal + bsf charge_enable ; tristate charging-inhibit signal + CLRI battery_capacity_internal + MOVLI capacity_ur16650, battery_capacity + MOVLI offset_ur16650, battery_offset + movlw .4 + movwf battery_type return -setup_new_saft: - banksel battery_capacity - movlw LOW internal_saft_capacity - movwf internal_battery_capacity+0 - movlw HIGH internal_saft_capacity - movwf internal_battery_capacity+1 - movlw LOW saft_capacity - movwf battery_capacity+0 - movlw HIGH saft_capacity - movwf battery_capacity+1 - movlw LOW saft_offset - movwf battery_offset+0 - movlw HIGH saft_offset - movwf battery_offset+1 - banksel common - bsf charge_disable - bcf TRISE,2 - movlw .1 - movff WREG,battery_type - return - +use_new_15V_batteries: + rcall setup_new_15v + bra use_batt_exit -setup_new_panasonic: - banksel battery_capacity - movlw LOW internal_panasonic_capacity - movwf internal_battery_capacity+0 - movlw HIGH internal_panasonic_capacity - movwf internal_battery_capacity+1 - movlw LOW panasonic_capacity - movwf battery_capacity+0 - movlw HIGH panasonic_capacity - movwf battery_capacity+1 - movlw LOW panasonic_offset - movwf battery_offset+0 - movlw HIGH panasonic_offset - movwf battery_offset+1 - banksel common - bcf charge_disable - bsf TRISE,2 - movlw .2 - movff WREG,battery_type - return - +use_36V_disposable: + rcall setup_new_saft + bra use_batt_exit -setup_new_18650: - banksel battery_capacity - clrf internal_battery_capacity+0 - clrf internal_battery_capacity+1 - movlw LOW ncr18650_capacity - movwf battery_capacity+0 - movlw HIGH ncr18650_capacity - movwf battery_capacity+1 - movlw LOW ncr18650_offset - movwf battery_offset+0 - movlw HIGH ncr18650_offset - movwf battery_offset+1 - banksel common - bcf charge_disable - bsf TRISE,2 - movlw .3 - movff WREG,battery_type - return - - -setup_new_16650: - banksel battery_capacity - clrf internal_battery_capacity+0 - clrf internal_battery_capacity+1 - movlw LOW ur16650_capacity - movwf battery_capacity+0 - movlw HIGH ur16650_capacity - movwf battery_capacity+1 - movlw LOW ur16650_offset - movwf battery_offset+0 - movlw HIGH ur16650_offset - movwf battery_offset+1 - banksel common - bcf charge_disable - bsf TRISE,2 - movlw .4 - movff WREG,battery_type - return - +use_37V_rechargeable: + rcall setup_new_panasonic + call reset_battery_internal_only + bra use_batt_exit_1 use_16650_battery: rcall setup_new_16650 bra use_batt_exit + use_18650_battery: rcall setup_new_18650 - bra use_batt_exit -use_new_36V_batteries: - rcall setup_new_saft - bra use_batt_exit -use_new_15V_batteries: - rcall setup_new_15v + ;bra use_batt_exit + use_batt_exit: - call reset_battery_pointer ; resets battery pointer 0x07-0x0C and battery_gauge:5 -use_batt_exit1: - + call reset_battery_pointer ; reset battery pointer 0x07-0x0C and battery gauge +use_batt_exit_1: IFNDEF _screendump - bcf disable_comm_mode ; re-enable COMM mode again + bcf comm_mode_disabled ; re-enable COMM mode again ENDIF - goto surfloop ; jump to surface loop -use_36V_rechargeable: - rcall setup_new_panasonic - call reset_battery_internal_only - bra use_batt_exit1 ; jump to surface loop +;----------------------------------------------------------------------------- - END \ No newline at end of file + END