rusefi
/
rusefi
mirror of https://github.com/rusefi/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
rusefi 2020-04-19 15:24:12 -04:00
parent d7a6356f1d a243b36504
commit 581d0d5711
3 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
firmware/controllers/math/speed_density.cpp
View File

@ -37,14 +37,27 @@ baroCorr_Map3D_t baroCorrMap("baro");
// http://rusefi.com/math/t_charge.html
/***panel:Charge Temperature*/
temperature_t getTCharge(int rpm, float tps DECLARE_ENGINE_PARAMETER_SUFFIX) {
const auto [cltValid, coolantTemp] = Sensor::get(SensorType::Clt);
const auto [iatValid, airTemp] = Sensor::get(SensorType::Iat);
if (!cltValid || !iatValid) {
warning(CUSTOM_ERR_NAN_TCHARGE, "getTCharge invalid iat/clt");
const auto clt = Sensor::get(SensorType::Clt);
const auto iat = Sensor::get(SensorType::Iat);
float airTemp = 0;
// Without either valid, return 0C. It's wrong, but it'll pretend to be nice and dense, so at least you won't go lean.
if (!iat && !clt) {
return 0;
} else if (!clt && iat) {
// Intake temperature will almost always be colder (richer) than CLT - use that
return airTemp;
} else if (!iat && clt) {
// Without valid intake temperature, assume intake temp is 0C, and interpolate anyway
airTemp = 0;
} else {
// All is well - use real air temp
airTemp = iat.Value;
}
float coolantTemp = clt.Value;
DISPLAY_STATE(Engine)
if ((engine->engineState.sd.DISPLAY_IF(isTChargeAirModel) = (CONFIG(tChargeMode) == TCHARGE_MODE_AIR_INTERP))) {

11
firmware/integration/rusefi_config.txt
View File

@ -799,7 +799,7 @@ custom maf_sensor_type_e 4 bits, S32, @OFFSET@, [0:7], @@maf_sensor_type_e_enum@
bit enableLaunchRetard
bit enableLaunchBoost
bit launchDisableBySpeed
bit unusedBit_251_7
bit enableInnovateLC2
bit unusedBit_251_8
bit unusedBit_251_9
bit unusedBit_251_10
@ -1030,9 +1030,9 @@ int16_t tps2Max;Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!\
int16_t iacByTpsTaper;+Extra IAC, in percent between 0 and 100, tapered between zero and idle deactivation TPS value;"percent", 1, 0, 0, 500, 0
brain_pin_e unusedErrorPin;
brain_pin_e auxSerialTxPin;set_aux_tx_pin X;
brain_pin_e warningLedPin;
brain_pin_e unused1234234;
brain_pin_e auxSerialRxPin;set_aux_rx_pin X;
brain_pin_e LIS302DLCsPin;
@ -1055,7 +1055,9 @@ int16_t tps2Max;Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!\
float slowAdcAlpha;+ExpAverage alpha coefficient;"coeff", 1, 0, 0, 200, 3
debug_mode_e debugMode;+See http://rusefi.com/s/debugmode\n\nset debug_mode X
uint32_t[9] unused_former_warmup_target_afr;
uint32_t auxSerialSpeed;;"BPs", 1, 0, 0,1000000, 0
uint32_t[8] unused_former_warmup_target_afr;
float boostCutPressure;kPa value at which we need to cut fuel and spark, 0 if not enabled;"kPa", 1, 0, 0, 500, 0
@ -1513,3 +1515,4 @@ end_struct
#define ts_show_can_pins true
#define ts_show_tunerstudio_port true
#define ts_show_trigger_comparator false
#define ts_show_auxserial_pins true

13
firmware/tunerstudio/rusefi.input
View File

@ -1944,6 +1944,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "servo#3", servoOutputPins3
field = "servo#4", servoOutputPins4
field = "servo#5", servoOutputPins5
field = "AUX Serial TX", auxSerialTxPin
field = "AUX Serial RX", auxSerialRxPin
dialog = allPins1_1_and_2, "", xAxis
@ -2077,9 +2079,10 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "Heater pin", o2heaterPin
dialog = egoSettings, "", yAxis
panel = egoSettings_IO, {enableAemXSeries == 0}
panel = egoSettings_sensor, {afr_hwChannel != 16 && enableAemXSeries == 0}
panel = egoSettings_IO
panel = egoSettings_sensor, {afr_hwChannel != 16 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
field = "Enable AEM X-Series CANbus", enableAemXSeries, { canReadEnabled }
field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
; Engine->EGT inputs
dialog = egtInputs, "EGT inputs"
@ -2403,6 +2406,11 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "Can Sleep Period", canSleepPeriodMs
field = "RX pin", canRxPin @@if_ts_show_can_pins
field = "TX pin", canTxPin @@if_ts_show_can_pins
dialog = auxSerial, "AUX Serial"
field = "RX pin", auxSerialRxPin @@if_ts_show_auxserial_pins
field = "TX pin", auxSerialTxPin @@if_ts_show_auxserial_pins
field = "Serial Baud Rate", auxSerialSpeed @@if_ts_show_auxserial_pins
dialog = sdCard, "SD Card Logger"
field = "SdCard", isSdCardEnabled
@ -2439,6 +2447,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "ADC vRef voltage", adcVcc
panel = tsPort @@if_ts_show_tunerstudio_port
panel = canBus
panel = auxSerial
panel = sdCard @@if_ts_show_sd_card
panel = gpsReceiver @@if_ts_show_gps
panel = tle8888