From 7b590173b52c7961303e08a9ebbbdb4889ac23b0 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Thu, 30 Apr 2020 13:05:20 -0700 Subject: [PATCH 1/3] fsio settings -> 2 decimals (#1388) Co-authored-by: Matthew Kennedy --- firmware/integration/rusefi_config.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 649df5e309..29a08d05cc 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -765,7 +765,7 @@ custom fsio_pwm_freq_t 2 scalar, U16, @OFFSET@, "Hz", 1, 0, fsio_pwm_freq_t[FSIO_COMMAND_COUNT iterate] fsioFrequency; -custom fsio_setting_t 4 scalar, F32, @OFFSET@, "Val", 1, 0, 0, 18000, 4 +custom fsio_setting_t 4 scalar, F32, @OFFSET@, "Val", 1, 0, 0, 18000, 2 fsio_setting_t[FSIO_COMMAND_COUNT iterate] fsio_setting; ! todo: migrate to spi_pins & combine with spi pin modes From 81935b8b262bfd20e4fe69f90edb43bae6f2e69b Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Thu, 30 Apr 2020 15:03:56 -0700 Subject: [PATCH 2/3] Trigger dialog cleanup (#1389) * trigger dialog simplify * more cleanup Co-authored-by: Matthew Kennedy --- firmware/tunerstudio/rusefi.input | 36 ++++++++++++++++--------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index cda902b2b0..79edc4913a 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1238,6 +1238,7 @@ menuDialog = main menu = "&Base &Engine" subMenu = engineChars, "Base engine" subMenu = triggerConfiguration, "Trigger" + subMenu = triggerConfiguration_IO, "Advanced Trigger" subMenu = std_separator subMenu = energySystems, "Battery and alternator" subMenu = std_separator @@ -1354,7 +1355,6 @@ menuDialog = main menu = "&Sensors" # Base analog input settings - subMenu = triggerInputs, "Trigger inputs" subMenu = otherSensorInputs, "Misc sensors" subMenu = analogInputSettings, "Analog input settings" subMenu = std_separator @@ -1631,9 +1631,12 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Firing Order", firingOrder ; Engine->Trigger configuration - dialog = triggerConfiguration_settings, "Settings Trigger" + dialog = triggerConfiguration_settings, "Trigger Pattern" field = "!https://rusefi.com/s/trigger" field = "Trigger type", trigger_type + field = "Total tooth count", trigger_customTotalToothCount, {trigger_type == 0}, {trigger_type == 0} + field = "Missing/skipped tooth count", trigger_customSkippedToothCount, {trigger_type == 0}, {trigger_type == 0} + ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "Operation mode / speed", ambiguousOperationMode field = "With VR sensors only rising edge has reliable position" @@ -1642,11 +1645,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Offset", globalTriggerAngleOffset field = "Display only interesting", displayLogicLevelsInEngineSniffer - field = "#Custom Trigger" - field = "total Tooth Count", trigger_customTotalToothCount, {trigger_type == 0} - field = "skipped Tooth Count", trigger_customSkippedToothCount, {trigger_type == 0} - dialog = triggerConfiguration_IO, "Settings I/O" + dialog = triggerConfiguration_IO, "Advanced Trigger" field = "!https://rusefi.com/s/vvt" field = "VVT mode", vvtMode, {trigger_type != 80} field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80} @@ -1655,9 +1655,21 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "print verbose sync details to console",verboseTriggerSynchDetails field = "Do not print messages in case of sync error", silentTriggerError field = "Enable noise filtering", useNoiselessTriggerDecoder, {trigger_type == @@TRIGGER_TYPE_60_2@@ || trigger_type == @@TRIGGER_TYPE_36_1@@} + + dialog = triggerInputs, "Trigger Inputs" + field = "!ECU reboot needed to apply these settings" + field = "#Cam is primary if you have cam sensor" + field = "Primary channel", triggerInputPins1 + field = "Invert Primary", invertPrimaryTriggerSignal + field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} + field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} + field = "Cam Sync/VVT input", camInputs1 + panel = triggerInputComparator @@if_ts_show_trigger_comparator + + dialog = triggerConfiguration panel = triggerConfiguration_settings, North - panel = triggerConfiguration_IO, South + panel = triggerInputs, South ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis @@ -1810,16 +1822,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Comparator hysteresis voltage (Max)", triggerCompHystMax field = "VR-sensor saturation RPM", triggerCompSensorSatRpm - dialog = triggerInputs, "Trigger Inputs" - field = "!ECU reboot needed to apply these settings" - field = "#Cam is primary if you have cam sensor" - field = "Primary channel", triggerInputPins1 - field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} - field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} - field = "Cam Sync/VVT input", camInputs1 - panel = triggerInputComparator @@if_ts_show_trigger_comparator - ; ; allXXX sections allows a quick overview of used I/O in order to address conflicts mostly, not really to ; configure the features. From 1e3e630367f3f75fda5afe28f007b79ba5e98487 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Thu, 30 Apr 2020 15:44:34 -0700 Subject: [PATCH 3/3] Add raw gauges to sensor config pages (#1390) * clt * iat * minor cranking * fix * oilp too Co-authored-by: Matthew Kennedy --- firmware/integration/rusefi_config.txt | 4 +-- firmware/tunerstudio/rusefi.input | 39 +++++++++++++++++--------- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 29a08d05cc..32526bcfa6 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1125,8 +1125,8 @@ tle8888_mode_e tle8888mode; float autoTuneTpsRocThreshold; float autoTuneTpsQuietPeriod; float unused2432; - float postCrankingFactor;Fuel multiplier taper, see also postCrankingDurationSec;"mult", 1, 0, 0, 100, 4 - float postCrankingDurationSec;See also postCrankingFactor;"seconds", 1, 0, 0, 100, 2 + float postCrankingFactor;+Fuel multiplier (enrichment) immediately after engine start;"mult", 1, 0, 0, 100, 4 + float postCrankingDurationSec;+Time over which to taper out after start enrichment;"seconds", 1, 0, 0, 100, 2 ThermistorConf auxTempSensor1;todo: finish implementation #332 ThermistorConf auxTempSensor2;todo: finish implementation #332 int16_t fuelClosedLoopCltThreshold;;"C", 1, 0, 0, 100, 0 diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 79edc4913a..164246a1d7 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -2035,8 +2035,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Input channel", clt_adcChannel field = "Bias resistor", clt_bias_resistor, {clt_adcChannel != 16} - field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" + field = "#Input three pairs of thermistor temperature and resistance." + field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 16} field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 16} @@ -2049,17 +2049,21 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "" field = "Linear characteristic", useLinearCltSensor, {clt_adcChannel != 16} - dialog = cltSensor, "", xAxis - panel = clt_thermistor + dialog = cltGauges gauge = CLTGauge + gauge = rawCltGauge + + dialog = cltSensor, "CLT Sensor", border + panel = clt_thermistor, West + panel = cltGauges, East ; Sensors->IAT sensor dialog = iat_thermistor, "IAT sensor" field = "Input channel", iat_adcChannel field = "Bias resistor", iat_bias_resistor, {iat_adcChannel != 16} - field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" + field = "#Input three pairs of thermistor temperature and resistance." + field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 16} field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 16} @@ -2072,21 +2076,29 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "" field = "Linear characteristic", useLinearIatSensor, {iat_adcChannel != 16} - dialog = iatSensor, "", xAxis - panel = iat_thermistor + dialog = iatGauges gauge = IATGauge + gauge = rawIatGauge + + dialog = iatSensor, "IAT Sensor", border + panel = iat_thermistor, West + panel = iatGauges, East ; Sensors->Oil pressure sensor - dialog = oilp_settings, "Oil pressure sensor" + dialog = oilp_settings, "Oil Pressure Sensor" field = "Oil Pressure ADC input", oilPressure_hwChannel field = "low voltage", oilPressure_v1, {oilPressure_hwChannel != 16} field = "low pressure", oilPressure_value1, {oilPressure_hwChannel != 16} field = "high voltage", oilPressure_v2, {oilPressure_hwChannel != 16} field = "high pressure", oilPressure_value2, {oilPressure_hwChannel != 16} - dialog = oilPressureSensor, "", xAxis - panel = oilp_settings + dialog = oilPressureGauges gauge = OilPressGauge + gauge = rawOilPressureGauge + + dialog = oilPressureSensor, "", border + panel = oilp_settings, West + panel = oilPressureGauges, East ; Sensors->MAP sensor dialog = mapSensorAnalog, "MAP sensor", yAxis @@ -2562,10 +2574,9 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = crankingFuel, "Fuel" field = "Injection mode", crankingInjectionMode - field = "!Value '1' is currently recommended" field = "Fuel Source For Cranking", useRunningMathForCranking field = "Base fuel pulse width", cranking_baseFuel, {useRunningMathForCranking == 0} - + dialog = crankingIAC, "IAC" field = "Cranking IAC position", crankingIACposition field = "After cranking IAC taper duration", afterCrankingIACtaperDuration @@ -2579,7 +2590,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs, {useConstantDwellDuringCranking == 1} field = "Cranking Dwell Angle", crankingChargeAngle, {useConstantDwellDuringCranking == 0} - dialog = postCrankingEnrichment, "Post-cranking short-time fuel enrichment (NOT IMPLEMENTED #331)" + dialog = postCrankingEnrichment, "After start enrichment" field = "Post-Cranking factor", postCrankingFactor field = "Duration", postCrankingDurationSec