comparison src/gaslist.asm @ 518:72f6cb65ca4a

BUGFIX: Do not check ppO2 for disabled gases
author heinrichsweikamp
date Thu, 03 Aug 2017 17:17:25 +0200
parents 4e6f5c36f4cc
children 06e9370c6d75
comparison
equal deleted inserted replaced
517:d339c9e1175d 518:72f6cb65ca4a
209 209
210 movf gaslist_gas,W ; (0-4 for OC/Bailout, 5-9 for Diluents) 210 movf gaslist_gas,W ; (0-4 for OC/Bailout, 5-9 for Diluents)
211 movf PLUSW1,W 211 movf PLUSW1,W
212 bnz gaslist_strcat_3 212 bnz gaslist_strcat_3
213 call TFT_disabled_color 213 call TFT_disabled_color
214 bra gaslist_strcat_4 ; NEW ; No MOD-check and red color for disabled gases
214 gaslist_strcat_3: 215 gaslist_strcat_3:
215 rcall gaslist_strcat_gas_0
216 PUTC " "
217 ; Read switch depth 216 ; Read switch depth
218 lfsr FSR1,char_I_dil_change-.5 ; Setup Diluents-5 217 lfsr FSR1,char_I_dil_change-.5 ; Setup Diluents-5
219 movlw .4 218 movlw .4
220 cpfsgt gaslist_gas ; >4? (-> Diluents) 219 cpfsgt gaslist_gas ; >4? (-> Diluents)
221 lfsr FSR1,opt_OC_bail_gas_change ; Setup OC Gases 220 lfsr FSR1,opt_OC_bail_gas_change ; Setup OC Gases
225 rcall gaslist_calc_mod ; Compute MOD into WREG 224 rcall gaslist_calc_mod ; Compute MOD into WREG
226 cpfsgt lo 225 cpfsgt lo
227 bra gaslist_strcat_4 226 bra gaslist_strcat_4
228 call TFT_warnings_color ; Turn red if bigger 227 call TFT_warnings_color ; Turn red if bigger
229 gaslist_strcat_4: 228 gaslist_strcat_4:
230 TSTOSS opt_units ; 0=Meters, 1=Feets 229 rcall gaslist_strcat_gas_0
231 bra gaslist_strcat_3_metric 230 PUTC " "
231
232 TSTOSS opt_units ; 0=Meters, 1=Feets
233 bra gaslist_strcat_3_metric
232 ;gaslist_strcat_3_imperial: 234 ;gaslist_strcat_3_imperial:
233 btfsc ccr_diluent_setup ; =1: Setting up Diluents ("Gas6-10") 235 btfsc ccr_diluent_setup ; =1: Setting up Diluents ("Gas6-10")
234 bra gaslist_imperial_non_travel 236 bra gaslist_imperial_non_travel
235 movf gaslist_gas,W 237 movf gaslist_gas,W
236 lfsr FSR1,opt_gas_type ; Read opt_gas_type[WREG] 238 lfsr FSR1,opt_gas_type ; Read opt_gas_type[WREG]