comparison src/option_table.asm @ 562:8b7ea27ea1fa

seperate desat and sat multipliers for GF and Non-GF modes. Set to 100/100 as default in GF mode
author heinrichsweikamp
date Sat, 03 Feb 2018 15:17:01 +0100
parents b7eb98dbd800
children f4faff954816
comparison
equal deleted inserted replaced
561:9c54849b8d3b 562:8b7ea27ea1fa
91 91
92 ;============================================================================= 92 ;=============================================================================
93 extern tPercent, tMeters, tMinutes, tGasDisabled, tbar 93 extern tPercent, tMeters, tMinutes, tGasDisabled, tbar
94 extern char_I_deco_gas_change, char_I_setpoint_change, char_I_setpoint_cbar, char_I_dil_change 94 extern char_I_deco_gas_change, char_I_setpoint_change, char_I_setpoint_cbar, char_I_dil_change
95 extern char_I_dive_interval, char_I_bottom_time, char_I_bottom_depth 95 extern char_I_dive_interval, char_I_bottom_time, char_I_bottom_depth
96 extern char_I_deco_model, char_I_saturation_multiplier, char_I_desaturation_multiplier 96 extern char_I_deco_model
97 extern char_I_extra_time 97 extern char_I_extra_time
98 extern tDefName, tblank 98 extern tDefName, tblank
99 extern char_I_bottom_usage, char_I_deco_usage, tLitersMinute 99 extern char_I_bottom_usage, char_I_deco_usage, tLitersMinute
100 100
101 ; NEW ## deco engine 101 ; NEW ## deco engine
132 OPTION_ENUM8 oDecoMode, 2, 1, tZHL16, .9, char_I_deco_model ; 0 = ZH-L16, 1 = ZH-L16-GF 132 OPTION_ENUM8 oDecoMode, 2, 1, tZHL16, .9, char_I_deco_model ; 0 = ZH-L16, 1 = ZH-L16-GF
133 OPTION_UINT8p10 oPPO2Max, .120, ppo2_warning_high, .160, 0, .10, char_I_ppO2_max 133 OPTION_UINT8p10 oPPO2Max, .120, ppo2_warning_high, .160, 0, .10, char_I_ppO2_max
134 OPTION_UINT8 oLastDeco, .3, .6, .3, tMeters, .11, opt_last_stop 134 OPTION_UINT8 oLastDeco, .3, .6, .3, tMeters, .11, opt_last_stop
135 OPTION_UINT8 oGF_low, .10, .100, .30, tPercent, .12, opt_GF_low 135 OPTION_UINT8 oGF_low, .10, .100, .30, tPercent, .12, opt_GF_low
136 OPTION_UINT8 oGF_high, .45, .110, .85, tPercent, .13, opt_GF_high 136 OPTION_UINT8 oGF_high, .45, .110, .85, tPercent, .13, opt_GF_high
137 OPTION_UINT8p5 osatmult, .100, .140, .110,tPercent, .14, char_I_saturation_multiplier 137 OPTION_UINT8p5 osatmultgf, .100, .140, .100,tPercent, .14, opt_sat_multiplier_gf ; For GF Mode
138 OPTION_UINT8p5 odesatmult, .60, .100, .90,tPercent, .15, char_I_desaturation_multiplier 138 OPTION_UINT8p5 odesatmultgf, .60, .100, .100,tPercent, .15, opt_desat_multiplier_gf ; For GF Mode
139 OPTION_UINT8p10 oPPO2Min, .16, ppo2_warning_low, .19, 0, .16, char_I_ppO2_min 139 OPTION_UINT8p10 oPPO2Min, .16, ppo2_warning_low, .19, 0, .16, char_I_ppO2_min
140 OPTION_UINT8 oaGF_low, .10, .100, .30, tPercent, .17, opt_aGF_low 140 OPTION_UINT8 oaGF_low, .10, .100, .30, tPercent, .17, opt_aGF_low
141 OPTION_UINT8 oaGF_high, .45, .110, .85, tPercent, .18, opt_aGF_high 141 OPTION_UINT8 oaGF_high, .45, .110, .85, tPercent, .18, opt_aGF_high
142 OPTION_BOOL oEnable_aGF, 0, .19, opt_enable_aGF ; =1: aGF can be selected underwater 142 OPTION_BOOL oEnable_aGF, 0, .19, opt_enable_aGF ; =1: aGF can be selected underwater
143 OPTION_UINT8 oCompassGain, 0, 7, 6, tMinutes, .20, opt_compass_gain ; 0-7 (230LSB/Gauss to 1370LSB/Gauss) 143 OPTION_UINT8 oCompassGain, 0, 7, 6, tMinutes, .20, opt_compass_gain ; 0-7 (230LSB/Gauss to 1370LSB/Gauss)
260 OPTION_UINT8 oTankFillPres4, .5, .29, .20, tbar10, .181, char_I_tank_pres_fill+3 ; fill press of OC gas tank 4 260 OPTION_UINT8 oTankFillPres4, .5, .29, .20, tbar10, .181, char_I_tank_pres_fill+3 ; fill press of OC gas tank 4
261 OPTION_UINT8 oTankFillPres5, .5, .29, .20, tbar10, .182, char_I_tank_pres_fill+4 ; fill press of OC gas tank 5 261 OPTION_UINT8 oTankFillPres5, .5, .29, .20, tbar10, .182, char_I_tank_pres_fill+4 ; fill press of OC gas tank 5
262 OPTION_UINT8 oCCmaxFracO2, .80, .100, .90, tPercent,.183, char_I_cc_max_frac_o2 ; max. O2 % in Loop 262 OPTION_UINT8 oCCmaxFracO2, .80, .100, .90, tPercent,.183, char_I_cc_max_frac_o2 ; max. O2 % in Loop
263 OPTION_UINT8 oSimSetpoint, .1, .5, .1, tblank, .184, opt_sim_setpoint_number ; setpoint to use for deco calculation 263 OPTION_UINT8 oSimSetpoint, .1, .5, .1, tblank, .184, opt_sim_setpoint_number ; setpoint to use for deco calculation
264 OPTION_BOOL oCalcAscGas, 0, .185, opt_calc_asc_gasvolume ; calculate OC gas volume needs for ascent 264 OPTION_BOOL oCalcAscGas, 0, .185, opt_calc_asc_gasvolume ; calculate OC gas volume needs for ascent
265 OPTION_BOOL oSimAGF, 0, -1, opt_sim_use_aGF ; use GF (no) or aGF (yes) for deco calculation 265 OPTION_BOOL oSimAGF, 0, -1, opt_sim_use_aGF ; use GF (no) or aGF (yes) for deco calculation
266 OPTION_ENUM8 oAltMode, 4, 0, tAltModeFly, .186, char_I_altitude_wait ; 0=no-fly, 1=1000m, 2=2000m, 3=3000m 266 OPTION_ENUM8 oAltMode, 4, 0, tAltModeFly, .186, char_I_altitude_wait ; 0=no-fly, 1=1000m, 2=2000m, 3=3000m
267 OPTION_BOOL oEnable_IBCD, 0, .187, opt_enable_IBCD ; =1: IBCD warning activated 267 OPTION_BOOL oEnable_IBCD, 0, .187, opt_enable_IBCD ; =1: IBCD warning activated
268 OPTION_UINT8 oAscentSpeed, .5, .10, .10,tMeterMinute,.188, char_I_ascent_speed ; ascent speed - Attention: proper operation with other values than the default of 10m/min has not been validated yet! Do not deviate from the default until further notice! 268 OPTION_UINT8 oAscentSpeed, .5, .10, .10,tMeterMinute,.188, char_I_ascent_speed ; ascent speed - Attention: proper operation with other values than the default of 10m/min has not been validated yet! Do not deviate from the default until further notice!
269 OPTION_UINT8 oGasChangeTime,.0, .3, .1, tmin ,.198, char_I_gas_change_time ; (extra) time at a stop to change the gas 269 OPTION_UINT8 oGasChangeTime,.0, .3, .1, tmin ,.189, char_I_gas_change_time ; (extra) time at a stop to change the gas
270 OPTION_UINT8p5 osatmult, .100, .140, .110,tPercent,.190, opt_sat_multiplier_non_gf ; For NON-GF Mode
271 OPTION_UINT8p5 odesatmult, .60, .100, .90,tPercent,.191, opt_desat_multiplier_non_gf ; For NON-GF Mode
270 272
271 ;============================================================================= 273 ;=============================================================================
272 ; Set Time/Set Date (RAM only) 274 ; Set Time/Set Date (RAM only)
273 OPTION_UINT8 oSetHours, .0, .23, .0, 0, -1, hours 275 OPTION_UINT8 oSetHours, .0, .23, .0, 0, -1, hours
274 OPTION_UINT8 oSetMinutes, .0, .59, .0, 0, -1, mins 276 OPTION_UINT8 oSetMinutes, .0, .59, .0, 0, -1, mins