Mercurial > public > hwos_code
diff src/gaslist.asm @ 521:06e9370c6d75
CHANGE: Apply safety margin parameters to both models (GF and non-GF)
Put B?hlmann constants in code for readability
Fix unused gas warning (Do not warn)
| author | heinrichsweikamp |
|---|---|
| date | Fri, 04 Aug 2017 16:01:28 +0200 |
| parents | 72f6cb65ca4a |
| children | d36f9fca10ae |
line wrap: on
line diff
--- a/src/gaslist.asm Fri Aug 04 13:41:29 2017 +0200 +++ b/src/gaslist.asm Fri Aug 04 16:01:28 2017 +0200 @@ -153,7 +153,7 @@ movf gaslist_gas,W lfsr FSR1,char_I_setpoint_change movff PLUSW1,lo - bra gaslist_strcat_4 ; And return... + bra gaslist_strcat_5 ; And return... ;---------------------------------------------------------------------------- ; Append gas description to current string. @@ -213,6 +213,8 @@ call TFT_disabled_color bra gaslist_strcat_4 ; NEW ; No MOD-check and red color for disabled gases gaslist_strcat_3: + rcall gaslist_strcat_gas_0 + PUTC " " ; Read switch depth lfsr FSR1,char_I_dil_change-.5 ; Setup Diluents-5 movlw .4 @@ -223,12 +225,25 @@ movff PLUSW1,lo rcall gaslist_calc_mod ; Compute MOD into WREG cpfsgt lo - bra gaslist_strcat_4 + bra gaslist_strcat_5 call TFT_warnings_color ; Turn red if bigger + bra gaslist_strcat_5 ; skip gaslist_strcat_gas_0 here gaslist_strcat_4: - rcall gaslist_strcat_gas_0 + rcall gaslist_strcat_gas_0 PUTC " " + + ; Dummy code, needs some cleanup somedays... + ; Read switch depth + lfsr FSR1,char_I_dil_change-.5 ; Setup Diluents-5 + movlw .4 + cpfsgt gaslist_gas ; >4? (-> Diluents) + lfsr FSR1,opt_OC_bail_gas_change ; Setup OC Gases + movf gaslist_gas,W ; (0-4 for OC/Bailout, 5-9 for Diluents) + movff PLUSW1,lo + ;rcall gaslist_calc_mod ; Compute MOD into WREG + +gaslist_strcat_5: TSTOSS opt_units ; 0=Meters, 1=Feets bra gaslist_strcat_3_metric ;gaslist_strcat_3_imperial: @@ -706,9 +721,9 @@ lfsr FSR1,opt_OC_bail_gas_change ; No, setup OC Gases movf PLUSW1,W cpfslt lo - bra gaslist_strcat_4 ; And return... + bra gaslist_strcat_5 ; And return... call TFT_warnings_color ; Turn red if bigger ! - bra gaslist_strcat_4 ; And return... + bra gaslist_strcat_5 ; And return... ;---------------------------------------------------------------------------- global gaslist_reset_mod