diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index b186102f4d..85d562ed4f 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -72,7 +72,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Wed Jun 05 00:34:45 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Wed Jun 05 21:35:54 EDT 2019 pageSize = 20000 page = 1 @@ -2008,8 +2008,8 @@ menuDialog = main menu = "Fuel" # basic - subMenu = injectionSettings, "Injection Settings" - subMenu = injectionDeadTime, "Injector Dead Time", 0, {isInjectionEnabled == 1} + subMenu = injectionSettings, "Injection settings" + subMenu = injectionDeadTime, "Injector dead time", 0, {isInjectionEnabled == 1} subMenu = std_separator # Targets & closed loop @@ -2019,7 +2019,7 @@ menuDialog = main subMenu = std_separator # Fuel table/VE - subMenu = fuelTableDialog, "Alpha-N fuel table", 0, {isInjectionEnabled == 1 && fuelAlgorithm != LM_SPEED_DENSITY} + subMenu = fuelTableDialog, "Fuel table", 0, {isInjectionEnabled == 1 && fuelAlgorithm != LM_SPEED_DENSITY} subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY} subMenu = injPhaseTableTbl, "Injection phase", 0, {isInjectionEnabled == 1} subMenu = std_separator @@ -2028,17 +2028,17 @@ menuDialog = main subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1 && useWarmupPidAfr == 0} subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Baro multiplier", 0, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY} - subMenu = tChargeSettings, "tCharge Settings", 0, {isInjectionEnabled == 1} + subMenu = tChargeSettings, "tCharge settings", 0, {isInjectionEnabled == 1} subMenu = std_separator # Accel enrichment - subMenu = AccelEnrich, "Accel/Decel Enrichment/Enleanment", 0, {isInjectionEnabled == 1} + subMenu = AccelEnrich, "Accel/decel enrichment/enleanment", 0, {isInjectionEnabled == 1} subMenu = tpsTpsAccelTbl, "TPS/TPS acceleration extra fuel", 0, {isInjectionEnabled == 1} subMenu = mapAccelTaper, "Engine load AE taper", 0, {isInjectionEnabled == 1} menu = "Ignition" - subMenu = ignitionSettings, "Ignition Settings" + subMenu = ignitionSettings, "Ignition settings" subMenu = std_separator subMenu = dwellSettings, "Dwell", 0, {isIgnitionEnabled == 1} @@ -2054,7 +2054,7 @@ menuDialog = main subMenu = ignitionIatCorrTableTbl, "IAT correction", 0, {isIgnitionEnabled == 1} menu = "&Cranking" - subMenu = crankingDialog, "Cranking Settings" + subMenu = crankingDialog, "Cranking settings" subMenu = std_separator subMenu = crankingCltCurve, "Fuel CLT multiplier" @@ -2068,8 +2068,8 @@ menuDialog = main subMenu = cltCrankingCurve, "IAC multiplier", 0, {overrideCrankingIacSetting == 1} menu = "&Idle" - subMenu = idleSettings, "Idle Settings" - subMenu = idlehw, "Idle Hardware" + subMenu = idleSettings, "Idle settings" + subMenu = idlehw, "Idle hardware" subMenu = std_separator subMenu = cltIdleRPMCurve, "Target RPM", 0, {idleMode == 0} subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} @@ -2095,8 +2095,9 @@ menuDialog = main menu = "&Sensors" # Base analog input settings - subMenu = sensorInputs, "Sensor Inputs" - subMenu = analogInputSettings, "Analog Input Settings" + subMenu = triggerInputs, "Trigger inputs" + subMenu = otherSensorInputs, "Misc sensors" + subMenu = analogInputSettings, "Analog input settings" subMenu = std_separator # Thermistors @@ -2106,17 +2107,28 @@ menuDialog = main subMenu = auxTempSensor2Sensor, "AuxTemp2 sensor" subMenu = std_separator - # MAP/MAF + # TPS/pedal + subMenu = tpsSensor, "TPS" + subMenu = pedalSensor, "Accelerator pedal" + subMenu = std_separator + + # MAP/Baro subMenu = mapSettings, "MAP sensor" - subMenu = mafDecodingCurve, "MAF sensor" + subMenu = mapCurves, "MAP sampling" + subMenu = baroSettings, "Baro sensor" + subMenu = std_separator + + # MAF + subMenu = mafSettings, "MAF sensor" + subMenu = mafDecodingCurve, "MAF transfer function", 0, {mafAdcChannel != 16} subMenu = std_separator # O2 sensor(s) subMenu = egoSettings, "EGO sensor" subMenu = narrowToWideOxygenCurve, "Narrow to Wideband approximation" - subMenu = cj125Function, "CJ125 Settings (wbo decoder)" + subMenu = cj125Function, "CJ125 settings (wbo decoder)" subMenu = std_separator - + # Misc sensors subMenu = speedSensor, "Vehicle speed sensor" subMenu = oilPressureSensor, "Oil pressure" @@ -2143,14 +2155,14 @@ menuDialog = main # EXPERIMENTAL FEATURES subMenu = parkingLot, "Experimental/Broken" subMenu = warmupTargetAfrCurve, "Warmup fuel auto correction AFR target" - subMenu = smLaunchControl, "Launch Control" + subMenu = smLaunchControl, "Launch control" subMenu = std_separator - subMenu = hipFunction, "HIP9011 Settings (knock sensor) (alpha version)" + subMenu = hipFunction, "HIP9011 settings (knock sensor) (alpha version)" subMenu = std_separator - subMenu = etbDialog, "Electronic Throttle Body (beta version)" - subMenu = etbTpsBiasCurve, "Electronic Throttle Body Bias Curve" + subMenu = etbDialog, "Electronic throttle body (beta version)" + subMenu = etbTpsBiasCurve, "Electronic throttle body bias curve" [ControllerCommands] @@ -2409,63 +2421,57 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; Sensors->AUX1 Thermistor Sensor Setting dialog = auxTempSensor1Sensor, "aux1 Thermistor Settings" + field = "Input channel", auxTempSensor1_adcChannel + field = "Bias resistor", auxTempSensor1_bias_resistor, {auxTempSensor1_adcChannel != 16} + field = "#Here is three pairs of thermistor temperature and resistance." field = "#Typical temperatures is -40°C, 0°C and 100°C" field = "" - field = "Lowest temperature", auxTempSensor1_tempC_1 - field = "Resistance @ LT", auxTempSensor1_resistance_1 + field = "Lowest temperature", auxTempSensor1_tempC_1, {auxTempSensor1_adcChannel != 16} + field = "Resistance @ LT", auxTempSensor1_resistance_1, {auxTempSensor1_adcChannel != 16} field = "" - field = "Middle temperature", auxTempSensor1_tempC_2 - field = "Resistance @ MT", auxTempSensor1_resistance_2 + field = "Middle temperature", auxTempSensor1_tempC_2, {auxTempSensor1_adcChannel != 16} + field = "Resistance @ MT", auxTempSensor1_resistance_2, {auxTempSensor1_adcChannel != 16} field = "" - field = "Highest temperature", auxTempSensor1_tempC_3 - field = "Resistance @ HT", auxTempSensor1_resistance_3 + field = "Highest temperature", auxTempSensor1_tempC_3, {auxTempSensor1_adcChannel != 16} + field = "Resistance @ HT", auxTempSensor1_resistance_3, {auxTempSensor1_adcChannel != 16} ; Sensors->AUX2 Thermistor Sensor Setting dialog = auxTempSensor2Sensor, "aux2 Thermistor Settings" + field = "Input channel", auxTempSensor2_adcChannel + field = "Bias resistor", auxTempSensor2_bias_resistor, {auxTempSensor2_adcChannel != 16} + field = "#Here is three pairs of thermistor temperature and resistance." field = "#Typical temperatures is -40°C, 0°C and 100°C" field = "" - field = "Lowest temperature", auxTempSensor2_tempC_1 - field = "Resistance @ LT", auxTempSensor2_resistance_1 + field = "Lowest temperature", auxTempSensor2_tempC_1, {auxTempSensor2_adcChannel != 16} + field = "Resistance @ LT", auxTempSensor2_resistance_1, {auxTempSensor2_adcChannel != 16} field = "" - field = "Middle temperature", auxTempSensor2_tempC_2 - field = "Resistance @ MT", auxTempSensor2_resistance_2 + field = "Middle temperature", auxTempSensor2_tempC_2, {auxTempSensor2_adcChannel != 16} + field = "Resistance @ MT", auxTempSensor2_resistance_2, {auxTempSensor2_adcChannel != 16} field = "" - field = "Highest temperature", auxTempSensor2_tempC_3 - field = "Resistance @ HT", auxTempSensor2_resistance_3 - -; Sensor Inputs - dialog = otherSensorInputs, "Other Sensor Inputs" - field = "aux1 TempSensor ADC input", auxTempSensor1_adcChannel - field = "aux1 Bias Resistor Value", auxTempSensor1_bias_resistor - field = "aux2 TempSensor ADC input", auxTempSensor2_adcChannel - field = "aux2 Bias Resistor Value", auxTempSensor2_bias_resistor - field = "Accelerator position sensor", throttlePedalPositionAdcChannel - field = "Oil Pressure ADC input", oilPressure_hwChannel - field = "fuelLevelSensor", fuelLevelSensor - field = "Baro ADC input", baroSensor_hwChannel - field = "Flex Fuel", flexFuelSensor - field = "Vehicle speed sensor", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin - field = "A/C Switch", acSwitchAdc - - dialog = mainSensorInputs, "Main Sensor Inputs" - field = "MAP ADC input", map_sensor_hwChannel, {hasFrequencyReportingMapSensor == 0} - field = "MAP Freq", frequencyReportingMapInputPin, {hasFrequencyReportingMapSensor == 1} - field = "MAF ADC input", mafAdcChannel - field = "CLT ADC input", clt_adcChannel - field = "CLT Bias Resistor Value", clt_bias_resistor - field = "IAT ADC input", iat_adcChannel - field = "IAT Bias Resistor Value", iat_bias_resistor - field = "AFR ADC input", afr_hwChannel - field = "vBatt ADC input", vbattAdcChannel + field = "Highest temperature", auxTempSensor2_tempC_3, {auxTempSensor2_adcChannel != 16} + field = "Resistance @ HT", auxTempSensor2_resistance_3, {auxTempSensor2_adcChannel != 16} + + dialog = tpsSensor, "TPS" field = "!See Tools>Calibrate TPS" field = "Throttle1 position sensor", tps1_1AdcChannel field = "Throttle2 position sensor", tps2_1AdcChannel - + field = "TPS low value detection threshold", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16} + field = "TPS high value detection threshold", tpsErrorDetectionTooHigh, {tps1_1AdcChannel != 16} + + dialog = pedalSensor, "Accelerator pedal" + field = "Accelerator position sensor", throttlePedalPositionAdcChannel + +; Sensor Inputs + dialog = otherSensorInputs, "Other Sensor Inputs" + field = "Fuel level", fuelLevelSensor + field = "Flex fuel", flexFuelSensor + field = "Clutch down pin", clutchDownPin + field = "Clutch up pin", clutchUpPin + field = "Brake pedal pin", brakePedalPin + field = "A/C switch", acSwitchAdc + dialog = triggerInputs, "Trigger Inputs" field = "!ECU reboot needed to apply these settings" field = "#Cam is primary if you have cam sensor" @@ -2475,12 +2481,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} field = "Cam Sync/VVT input", camInput - - dialog = sensorInputs, "", xAxis - panel = triggerInputs, West - panel = mainSensorInputs, Center - panel = otherSensorInputs, East - dialog = allPinsSensors, "Sensors" field = "CLT ADC input", clt_adcChannel field = "IAT ADC input", iat_adcChannel @@ -2665,19 +2665,22 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; Sensors->CLT sensor dialog = clt_thermistor, "CLT sensor" + 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°C, 0°C and 100°C" field = "" - field = "Lowest temperature", clt_tempC_1 - field = "Resistance @ LT", clt_resistance_1 + field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 16} + field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 16} field = "" - field = "Middle temperature", clt_tempC_2 - field = "Resistance @ MT", clt_resistance_2 + field = "Middle temperature", clt_tempC_2, {clt_adcChannel != 16} + field = "Resistance @ MT", clt_resistance_2, {clt_adcChannel != 16} field = "" - field = "Highest temperature", clt_tempC_3 - field = "Resistance @ HT", clt_resistance_3 + field = "Highest temperature", clt_tempC_3, {clt_adcChannel != 16} + field = "Resistance @ HT", clt_resistance_3, {clt_adcChannel != 16} field = "" - field = "Linear characteristic", useLinearCltSensor + field = "Linear characteristic", useLinearCltSensor, {clt_adcChannel != 16} dialog = cltSensor, "", xAxis panel = clt_thermistor @@ -2685,19 +2688,22 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; 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°C, 0°C and 100°C" field = "" - field = "Lowest temperature", iat_tempC_1 - field = "Resistance @ LT", iat_resistance_1 + field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 16} + field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 16} field = "" - field = "Middle temperature", iat_tempC_2 - field = "Resistance @ MT", iat_resistance_2 + field = "Middle temperature", iat_tempC_2, {iat_adcChannel != 16} + field = "Resistance @ MT", iat_resistance_2, {iat_adcChannel != 16} field = "" - field = "Highest temperature", iat_tempC_3 - field = "Resistance @ HT", iat_resistance_3 + field = "Highest temperature", iat_tempC_3, {iat_adcChannel != 16} + field = "Resistance @ HT", iat_resistance_3, {iat_adcChannel != 16} field = "" - field = "Linear characteristic", useLinearIatSensor + field = "Linear characteristic", useLinearIatSensor, {iat_adcChannel != 16} dialog = iatSensor, "", xAxis panel = iat_thermistor @@ -2705,50 +2711,56 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; Sensors->Oil pressure sensor dialog = oilp_settings, "Oil pressure sensor" - field = "low voltage", oilPressure_v1 - field = "low pressure", oilPressure_value1 - field = "high voltage", oilPressure_v2 - field = "high pressure", oilPressure_value2 + 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 gauge = OilPressGauge ; Sensors->MAP sensor - dialog = mapSensorVDlg, "MAP sensor", yAxis - field = "MAP type", map_sensor_type, {hasFrequencyReportingMapSensor == 0} - field = "MAP value low point", map_sensor_lowValue, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0} - field = "MAP voltage low point", mapLowValueVoltage, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0} - field = "MAP value high point", map_sensor_highValue, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0} - field = "MAP voltage high value", mapHighValueVoltage, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0} - field = "Use minimal value of", mapMinBufferLength + dialog = mapSensorAnalog, "MAP sensor", yAxis + field = "MAP ADC input", map_sensor_hwChannel + field = "MAP type", map_sensor_type + field = "MAP value low point", map_sensor_lowValue + field = "MAP voltage low point", mapLowValueVoltage + field = "MAP value high point", map_sensor_highValue + field = "MAP voltage high value", mapHighValueVoltage + + dialog = mapSensorFreq, "MAP frequency sensor", yAxis + field = "MAP Freq", frequencyReportingMapInputPin + field = "0 kPa freq", mapFrequency0Kpa + field = "100 kpa freq", mapFrequency100Kpa + + dialog = mapCommon, "MAP common settings" + field = "frequency-based MAP", hasFrequencyReportingMapSensor + field = "Low value threshold", mapErrorDetectionTooLow + field = "High value threshold", mapErrorDetectionTooHigh + field = "" field = "Measure Map Only In One Cylinder", measureMapOnlyInOneCylinder - field = baroSensor_lowValue, baroSensor_lowValue - field = baroSensor_highValue, baroSensor_highValue - field = baroSensor_type, baroSensor_type + field = "Minimum MAP samples", mapMinBufferLength - dialog = mapSensorFDlg, "MAP frequency sensor", yAxis - field = "0 kPa freq", mapFrequency0Kpa, {hasFrequencyReportingMapSensor == 1} - field = "100 kpa freq", mapFrequency100Kpa, {hasFrequencyReportingMapSensor == 1} + dialog = mapSettings, "", yAxis + panel = mapCommon + panel = mapSensorAnalog, {hasFrequencyReportingMapSensor == 0} + panel = mapSensorFreq, {hasFrequencyReportingMapSensor == 1} + panel = mapErrorDetection - dialog = mapSwitch, "MAP input type" - field = "frequency-based MAP", hasFrequencyReportingMapSensor - - dialog = mapSwitchAndSettings, "", yAxis - field = "Low value threshold", mapErrorDetectionTooLow - field = "High value threshold", mapErrorDetectionTooHigh - - panel = mapSwitch - panel = mapSensorVDlg - panel = mapSensorFDlg - - dialog = mapCurves, "", yAxis - panel = map_samplingAngleCurve + dialog = baroSettings, "Baro sensor" + field = "Baro ADC input", baroSensor_hwChannel + field = baroSensor_lowValue, baroSensor_lowValue, {baroSensor_hwChannel != 16} + field = baroSensor_highValue, baroSensor_highValue, {baroSensor_hwChannel != 16} + field = baroSensor_type, baroSensor_type, {baroSensor_hwChannel != 16} + + dialog = mapCurves, "MAP sampling", yAxis + panel = map_samplingAngleCurve panel = map_samplingWindowCurve - - dialog = mapSettings, "", xAxis - panel = mapCurves - panel = mapSwitchAndSettings + + dialog = mafSettings, "MAF sensor", yAxis + field = "MAF ADC input", mafAdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" @@ -2759,12 +2771,14 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "high voltage", afr_v2 field = "high value", afr_value2 field = "Correction", egoValueShift + dialog = egoSettings_IO, "EGO Sensor I/O" - field = "AFR ADC input", afr_hwChannel - field = "O2 heater pin", o2heaterPin + field = "Input channel", afr_hwChannel + field = "Heater pin", o2heaterPin + dialog = egoSettings, "", yAxis - panel = egoSettings_sensor, North - panel = egoSettings_IO, South + panel = egoSettings_IO + panel = egoSettings_sensor, {afr_hwChannel != 16} ; Engine->EGT inputs dialog = egtInputs, "EGT inputs" @@ -3008,17 +3022,17 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = batteryDialog panel = alternator -; Sensors->Vehicle Speed Sensor Setting - dialog = speedSensor, "Speed sensor", xAxis + dialog = speedSensorLeft + field = "Input pin", vehicleSpeedSensorInputPin field = "revolution to speed mult", vehicleSpeedCoef + + dialog = speedSensor, "Speed sensor", xAxis + panel = speedSensorLeft gauge = VSSGauge ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" field = "!ECU reboot needed to apply these settings" - field = "TPS low value detection threshold", tpsErrorDetectionTooLow - field = "TPS high value detection threshold", tpsErrorDetectionTooHigh - field = "!todo: move MAF channel to maf curve dialog" field = "Use fixed baro corr from MAP", useFixedBaroCorrFromMap field = "Analog divider", analogInputDividerCoefficient field = "Use BiQuad averaging", useBiQuadAnalogFiltering diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index 5dbef1af18..79ab38231a 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -72,7 +72,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Wed Jun 05 00:34:50 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Wed Jun 05 21:35:59 EDT 2019 pageSize = 20000 page = 1 @@ -2008,8 +2008,8 @@ menuDialog = main menu = "Fuel" # basic - subMenu = injectionSettings, "Injection Settings" - subMenu = injectionDeadTime, "Injector Dead Time", 0, {isInjectionEnabled == 1} + subMenu = injectionSettings, "Injection settings" + subMenu = injectionDeadTime, "Injector dead time", 0, {isInjectionEnabled == 1} subMenu = std_separator # Targets & closed loop @@ -2019,7 +2019,7 @@ menuDialog = main subMenu = std_separator # Fuel table/VE - subMenu = fuelTableDialog, "Alpha-N fuel table", 0, {isInjectionEnabled == 1 && fuelAlgorithm != LM_SPEED_DENSITY} + subMenu = fuelTableDialog, "Fuel table", 0, {isInjectionEnabled == 1 && fuelAlgorithm != LM_SPEED_DENSITY} subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY} subMenu = injPhaseTableTbl, "Injection phase", 0, {isInjectionEnabled == 1} subMenu = std_separator @@ -2028,17 +2028,17 @@ menuDialog = main subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1 && useWarmupPidAfr == 0} subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Baro multiplier", 0, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY} - subMenu = tChargeSettings, "tCharge Settings", 0, {isInjectionEnabled == 1} + subMenu = tChargeSettings, "tCharge settings", 0, {isInjectionEnabled == 1} subMenu = std_separator # Accel enrichment - subMenu = AccelEnrich, "Accel/Decel Enrichment/Enleanment", 0, {isInjectionEnabled == 1} + subMenu = AccelEnrich, "Accel/decel enrichment/enleanment", 0, {isInjectionEnabled == 1} subMenu = tpsTpsAccelTbl, "TPS/TPS acceleration extra fuel", 0, {isInjectionEnabled == 1} subMenu = mapAccelTaper, "Engine load AE taper", 0, {isInjectionEnabled == 1} menu = "Ignition" - subMenu = ignitionSettings, "Ignition Settings" + subMenu = ignitionSettings, "Ignition settings" subMenu = std_separator subMenu = dwellSettings, "Dwell", 0, {isIgnitionEnabled == 1} @@ -2054,7 +2054,7 @@ menuDialog = main subMenu = ignitionIatCorrTableTbl, "IAT correction", 0, {isIgnitionEnabled == 1} menu = "&Cranking" - subMenu = crankingDialog, "Cranking Settings" + subMenu = crankingDialog, "Cranking settings" subMenu = std_separator subMenu = crankingCltCurve, "Fuel CLT multiplier" @@ -2068,8 +2068,8 @@ menuDialog = main subMenu = cltCrankingCurve, "IAC multiplier", 0, {overrideCrankingIacSetting == 1} menu = "&Idle" - subMenu = idleSettings, "Idle Settings" - subMenu = idlehw, "Idle Hardware" + subMenu = idleSettings, "Idle settings" + subMenu = idlehw, "Idle hardware" subMenu = std_separator subMenu = cltIdleRPMCurve, "Target RPM", 0, {idleMode == 0} subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} @@ -2095,8 +2095,9 @@ menuDialog = main menu = "&Sensors" # Base analog input settings - subMenu = sensorInputs, "Sensor Inputs" - subMenu = analogInputSettings, "Analog Input Settings" + subMenu = triggerInputs, "Trigger inputs" + subMenu = otherSensorInputs, "Misc sensors" + subMenu = analogInputSettings, "Analog input settings" subMenu = std_separator # Thermistors @@ -2106,17 +2107,28 @@ menuDialog = main subMenu = auxTempSensor2Sensor, "AuxTemp2 sensor" subMenu = std_separator - # MAP/MAF + # TPS/pedal + subMenu = tpsSensor, "TPS" + subMenu = pedalSensor, "Accelerator pedal" + subMenu = std_separator + + # MAP/Baro subMenu = mapSettings, "MAP sensor" - subMenu = mafDecodingCurve, "MAF sensor" + subMenu = mapCurves, "MAP sampling" + subMenu = baroSettings, "Baro sensor" + subMenu = std_separator + + # MAF + subMenu = mafSettings, "MAF sensor" + subMenu = mafDecodingCurve, "MAF transfer function", 0, {mafAdcChannel != 16} subMenu = std_separator # O2 sensor(s) subMenu = egoSettings, "EGO sensor" subMenu = narrowToWideOxygenCurve, "Narrow to Wideband approximation" - subMenu = cj125Function, "CJ125 Settings (wbo decoder)" + subMenu = cj125Function, "CJ125 settings (wbo decoder)" subMenu = std_separator - + # Misc sensors subMenu = speedSensor, "Vehicle speed sensor" subMenu = oilPressureSensor, "Oil pressure" @@ -2143,14 +2155,14 @@ menuDialog = main # EXPERIMENTAL FEATURES subMenu = parkingLot, "Experimental/Broken" subMenu = warmupTargetAfrCurve, "Warmup fuel auto correction AFR target" - subMenu = smLaunchControl, "Launch Control" + subMenu = smLaunchControl, "Launch control" subMenu = std_separator - subMenu = hipFunction, "HIP9011 Settings (knock sensor) (alpha version)" + subMenu = hipFunction, "HIP9011 settings (knock sensor) (alpha version)" subMenu = std_separator - subMenu = etbDialog, "Electronic Throttle Body (beta version)" - subMenu = etbTpsBiasCurve, "Electronic Throttle Body Bias Curve" + subMenu = etbDialog, "Electronic throttle body (beta version)" + subMenu = etbTpsBiasCurve, "Electronic throttle body bias curve" [ControllerCommands] @@ -2409,63 +2421,57 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; Sensors->AUX1 Thermistor Sensor Setting dialog = auxTempSensor1Sensor, "aux1 Thermistor Settings" + field = "Input channel", auxTempSensor1_adcChannel + field = "Bias resistor", auxTempSensor1_bias_resistor, {auxTempSensor1_adcChannel != 16} + field = "#Here is three pairs of thermistor temperature and resistance." field = "#Typical temperatures is -40°C, 0°C and 100°C" field = "" - field = "Lowest temperature", auxTempSensor1_tempC_1 - field = "Resistance @ LT", auxTempSensor1_resistance_1 + field = "Lowest temperature", auxTempSensor1_tempC_1, {auxTempSensor1_adcChannel != 16} + field = "Resistance @ LT", auxTempSensor1_resistance_1, {auxTempSensor1_adcChannel != 16} field = "" - field = "Middle temperature", auxTempSensor1_tempC_2 - field = "Resistance @ MT", auxTempSensor1_resistance_2 + field = "Middle temperature", auxTempSensor1_tempC_2, {auxTempSensor1_adcChannel != 16} + field = "Resistance @ MT", auxTempSensor1_resistance_2, {auxTempSensor1_adcChannel != 16} field = "" - field = "Highest temperature", auxTempSensor1_tempC_3 - field = "Resistance @ HT", auxTempSensor1_resistance_3 + field = "Highest temperature", auxTempSensor1_tempC_3, {auxTempSensor1_adcChannel != 16} + field = "Resistance @ HT", auxTempSensor1_resistance_3, {auxTempSensor1_adcChannel != 16} ; Sensors->AUX2 Thermistor Sensor Setting dialog = auxTempSensor2Sensor, "aux2 Thermistor Settings" + field = "Input channel", auxTempSensor2_adcChannel + field = "Bias resistor", auxTempSensor2_bias_resistor, {auxTempSensor2_adcChannel != 16} + field = "#Here is three pairs of thermistor temperature and resistance." field = "#Typical temperatures is -40°C, 0°C and 100°C" field = "" - field = "Lowest temperature", auxTempSensor2_tempC_1 - field = "Resistance @ LT", auxTempSensor2_resistance_1 + field = "Lowest temperature", auxTempSensor2_tempC_1, {auxTempSensor2_adcChannel != 16} + field = "Resistance @ LT", auxTempSensor2_resistance_1, {auxTempSensor2_adcChannel != 16} field = "" - field = "Middle temperature", auxTempSensor2_tempC_2 - field = "Resistance @ MT", auxTempSensor2_resistance_2 + field = "Middle temperature", auxTempSensor2_tempC_2, {auxTempSensor2_adcChannel != 16} + field = "Resistance @ MT", auxTempSensor2_resistance_2, {auxTempSensor2_adcChannel != 16} field = "" - field = "Highest temperature", auxTempSensor2_tempC_3 - field = "Resistance @ HT", auxTempSensor2_resistance_3 - -; Sensor Inputs - dialog = otherSensorInputs, "Other Sensor Inputs" - field = "aux1 TempSensor ADC input", auxTempSensor1_adcChannel - field = "aux1 Bias Resistor Value", auxTempSensor1_bias_resistor - field = "aux2 TempSensor ADC input", auxTempSensor2_adcChannel - field = "aux2 Bias Resistor Value", auxTempSensor2_bias_resistor - field = "Accelerator position sensor", throttlePedalPositionAdcChannel - field = "Oil Pressure ADC input", oilPressure_hwChannel - field = "fuelLevelSensor", fuelLevelSensor - field = "Baro ADC input", baroSensor_hwChannel - field = "Flex Fuel", flexFuelSensor - field = "Vehicle speed sensor", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin - field = "A/C Switch", acSwitchAdc - - dialog = mainSensorInputs, "Main Sensor Inputs" - field = "MAP ADC input", map_sensor_hwChannel, {hasFrequencyReportingMapSensor == 0} - field = "MAP Freq", frequencyReportingMapInputPin, {hasFrequencyReportingMapSensor == 1} - field = "MAF ADC input", mafAdcChannel - field = "CLT ADC input", clt_adcChannel - field = "CLT Bias Resistor Value", clt_bias_resistor - field = "IAT ADC input", iat_adcChannel - field = "IAT Bias Resistor Value", iat_bias_resistor - field = "AFR ADC input", afr_hwChannel - field = "vBatt ADC input", vbattAdcChannel + field = "Highest temperature", auxTempSensor2_tempC_3, {auxTempSensor2_adcChannel != 16} + field = "Resistance @ HT", auxTempSensor2_resistance_3, {auxTempSensor2_adcChannel != 16} + + dialog = tpsSensor, "TPS" field = "!See Tools>Calibrate TPS" field = "Throttle1 position sensor", tps1_1AdcChannel field = "Throttle2 position sensor", tps2_1AdcChannel - + field = "TPS low value detection threshold", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16} + field = "TPS high value detection threshold", tpsErrorDetectionTooHigh, {tps1_1AdcChannel != 16} + + dialog = pedalSensor, "Accelerator pedal" + field = "Accelerator position sensor", throttlePedalPositionAdcChannel + +; Sensor Inputs + dialog = otherSensorInputs, "Other Sensor Inputs" + field = "Fuel level", fuelLevelSensor + field = "Flex fuel", flexFuelSensor + field = "Clutch down pin", clutchDownPin + field = "Clutch up pin", clutchUpPin + field = "Brake pedal pin", brakePedalPin + field = "A/C switch", acSwitchAdc + dialog = triggerInputs, "Trigger Inputs" field = "!ECU reboot needed to apply these settings" field = "#Cam is primary if you have cam sensor" @@ -2475,12 +2481,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} field = "Cam Sync/VVT input", camInput - - dialog = sensorInputs, "", xAxis - panel = triggerInputs, West - panel = mainSensorInputs, Center - panel = otherSensorInputs, East - dialog = allPinsSensors, "Sensors" field = "CLT ADC input", clt_adcChannel field = "IAT ADC input", iat_adcChannel @@ -2665,19 +2665,22 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; Sensors->CLT sensor dialog = clt_thermistor, "CLT sensor" + 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°C, 0°C and 100°C" field = "" - field = "Lowest temperature", clt_tempC_1 - field = "Resistance @ LT", clt_resistance_1 + field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 16} + field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 16} field = "" - field = "Middle temperature", clt_tempC_2 - field = "Resistance @ MT", clt_resistance_2 + field = "Middle temperature", clt_tempC_2, {clt_adcChannel != 16} + field = "Resistance @ MT", clt_resistance_2, {clt_adcChannel != 16} field = "" - field = "Highest temperature", clt_tempC_3 - field = "Resistance @ HT", clt_resistance_3 + field = "Highest temperature", clt_tempC_3, {clt_adcChannel != 16} + field = "Resistance @ HT", clt_resistance_3, {clt_adcChannel != 16} field = "" - field = "Linear characteristic", useLinearCltSensor + field = "Linear characteristic", useLinearCltSensor, {clt_adcChannel != 16} dialog = cltSensor, "", xAxis panel = clt_thermistor @@ -2685,19 +2688,22 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; 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°C, 0°C and 100°C" field = "" - field = "Lowest temperature", iat_tempC_1 - field = "Resistance @ LT", iat_resistance_1 + field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 16} + field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 16} field = "" - field = "Middle temperature", iat_tempC_2 - field = "Resistance @ MT", iat_resistance_2 + field = "Middle temperature", iat_tempC_2, {iat_adcChannel != 16} + field = "Resistance @ MT", iat_resistance_2, {iat_adcChannel != 16} field = "" - field = "Highest temperature", iat_tempC_3 - field = "Resistance @ HT", iat_resistance_3 + field = "Highest temperature", iat_tempC_3, {iat_adcChannel != 16} + field = "Resistance @ HT", iat_resistance_3, {iat_adcChannel != 16} field = "" - field = "Linear characteristic", useLinearIatSensor + field = "Linear characteristic", useLinearIatSensor, {iat_adcChannel != 16} dialog = iatSensor, "", xAxis panel = iat_thermistor @@ -2705,50 +2711,56 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; Sensors->Oil pressure sensor dialog = oilp_settings, "Oil pressure sensor" - field = "low voltage", oilPressure_v1 - field = "low pressure", oilPressure_value1 - field = "high voltage", oilPressure_v2 - field = "high pressure", oilPressure_value2 + 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 gauge = OilPressGauge ; Sensors->MAP sensor - dialog = mapSensorVDlg, "MAP sensor", yAxis - field = "MAP type", map_sensor_type, {hasFrequencyReportingMapSensor == 0} - field = "MAP value low point", map_sensor_lowValue, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0} - field = "MAP voltage low point", mapLowValueVoltage, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0} - field = "MAP value high point", map_sensor_highValue, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0} - field = "MAP voltage high value", mapHighValueVoltage, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0} - field = "Use minimal value of", mapMinBufferLength + dialog = mapSensorAnalog, "MAP sensor", yAxis + field = "MAP ADC input", map_sensor_hwChannel + field = "MAP type", map_sensor_type + field = "MAP value low point", map_sensor_lowValue + field = "MAP voltage low point", mapLowValueVoltage + field = "MAP value high point", map_sensor_highValue + field = "MAP voltage high value", mapHighValueVoltage + + dialog = mapSensorFreq, "MAP frequency sensor", yAxis + field = "MAP Freq", frequencyReportingMapInputPin + field = "0 kPa freq", mapFrequency0Kpa + field = "100 kpa freq", mapFrequency100Kpa + + dialog = mapCommon, "MAP common settings" + field = "frequency-based MAP", hasFrequencyReportingMapSensor + field = "Low value threshold", mapErrorDetectionTooLow + field = "High value threshold", mapErrorDetectionTooHigh + field = "" field = "Measure Map Only In One Cylinder", measureMapOnlyInOneCylinder - field = baroSensor_lowValue, baroSensor_lowValue - field = baroSensor_highValue, baroSensor_highValue - field = baroSensor_type, baroSensor_type + field = "Minimum MAP samples", mapMinBufferLength - dialog = mapSensorFDlg, "MAP frequency sensor", yAxis - field = "0 kPa freq", mapFrequency0Kpa, {hasFrequencyReportingMapSensor == 1} - field = "100 kpa freq", mapFrequency100Kpa, {hasFrequencyReportingMapSensor == 1} + dialog = mapSettings, "", yAxis + panel = mapCommon + panel = mapSensorAnalog, {hasFrequencyReportingMapSensor == 0} + panel = mapSensorFreq, {hasFrequencyReportingMapSensor == 1} + panel = mapErrorDetection - dialog = mapSwitch, "MAP input type" - field = "frequency-based MAP", hasFrequencyReportingMapSensor - - dialog = mapSwitchAndSettings, "", yAxis - field = "Low value threshold", mapErrorDetectionTooLow - field = "High value threshold", mapErrorDetectionTooHigh - - panel = mapSwitch - panel = mapSensorVDlg - panel = mapSensorFDlg - - dialog = mapCurves, "", yAxis - panel = map_samplingAngleCurve + dialog = baroSettings, "Baro sensor" + field = "Baro ADC input", baroSensor_hwChannel + field = baroSensor_lowValue, baroSensor_lowValue, {baroSensor_hwChannel != 16} + field = baroSensor_highValue, baroSensor_highValue, {baroSensor_hwChannel != 16} + field = baroSensor_type, baroSensor_type, {baroSensor_hwChannel != 16} + + dialog = mapCurves, "MAP sampling", yAxis + panel = map_samplingAngleCurve panel = map_samplingWindowCurve - - dialog = mapSettings, "", xAxis - panel = mapCurves - panel = mapSwitchAndSettings + + dialog = mafSettings, "MAF sensor", yAxis + field = "MAF ADC input", mafAdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" @@ -2759,12 +2771,14 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "high voltage", afr_v2 field = "high value", afr_value2 field = "Correction", egoValueShift + dialog = egoSettings_IO, "EGO Sensor I/O" - field = "AFR ADC input", afr_hwChannel - field = "O2 heater pin", o2heaterPin + field = "Input channel", afr_hwChannel + field = "Heater pin", o2heaterPin + dialog = egoSettings, "", yAxis - panel = egoSettings_sensor, North - panel = egoSettings_IO, South + panel = egoSettings_IO + panel = egoSettings_sensor, {afr_hwChannel != 16} ; Engine->EGT inputs dialog = egtInputs, "EGT inputs" @@ -3008,17 +3022,17 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = batteryDialog panel = alternator -; Sensors->Vehicle Speed Sensor Setting - dialog = speedSensor, "Speed sensor", xAxis + dialog = speedSensorLeft + field = "Input pin", vehicleSpeedSensorInputPin field = "revolution to speed mult", vehicleSpeedCoef + + dialog = speedSensor, "Speed sensor", xAxis + panel = speedSensorLeft gauge = VSSGauge ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" field = "!ECU reboot needed to apply these settings" - field = "TPS low value detection threshold", tpsErrorDetectionTooLow - field = "TPS high value detection threshold", tpsErrorDetectionTooHigh - field = "!todo: move MAF channel to maf curve dialog" field = "Use fixed baro corr from MAP", useFixedBaroCorrFromMap field = "Analog divider", analogInputDividerCoefficient field = "Use BiQuad averaging", useBiQuadAnalogFiltering diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index 86083db47d..200ad9bbb9 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -72,7 +72,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Wed Jun 05 00:34:48 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Wed Jun 05 21:35:56 EDT 2019 pageSize = 20000 page = 1 @@ -129,7 +129,7 @@ page = 1 map_sensor_lowValue = scalar, F32, 236, "kpa", 1, 0, -400, 800, 2 map_sensor_highValue = scalar, F32, 240, "kpa", 1, 0, -400, 800, 2 map_sensor_type = bits, U32, 244, [0:3] "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "INVALID" - map_sensor_hwChannel = bits, U08, 248, [0:4] "INVALID","INVALID","analog x","INVALID","INVALID","analog y","INVALID","analog z","INVALID","INVALID","INVALID","analog whatever","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" + map_sensor_hwChannel = bits, U08, 248, [0:4] "AN-TEMP-1","AN-TEMP-2","AN-TEMP-3","AN-TEMP-4","AN-VOLT-10","INVALID","AN-VOLT-2","AN-VOLT-3","AN-VOLT-8","AN-VOLT-9","AN-VOLT-1","VBAT","AN-VOLT-4","AN-VOLT-5","AN-VOLT-6","AN-VOLT-7","NONE","INVALID","INVALID","INVALID" ;no TS info - skipping map_sensor_align offset 249 clt_tempC_1 = scalar, F32, 252, "*C", 1, 0, -40, 200, 1 clt_tempC_2 = scalar, F32, 256, "*C", 1, 0, -40, 200, 1 @@ -138,7 +138,7 @@ page = 1 clt_resistance_2 = scalar, F32, 268, "Ohm", 1, 0, 0, 200000, 1 clt_resistance_3 = scalar, F32, 272, "Ohm", 1, 0, 0, 200000, 1 clt_bias_resistor = scalar, F32, 276, "Ohm", 1, 0, 0, 200000, 1 - clt_adcChannel = bits, U08, 280, [0:4] "INVALID","INVALID","analog x","INVALID","INVALID","analog y","INVALID","analog z","INVALID","INVALID","INVALID","analog whatever","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" + clt_adcChannel = bits, U08, 280, [0:4] "AN-TEMP-1","AN-TEMP-2","AN-TEMP-3","AN-TEMP-4","AN-VOLT-10","INVALID","AN-VOLT-2","AN-VOLT-3","AN-VOLT-8","AN-VOLT-9","AN-VOLT-1","VBAT","AN-VOLT-4","AN-VOLT-5","AN-VOLT-6","AN-VOLT-7","NONE","INVALID","INVALID","INVALID" ;no TS info - skipping clt_alignmentFill offset 281 iat_tempC_1 = scalar, F32, 284, "*C", 1, 0, -40, 200, 1 iat_tempC_2 = scalar, F32, 288, "*C", 1, 0, -40, 200, 1 @@ -147,7 +147,7 @@ page = 1 iat_resistance_2 = scalar, F32, 300, "Ohm", 1, 0, 0, 200000, 1 iat_resistance_3 = scalar, F32, 304, "Ohm", 1, 0, 0, 200000, 1 iat_bias_resistor = scalar, F32, 308, "Ohm", 1, 0, 0, 200000, 1 - iat_adcChannel = bits, U08, 312, [0:4] "INVALID","INVALID","analog x","INVALID","INVALID","analog y","INVALID","analog z","INVALID","INVALID","INVALID","analog whatever","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" + iat_adcChannel = bits, U08, 312, [0:4] "AN-TEMP-1","AN-TEMP-2","AN-TEMP-3","AN-TEMP-4","AN-VOLT-10","INVALID","AN-VOLT-2","AN-VOLT-3","AN-VOLT-8","AN-VOLT-9","AN-VOLT-1","VBAT","AN-VOLT-4","AN-VOLT-5","AN-VOLT-6","AN-VOLT-7","NONE","INVALID","INVALID","INVALID" ;no TS info - skipping iat_alignmentFill offset 313 step1rpm = scalar, S32, 316, "rpm", 1, 0, 0, 20000.0, 2 step1timing = scalar, S32, 320, "deg", 1, 0, -180, 180, 2 @@ -184,10 +184,10 @@ page = 1 byFirmwareVersion = scalar, S32, 500, "index", 1, 0, 0, 300, 0 HD44780width = scalar, S32, 504, "index", 1, 0, 0, 300, 0 HD44780height = scalar, S32, 508, "index", 1, 0, 0, 300, 0 - tps1_1AdcChannel = bits, U08, 512, [0:4] "INVALID","INVALID","analog x","INVALID","INVALID","analog y","INVALID","analog z","INVALID","INVALID","INVALID","analog whatever","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" - vbattAdcChannel = bits, U08, 513, [0:4] "INVALID","INVALID","analog x","INVALID","INVALID","analog y","INVALID","analog z","INVALID","INVALID","INVALID","analog whatever","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" - fuelLevelSensor = bits, U08, 514, [0:4] "INVALID","INVALID","analog x","INVALID","INVALID","analog y","INVALID","analog z","INVALID","INVALID","INVALID","analog whatever","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" - tps2_1AdcChannel = bits, U08, 515, [0:4] "INVALID","INVALID","analog x","INVALID","INVALID","analog y","INVALID","analog z","INVALID","INVALID","INVALID","analog whatever","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" + tps1_1AdcChannel = bits, U08, 512, [0:4] "AN-TEMP-1","AN-TEMP-2","AN-TEMP-3","AN-TEMP-4","AN-VOLT-10","INVALID","AN-VOLT-2","AN-VOLT-3","AN-VOLT-8","AN-VOLT-9","AN-VOLT-1","VBAT","AN-VOLT-4","AN-VOLT-5","AN-VOLT-6","AN-VOLT-7","NONE","INVALID","INVALID","INVALID" + vbattAdcChannel = bits, U08, 513, [0:4] "AN-TEMP-1","AN-TEMP-2","AN-TEMP-3","AN-TEMP-4","AN-VOLT-10","INVALID","AN-VOLT-2","AN-VOLT-3","AN-VOLT-8","AN-VOLT-9","AN-VOLT-1","VBAT","AN-VOLT-4","AN-VOLT-5","AN-VOLT-6","AN-VOLT-7","NONE","INVALID","INVALID","INVALID" + fuelLevelSensor = bits, U08, 514, [0:4] "AN-TEMP-1","AN-TEMP-2","AN-TEMP-3","AN-TEMP-4","AN-VOLT-10","INVALID","AN-VOLT-2","AN-VOLT-3","AN-VOLT-8","AN-VOLT-9","AN-VOLT-1","VBAT","AN-VOLT-4","AN-VOLT-5","AN-VOLT-6","AN-VOLT-7","NONE","INVALID","INVALID","INVALID" + tps2_1AdcChannel = bits, U08, 515, [0:4] "AN-TEMP-1","AN-TEMP-2","AN-TEMP-3","AN-TEMP-4","AN-VOLT-10","INVALID","AN-VOLT-2","AN-VOLT-3","AN-VOLT-8","AN-VOLT-9","AN-VOLT-1","VBAT","AN-VOLT-4","AN-VOLT-5","AN-VOLT-6","AN-VOLT-7","NONE","INVALID","INVALID","INVALID" ;no TS info - skipping overrideCrankingIgnition offset 516 sensorChartFrequency = scalar, S32, 520, "index", 1, 0, 0, 300, 0 ; size 4 trigger_type = bits, U32, 524, [0:5], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "Miata NB", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Honda 4+24+1", "Mitsubishi", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "2JZ", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped" , "Dodge Neon 2003 crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "WIP", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "trg43", "trg44", "trg45", "INVALID" @@ -197,28 +197,28 @@ page = 1 trigger_customTotalToothCount = scalar, S32, 532, "number", 1, 0.0, 0, 500.0, 0 trigger_customSkippedToothCount = scalar, S32, 536, "number", 1, 0.0, 0, 500.0, 0 hip9011SpiDevice = bits,U32, 540, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" - high_fuel_pressure_sensor_1 = bits, U08, 541, [0:4] "INVALID","INVALID","analog x","INVALID","INVALID","analog y","INVALID","analog z","INVALID","INVALID","INVALID","analog whatever","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" - high_fuel_pressure_sensor_2 = bits, U08, 542, [0:4] "INVALID","INVALID","analog x","INVALID","INVALID","analog y","INVALID","analog z","INVALID","INVALID","INVALID","analog whatever","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" + high_fuel_pressure_sensor_1 = bits, U08, 541, [0:4] "AN-TEMP-1","AN-TEMP-2","AN-TEMP-3","AN-TEMP-4","AN-VOLT-10","INVALID","AN-VOLT-2","AN-VOLT-3","AN-VOLT-8","AN-VOLT-9","AN-VOLT-1","VBAT","AN-VOLT-4","AN-VOLT-5","AN-VOLT-6","AN-VOLT-7","NONE","INVALID","INVALID","INVALID" + high_fuel_pressure_sensor_2 = bits, U08, 542, [0:4] "AN-TEMP-1","AN-TEMP-2","AN-TEMP-3","AN-TEMP-4","AN-VOLT-10","INVALID","AN-VOLT-2","AN-VOLT-3","AN-VOLT-8","AN-VOLT-9","AN-VOLT-1","VBAT","AN-VOLT-4","AN-VOLT-5","AN-VOLT-6","AN-VOLT-7","NONE","INVALID","INVALID","INVALID" ;no TS info - skipping unusedSpiPadding1 offset 543 globalFuelCorrection = scalar, F32, 544, "coef", 1, 0.0, 0, 1000.0, 2 adcVcc = scalar, F32, 548, "volts", 1, 0.0, 0, 4.0, 3 ;no TS info - skipping maxKnockSubDeg offset 552 - mafAdcChannel = bits, U08, 556, [0:4] "INVALID","INVALID","analog x","INVALID","INVALID","analog y","INVALID","analog z","INVALID","INVALID","INVALID","analog whatever","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" + mafAdcChannel = bits, U08, 556, [0:4] "AN-TEMP-1","AN-TEMP-2","AN-TEMP-3","AN-TEMP-4","AN-VOLT-10","INVALID","AN-VOLT-2","AN-VOLT-3","AN-VOLT-8","AN-VOLT-9","AN-VOLT-1","VBAT","AN-VOLT-4","AN-VOLT-5","AN-VOLT-6","AN-VOLT-7","NONE","INVALID","INVALID","INVALID" ;no TS info - skipping unusedAlignMaf offset 557 - afr_hwChannel = bits, U08, 560, [0:4] "INVALID","INVALID","analog x","INVALID","INVALID","analog y","INVALID","analog z","INVALID","INVALID","INVALID","analog whatever","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" + afr_hwChannel = bits, U08, 560, [0:4] "AN-TEMP-1","AN-TEMP-2","AN-TEMP-3","AN-TEMP-4","AN-VOLT-10","INVALID","AN-VOLT-2","AN-VOLT-3","AN-VOLT-8","AN-VOLT-9","AN-VOLT-1","VBAT","AN-VOLT-4","AN-VOLT-5","AN-VOLT-6","AN-VOLT-7","NONE","INVALID","INVALID","INVALID" ;no TS info - skipping afr_alignAf offset 561 afr_v1 = scalar, F32, 564, "volts", 1, 0.0, 0, 10.0, 2 afr_value1 = scalar, F32, 568, "AFR", 1, 0.0, 0, 1000.0, 2 afr_v2 = scalar, F32, 572, "volts", 1, 0.0, 0, 10.0, 2 afr_value2 = scalar, F32, 576, "AFR", 1, 0.0, 0, 1000.0, 2 - throttlePedalPositionAdcChannel = bits, U08, 580, [0:4] "INVALID","INVALID","analog x","INVALID","INVALID","analog y","INVALID","analog z","INVALID","INVALID","INVALID","analog whatever","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" + throttlePedalPositionAdcChannel = bits, U08, 580, [0:4] "AN-TEMP-1","AN-TEMP-2","AN-TEMP-3","AN-TEMP-4","AN-VOLT-10","INVALID","AN-VOLT-2","AN-VOLT-3","AN-VOLT-8","AN-VOLT-9","AN-VOLT-1","VBAT","AN-VOLT-4","AN-VOLT-5","AN-VOLT-6","AN-VOLT-7","NONE","INVALID","INVALID","INVALID" tle6240_cs = bits, U08, 581, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tle6240_csPinMode = bits, U08, 582, [0:1], "default", "default inverted", "open collector", "open collector inverted" ;no TS info - skipping unusedt offset 583 baroSensor_lowValue = scalar, F32, 584, "kpa", 1, 0, -400, 800, 2 baroSensor_highValue = scalar, F32, 588, "kpa", 1, 0, -400, 800, 2 baroSensor_type = bits, U32, 592, [0:3] "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "INVALID" - baroSensor_hwChannel = bits, U08, 596, [0:4] "INVALID","INVALID","analog x","INVALID","INVALID","analog y","INVALID","analog z","INVALID","INVALID","INVALID","analog whatever","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" + baroSensor_hwChannel = bits, U08, 596, [0:4] "AN-TEMP-1","AN-TEMP-2","AN-TEMP-3","AN-TEMP-4","AN-VOLT-10","INVALID","AN-VOLT-2","AN-VOLT-3","AN-VOLT-8","AN-VOLT-9","AN-VOLT-1","VBAT","AN-VOLT-4","AN-VOLT-5","AN-VOLT-6","AN-VOLT-7","NONE","INVALID","INVALID","INVALID" ;no TS info - skipping baroSensor_align offset 597 idle_solenoidFrequency = scalar, S32, 600, "Hz", 1, 0, 0, 3000, 0 idle_solenoidPin = bits, U08, 604, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -517,7 +517,7 @@ page = 1 useFSIO4ForSeriousEngineWarning= bits, U32, 1464, [28:28], "false", "true" unused_bit_1472_29 = bits, U32, 1464, [29:29], "false", "true" unused_bit_1472_30 = bits, U32, 1464, [30:30], "false", "true" - hipOutputChannel = bits, U08, 1468, [0:4] "INVALID","INVALID","analog x","INVALID","INVALID","analog y","INVALID","analog z","INVALID","INVALID","INVALID","analog whatever","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" + hipOutputChannel = bits, U08, 1468, [0:4] "AN-TEMP-1","AN-TEMP-2","AN-TEMP-3","AN-TEMP-4","AN-VOLT-10","INVALID","AN-VOLT-2","AN-VOLT-3","AN-VOLT-8","AN-VOLT-9","AN-VOLT-1","VBAT","AN-VOLT-4","AN-VOLT-5","AN-VOLT-6","AN-VOLT-7","NONE","INVALID","INVALID","INVALID" ;no TS info - skipping unusedh offset 1469 idleMode = bits, U32, 1472, [0:0], "Automatic", "Manual" isInjectionEnabled = bits, U32, 1476, [0:0], "false", "true" @@ -545,14 +545,14 @@ page = 1 engineChartSize = scalar, U32, 1480, "count", 1, 0, 0, 300, 0 idlePidRpmUpperLimit = scalar, S16, 1484, "RPM", 1, 0, 0, 9000, 0 primeInjFalloffTemperature = scalar, S16, 1486, "*C", 1, 0, 0, 1000.0, 0 - acSwitchAdc = bits, U08, 1488, [0:4] "INVALID","INVALID","analog x","INVALID","INVALID","analog y","INVALID","analog z","INVALID","INVALID","INVALID","analog whatever","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" + acSwitchAdc = bits, U08, 1488, [0:4] "AN-TEMP-1","AN-TEMP-2","AN-TEMP-3","AN-TEMP-4","AN-VOLT-10","INVALID","AN-VOLT-2","AN-VOLT-3","AN-VOLT-8","AN-VOLT-9","AN-VOLT-1","VBAT","AN-VOLT-4","AN-VOLT-5","AN-VOLT-6","AN-VOLT-7","NONE","INVALID","INVALID","INVALID" ;no TS info - skipping unusuedsw offset 1489 ignMathCalculateAtIndex = scalar, S32, 1492, "index", 1, 0, 0, 7000, 0 ;no TS info - skipping acCutoffLowRpm offset 1496 ;no TS info - skipping acCutoffHighRpm offset 1498 ;no TS info - skipping acIdleRpmBump offset 1500 warningPeriod = scalar, S16, 1502, "seconds", 1, 0, 0, 60, 0 - vRefAdcChannel = bits, U08, 1504, [0:4] "INVALID","INVALID","analog x","INVALID","INVALID","analog y","INVALID","analog z","INVALID","INVALID","INVALID","analog whatever","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" + vRefAdcChannel = bits, U08, 1504, [0:4] "AN-TEMP-1","AN-TEMP-2","AN-TEMP-3","AN-TEMP-4","AN-VOLT-10","INVALID","AN-VOLT-2","AN-VOLT-3","AN-VOLT-8","AN-VOLT-9","AN-VOLT-1","VBAT","AN-VOLT-4","AN-VOLT-5","AN-VOLT-6","AN-VOLT-7","NONE","INVALID","INVALID","INVALID" ;no TS info - skipping unusuedvref offset 1505 knockDetectionWindowStart = scalar, F32, 1508, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1512, "angle", 1, 0, -1000, 1000, 2 @@ -662,10 +662,10 @@ page = 1 boostCutPressure = scalar, F32, 2152, "kPa", 1, 0, 0, 500, 0 mapAccelTaperBins = array, F32, 2156, [8], "counter", 1, 0, 0.0, 300, 0 mapAccelTaperMult = array, F32, 2188, [8], "mult", 1, 0, 0.0, 300, 2 - fsioAdc1 = bits, U08, 2220, [0:4] "INVALID","INVALID","analog x","INVALID","INVALID","analog y","INVALID","analog z","INVALID","INVALID","INVALID","analog whatever","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" - fsioAdc2 = bits, U08, 2221, [0:4] "INVALID","INVALID","analog x","INVALID","INVALID","analog y","INVALID","analog z","INVALID","INVALID","INVALID","analog whatever","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" - fsioAdc3 = bits, U08, 2222, [0:4] "INVALID","INVALID","analog x","INVALID","INVALID","analog y","INVALID","analog z","INVALID","INVALID","INVALID","analog whatever","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" - fsioAdc4 = bits, U08, 2223, [0:4] "INVALID","INVALID","analog x","INVALID","INVALID","analog y","INVALID","analog z","INVALID","INVALID","INVALID","analog whatever","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" + fsioAdc1 = bits, U08, 2220, [0:4] "AN-TEMP-1","AN-TEMP-2","AN-TEMP-3","AN-TEMP-4","AN-VOLT-10","INVALID","AN-VOLT-2","AN-VOLT-3","AN-VOLT-8","AN-VOLT-9","AN-VOLT-1","VBAT","AN-VOLT-4","AN-VOLT-5","AN-VOLT-6","AN-VOLT-7","NONE","INVALID","INVALID","INVALID" + fsioAdc2 = bits, U08, 2221, [0:4] "AN-TEMP-1","AN-TEMP-2","AN-TEMP-3","AN-TEMP-4","AN-VOLT-10","INVALID","AN-VOLT-2","AN-VOLT-3","AN-VOLT-8","AN-VOLT-9","AN-VOLT-1","VBAT","AN-VOLT-4","AN-VOLT-5","AN-VOLT-6","AN-VOLT-7","NONE","INVALID","INVALID","INVALID" + fsioAdc3 = bits, U08, 2222, [0:4] "AN-TEMP-1","AN-TEMP-2","AN-TEMP-3","AN-TEMP-4","AN-VOLT-10","INVALID","AN-VOLT-2","AN-VOLT-3","AN-VOLT-8","AN-VOLT-9","AN-VOLT-1","VBAT","AN-VOLT-4","AN-VOLT-5","AN-VOLT-6","AN-VOLT-7","NONE","INVALID","INVALID","INVALID" + fsioAdc4 = bits, U08, 2223, [0:4] "AN-TEMP-1","AN-TEMP-2","AN-TEMP-3","AN-TEMP-4","AN-VOLT-10","INVALID","AN-VOLT-2","AN-VOLT-3","AN-VOLT-8","AN-VOLT-9","AN-VOLT-1","VBAT","AN-VOLT-4","AN-VOLT-5","AN-VOLT-6","AN-VOLT-7","NONE","INVALID","INVALID","INVALID" fixedTiming = scalar, F32, 2224, "deg", 1, 0, -720, 720, 2 mapLowValueVoltage = scalar, F32, 2228, "v", 1, 0, 0.0, 10, 2 mapHighValueVoltage = scalar, F32, 2232, "v", 1, 0, 0.0, 10, 2 @@ -715,7 +715,7 @@ page = 1 auxTempSensor1_resistance_2 = scalar, F32, 2484, "Ohm", 1, 0, 0, 200000, 1 auxTempSensor1_resistance_3 = scalar, F32, 2488, "Ohm", 1, 0, 0, 200000, 1 auxTempSensor1_bias_resistor = scalar, F32, 2492, "Ohm", 1, 0, 0, 200000, 1 - auxTempSensor1_adcChannel = bits, U08, 2496, [0:4] "INVALID","INVALID","analog x","INVALID","INVALID","analog y","INVALID","analog z","INVALID","INVALID","INVALID","analog whatever","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" + auxTempSensor1_adcChannel = bits, U08, 2496, [0:4] "AN-TEMP-1","AN-TEMP-2","AN-TEMP-3","AN-TEMP-4","AN-VOLT-10","INVALID","AN-VOLT-2","AN-VOLT-3","AN-VOLT-8","AN-VOLT-9","AN-VOLT-1","VBAT","AN-VOLT-4","AN-VOLT-5","AN-VOLT-6","AN-VOLT-7","NONE","INVALID","INVALID","INVALID" ;no TS info - skipping auxTempSensor1_alignmentFill offset 2497 auxTempSensor2_tempC_1 = scalar, F32, 2500, "*C", 1, 0, -40, 200, 1 auxTempSensor2_tempC_2 = scalar, F32, 2504, "*C", 1, 0, -40, 200, 1 @@ -724,7 +724,7 @@ page = 1 auxTempSensor2_resistance_2 = scalar, F32, 2516, "Ohm", 1, 0, 0, 200000, 1 auxTempSensor2_resistance_3 = scalar, F32, 2520, "Ohm", 1, 0, 0, 200000, 1 auxTempSensor2_bias_resistor = scalar, F32, 2524, "Ohm", 1, 0, 0, 200000, 1 - auxTempSensor2_adcChannel = bits, U08, 2528, [0:4] "INVALID","INVALID","analog x","INVALID","INVALID","analog y","INVALID","analog z","INVALID","INVALID","INVALID","analog whatever","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" + auxTempSensor2_adcChannel = bits, U08, 2528, [0:4] "AN-TEMP-1","AN-TEMP-2","AN-TEMP-3","AN-TEMP-4","AN-VOLT-10","INVALID","AN-VOLT-2","AN-VOLT-3","AN-VOLT-8","AN-VOLT-9","AN-VOLT-1","VBAT","AN-VOLT-4","AN-VOLT-5","AN-VOLT-6","AN-VOLT-7","NONE","INVALID","INVALID","INVALID" ;no TS info - skipping auxTempSensor2_alignmentFill offset 2529 fuelClosedLoopCltThreshold = scalar, S16, 2532, "C", 1, 0, 0, 100, 0 fuelClosedLoopTpsThreshold = scalar, S16, 2534, "%", 1, 0, 0, 100, 0 @@ -766,8 +766,8 @@ page = 1 mc33816_rstb = bits, U08, 2630, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" mc33816_driven = bits, U08, 2631, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" brakePedalPin = bits, U08, 2632, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - cj125ua = bits, U08, 2633, [0:4] "INVALID","INVALID","analog x","INVALID","INVALID","analog y","INVALID","analog z","INVALID","INVALID","INVALID","analog whatever","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" - cj125ur = bits, U08, 2634, [0:4] "INVALID","INVALID","analog x","INVALID","INVALID","analog y","INVALID","analog z","INVALID","INVALID","INVALID","analog whatever","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" + cj125ua = bits, U08, 2633, [0:4] "AN-TEMP-1","AN-TEMP-2","AN-TEMP-3","AN-TEMP-4","AN-VOLT-10","INVALID","AN-VOLT-2","AN-VOLT-3","AN-VOLT-8","AN-VOLT-9","AN-VOLT-1","VBAT","AN-VOLT-4","AN-VOLT-5","AN-VOLT-6","AN-VOLT-7","NONE","INVALID","INVALID","INVALID" + cj125ur = bits, U08, 2634, [0:4] "AN-TEMP-1","AN-TEMP-2","AN-TEMP-3","AN-TEMP-4","AN-VOLT-10","INVALID","AN-VOLT-2","AN-VOLT-3","AN-VOLT-8","AN-VOLT-9","AN-VOLT-1","VBAT","AN-VOLT-4","AN-VOLT-5","AN-VOLT-6","AN-VOLT-7","NONE","INVALID","INVALID","INVALID" brakePedalPinMode = scalar, U08, 2635, "todo", 1, 0, 0, 20, 1 auxPid1_pFactor = scalar, F32, 2636, "", 1, 0, -10000, 10000, 7 auxPid1_iFactor = scalar, F32, 2640, "", 1, 0, -10000, 10000, 7 @@ -797,7 +797,7 @@ page = 1 auxPid4_periodMs = scalar, S16, 2710, "ms", 1, 0, 0, 3000, 0 auxPid4_minValue = scalar, S16, 2712, "", 1, 0, -30000, 30000.0, 0 auxPid4_maxValue = scalar, S16, 2714, "", 1, 0, -30000, 30000.0, 0 - oilPressure_hwChannel = bits, U08, 2716, [0:4] "INVALID","INVALID","analog x","INVALID","INVALID","analog y","INVALID","analog z","INVALID","INVALID","INVALID","analog whatever","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" + oilPressure_hwChannel = bits, U08, 2716, [0:4] "AN-TEMP-1","AN-TEMP-2","AN-TEMP-3","AN-TEMP-4","AN-VOLT-10","INVALID","AN-VOLT-2","AN-VOLT-3","AN-VOLT-8","AN-VOLT-9","AN-VOLT-1","VBAT","AN-VOLT-4","AN-VOLT-5","AN-VOLT-6","AN-VOLT-7","NONE","INVALID","INVALID","INVALID" ;no TS info - skipping oilPressure_align offset 2717 oilPressure_v1 = scalar, F32, 2720, "volts", 1, 0.0, 0, 10.0, 2 oilPressure_value1 = scalar, F32, 2724, "kPa", 1, 0.0, 0, 1000.0, 2 @@ -816,7 +816,7 @@ page = 1 flexFuelSensor = bits, U08, 3124, [0:6], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" test557pin = bits, U08, 3125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" stepperDirectionPinMode = bits, U08, 3126, [0:1], "default", "default inverted", "open collector", "open collector inverted" - externalKnockSenseAdc = bits, U08, 3127, [0:4] "INVALID","INVALID","analog x","INVALID","INVALID","analog y","INVALID","analog z","INVALID","INVALID","INVALID","analog whatever","INVALID","INVALID","INVALID","INVALID","NONE","INVALID","INVALID","INVALID" + externalKnockSenseAdc = bits, U08, 3127, [0:4] "AN-TEMP-1","AN-TEMP-2","AN-TEMP-3","AN-TEMP-4","AN-VOLT-10","INVALID","AN-VOLT-2","AN-VOLT-3","AN-VOLT-8","AN-VOLT-9","AN-VOLT-1","VBAT","AN-VOLT-4","AN-VOLT-5","AN-VOLT-6","AN-VOLT-7","NONE","INVALID","INVALID","INVALID" stepperEnablePin = bits, U08, 3128, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tle8888_cs = bits, U08, 3129, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tle8888_csPinMode = bits, U08, 3130, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -2008,8 +2008,8 @@ menuDialog = main menu = "Fuel" # basic - subMenu = injectionSettings, "Injection Settings" - subMenu = injectionDeadTime, "Injector Dead Time", 0, {isInjectionEnabled == 1} + subMenu = injectionSettings, "Injection settings" + subMenu = injectionDeadTime, "Injector dead time", 0, {isInjectionEnabled == 1} subMenu = std_separator # Targets & closed loop @@ -2019,7 +2019,7 @@ menuDialog = main subMenu = std_separator # Fuel table/VE - subMenu = fuelTableDialog, "Alpha-N fuel table", 0, {isInjectionEnabled == 1 && fuelAlgorithm != LM_SPEED_DENSITY} + subMenu = fuelTableDialog, "Fuel table", 0, {isInjectionEnabled == 1 && fuelAlgorithm != LM_SPEED_DENSITY} subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY} subMenu = injPhaseTableTbl, "Injection phase", 0, {isInjectionEnabled == 1} subMenu = std_separator @@ -2028,17 +2028,17 @@ menuDialog = main subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1 && useWarmupPidAfr == 0} subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Baro multiplier", 0, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY} - subMenu = tChargeSettings, "tCharge Settings", 0, {isInjectionEnabled == 1} + subMenu = tChargeSettings, "tCharge settings", 0, {isInjectionEnabled == 1} subMenu = std_separator # Accel enrichment - subMenu = AccelEnrich, "Accel/Decel Enrichment/Enleanment", 0, {isInjectionEnabled == 1} + subMenu = AccelEnrich, "Accel/decel enrichment/enleanment", 0, {isInjectionEnabled == 1} subMenu = tpsTpsAccelTbl, "TPS/TPS acceleration extra fuel", 0, {isInjectionEnabled == 1} subMenu = mapAccelTaper, "Engine load AE taper", 0, {isInjectionEnabled == 1} menu = "Ignition" - subMenu = ignitionSettings, "Ignition Settings" + subMenu = ignitionSettings, "Ignition settings" subMenu = std_separator subMenu = dwellSettings, "Dwell", 0, {isIgnitionEnabled == 1} @@ -2054,7 +2054,7 @@ menuDialog = main subMenu = ignitionIatCorrTableTbl, "IAT correction", 0, {isIgnitionEnabled == 1} menu = "&Cranking" - subMenu = crankingDialog, "Cranking Settings" + subMenu = crankingDialog, "Cranking settings" subMenu = std_separator subMenu = crankingCltCurve, "Fuel CLT multiplier" @@ -2068,8 +2068,8 @@ menuDialog = main subMenu = cltCrankingCurve, "IAC multiplier", 0, {overrideCrankingIacSetting == 1} menu = "&Idle" - subMenu = idleSettings, "Idle Settings" - subMenu = idlehw, "Idle Hardware" + subMenu = idleSettings, "Idle settings" + subMenu = idlehw, "Idle hardware" subMenu = std_separator subMenu = cltIdleRPMCurve, "Target RPM", 0, {idleMode == 0} subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} @@ -2095,8 +2095,9 @@ menuDialog = main menu = "&Sensors" # Base analog input settings - subMenu = sensorInputs, "Sensor Inputs" - subMenu = analogInputSettings, "Analog Input Settings" + subMenu = triggerInputs, "Trigger inputs" + subMenu = otherSensorInputs, "Misc sensors" + subMenu = analogInputSettings, "Analog input settings" subMenu = std_separator # Thermistors @@ -2106,16 +2107,27 @@ menuDialog = main subMenu = auxTempSensor2Sensor, "AuxTemp2 sensor" subMenu = std_separator - # MAP/MAF + # TPS/pedal + subMenu = tpsSensor, "TPS" + subMenu = pedalSensor, "Accelerator pedal" + subMenu = std_separator + + # MAP/Baro subMenu = mapSettings, "MAP sensor" - subMenu = mafDecodingCurve, "MAF sensor" + subMenu = mapCurves, "MAP sampling" + subMenu = baroSettings, "Baro sensor" + subMenu = std_separator + + # MAF + subMenu = mafSettings, "MAF sensor" + subMenu = mafDecodingCurve, "MAF transfer function", 0, {mafAdcChannel != 16} subMenu = std_separator # O2 sensor(s) subMenu = egoSettings, "EGO sensor" subMenu = narrowToWideOxygenCurve, "Narrow to Wideband approximation" subMenu = std_separator - + # Misc sensors subMenu = speedSensor, "Vehicle speed sensor" subMenu = oilPressureSensor, "Oil pressure" @@ -2137,13 +2149,13 @@ menuDialog = main # EXPERIMENTAL FEATURES subMenu = parkingLot, "Experimental/Broken" subMenu = warmupTargetAfrCurve, "Warmup fuel auto correction AFR target" - subMenu = smLaunchControl, "Launch Control" + subMenu = smLaunchControl, "Launch control" subMenu = std_separator subMenu = std_separator - subMenu = etbDialog, "Electronic Throttle Body (beta version)" - subMenu = etbTpsBiasCurve, "Electronic Throttle Body Bias Curve" + subMenu = etbDialog, "Electronic throttle body (beta version)" + subMenu = etbTpsBiasCurve, "Electronic throttle body bias curve" [ControllerCommands] @@ -2402,63 +2414,57 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; Sensors->AUX1 Thermistor Sensor Setting dialog = auxTempSensor1Sensor, "aux1 Thermistor Settings" + field = "Input channel", auxTempSensor1_adcChannel + field = "Bias resistor", auxTempSensor1_bias_resistor, {auxTempSensor1_adcChannel != 16} + field = "#Here is three pairs of thermistor temperature and resistance." field = "#Typical temperatures is -40°C, 0°C and 100°C" field = "" - field = "Lowest temperature", auxTempSensor1_tempC_1 - field = "Resistance @ LT", auxTempSensor1_resistance_1 + field = "Lowest temperature", auxTempSensor1_tempC_1, {auxTempSensor1_adcChannel != 16} + field = "Resistance @ LT", auxTempSensor1_resistance_1, {auxTempSensor1_adcChannel != 16} field = "" - field = "Middle temperature", auxTempSensor1_tempC_2 - field = "Resistance @ MT", auxTempSensor1_resistance_2 + field = "Middle temperature", auxTempSensor1_tempC_2, {auxTempSensor1_adcChannel != 16} + field = "Resistance @ MT", auxTempSensor1_resistance_2, {auxTempSensor1_adcChannel != 16} field = "" - field = "Highest temperature", auxTempSensor1_tempC_3 - field = "Resistance @ HT", auxTempSensor1_resistance_3 + field = "Highest temperature", auxTempSensor1_tempC_3, {auxTempSensor1_adcChannel != 16} + field = "Resistance @ HT", auxTempSensor1_resistance_3, {auxTempSensor1_adcChannel != 16} ; Sensors->AUX2 Thermistor Sensor Setting dialog = auxTempSensor2Sensor, "aux2 Thermistor Settings" + field = "Input channel", auxTempSensor2_adcChannel + field = "Bias resistor", auxTempSensor2_bias_resistor, {auxTempSensor2_adcChannel != 16} + field = "#Here is three pairs of thermistor temperature and resistance." field = "#Typical temperatures is -40°C, 0°C and 100°C" field = "" - field = "Lowest temperature", auxTempSensor2_tempC_1 - field = "Resistance @ LT", auxTempSensor2_resistance_1 + field = "Lowest temperature", auxTempSensor2_tempC_1, {auxTempSensor2_adcChannel != 16} + field = "Resistance @ LT", auxTempSensor2_resistance_1, {auxTempSensor2_adcChannel != 16} field = "" - field = "Middle temperature", auxTempSensor2_tempC_2 - field = "Resistance @ MT", auxTempSensor2_resistance_2 + field = "Middle temperature", auxTempSensor2_tempC_2, {auxTempSensor2_adcChannel != 16} + field = "Resistance @ MT", auxTempSensor2_resistance_2, {auxTempSensor2_adcChannel != 16} field = "" - field = "Highest temperature", auxTempSensor2_tempC_3 - field = "Resistance @ HT", auxTempSensor2_resistance_3 - -; Sensor Inputs - dialog = otherSensorInputs, "Other Sensor Inputs" - field = "aux1 TempSensor ADC input", auxTempSensor1_adcChannel - field = "aux1 Bias Resistor Value", auxTempSensor1_bias_resistor - field = "aux2 TempSensor ADC input", auxTempSensor2_adcChannel - field = "aux2 Bias Resistor Value", auxTempSensor2_bias_resistor - field = "Accelerator position sensor", throttlePedalPositionAdcChannel - field = "Oil Pressure ADC input", oilPressure_hwChannel - field = "fuelLevelSensor", fuelLevelSensor - field = "Baro ADC input", baroSensor_hwChannel - field = "Flex Fuel", flexFuelSensor - field = "Vehicle speed sensor", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin - field = "A/C Switch", acSwitchAdc - - dialog = mainSensorInputs, "Main Sensor Inputs" - field = "MAP ADC input", map_sensor_hwChannel, {hasFrequencyReportingMapSensor == 0} - field = "MAP Freq", frequencyReportingMapInputPin, {hasFrequencyReportingMapSensor == 1} - field = "MAF ADC input", mafAdcChannel - field = "CLT ADC input", clt_adcChannel - field = "CLT Bias Resistor Value", clt_bias_resistor - field = "IAT ADC input", iat_adcChannel - field = "IAT Bias Resistor Value", iat_bias_resistor - field = "AFR ADC input", afr_hwChannel - field = "vBatt ADC input", vbattAdcChannel + field = "Highest temperature", auxTempSensor2_tempC_3, {auxTempSensor2_adcChannel != 16} + field = "Resistance @ HT", auxTempSensor2_resistance_3, {auxTempSensor2_adcChannel != 16} + + dialog = tpsSensor, "TPS" field = "!See Tools>Calibrate TPS" field = "Throttle1 position sensor", tps1_1AdcChannel field = "Throttle2 position sensor", tps2_1AdcChannel - + field = "TPS low value detection threshold", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16} + field = "TPS high value detection threshold", tpsErrorDetectionTooHigh, {tps1_1AdcChannel != 16} + + dialog = pedalSensor, "Accelerator pedal" + field = "Accelerator position sensor", throttlePedalPositionAdcChannel + +; Sensor Inputs + dialog = otherSensorInputs, "Other Sensor Inputs" + field = "Fuel level", fuelLevelSensor + field = "Flex fuel", flexFuelSensor + field = "Clutch down pin", clutchDownPin + field = "Clutch up pin", clutchUpPin + field = "Brake pedal pin", brakePedalPin + field = "A/C switch", acSwitchAdc + dialog = triggerInputs, "Trigger Inputs" field = "!ECU reboot needed to apply these settings" field = "#Cam is primary if you have cam sensor" @@ -2468,12 +2474,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} field = "Cam Sync/VVT input", camInput - - dialog = sensorInputs, "", xAxis - panel = triggerInputs, West - panel = mainSensorInputs, Center - panel = otherSensorInputs, East - dialog = allPinsSensors, "Sensors" field = "CLT ADC input", clt_adcChannel field = "IAT ADC input", iat_adcChannel @@ -2658,19 +2658,22 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; Sensors->CLT sensor dialog = clt_thermistor, "CLT sensor" + 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°C, 0°C and 100°C" field = "" - field = "Lowest temperature", clt_tempC_1 - field = "Resistance @ LT", clt_resistance_1 + field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 16} + field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 16} field = "" - field = "Middle temperature", clt_tempC_2 - field = "Resistance @ MT", clt_resistance_2 + field = "Middle temperature", clt_tempC_2, {clt_adcChannel != 16} + field = "Resistance @ MT", clt_resistance_2, {clt_adcChannel != 16} field = "" - field = "Highest temperature", clt_tempC_3 - field = "Resistance @ HT", clt_resistance_3 + field = "Highest temperature", clt_tempC_3, {clt_adcChannel != 16} + field = "Resistance @ HT", clt_resistance_3, {clt_adcChannel != 16} field = "" - field = "Linear characteristic", useLinearCltSensor + field = "Linear characteristic", useLinearCltSensor, {clt_adcChannel != 16} dialog = cltSensor, "", xAxis panel = clt_thermistor @@ -2678,19 +2681,22 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; 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°C, 0°C and 100°C" field = "" - field = "Lowest temperature", iat_tempC_1 - field = "Resistance @ LT", iat_resistance_1 + field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 16} + field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 16} field = "" - field = "Middle temperature", iat_tempC_2 - field = "Resistance @ MT", iat_resistance_2 + field = "Middle temperature", iat_tempC_2, {iat_adcChannel != 16} + field = "Resistance @ MT", iat_resistance_2, {iat_adcChannel != 16} field = "" - field = "Highest temperature", iat_tempC_3 - field = "Resistance @ HT", iat_resistance_3 + field = "Highest temperature", iat_tempC_3, {iat_adcChannel != 16} + field = "Resistance @ HT", iat_resistance_3, {iat_adcChannel != 16} field = "" - field = "Linear characteristic", useLinearIatSensor + field = "Linear characteristic", useLinearIatSensor, {iat_adcChannel != 16} dialog = iatSensor, "", xAxis panel = iat_thermistor @@ -2698,50 +2704,56 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; Sensors->Oil pressure sensor dialog = oilp_settings, "Oil pressure sensor" - field = "low voltage", oilPressure_v1 - field = "low pressure", oilPressure_value1 - field = "high voltage", oilPressure_v2 - field = "high pressure", oilPressure_value2 + 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 gauge = OilPressGauge ; Sensors->MAP sensor - dialog = mapSensorVDlg, "MAP sensor", yAxis - field = "MAP type", map_sensor_type, {hasFrequencyReportingMapSensor == 0} - field = "MAP value low point", map_sensor_lowValue, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0} - field = "MAP voltage low point", mapLowValueVoltage, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0} - field = "MAP value high point", map_sensor_highValue, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0} - field = "MAP voltage high value", mapHighValueVoltage, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0} - field = "Use minimal value of", mapMinBufferLength + dialog = mapSensorAnalog, "MAP sensor", yAxis + field = "MAP ADC input", map_sensor_hwChannel + field = "MAP type", map_sensor_type + field = "MAP value low point", map_sensor_lowValue + field = "MAP voltage low point", mapLowValueVoltage + field = "MAP value high point", map_sensor_highValue + field = "MAP voltage high value", mapHighValueVoltage + + dialog = mapSensorFreq, "MAP frequency sensor", yAxis + field = "MAP Freq", frequencyReportingMapInputPin + field = "0 kPa freq", mapFrequency0Kpa + field = "100 kpa freq", mapFrequency100Kpa + + dialog = mapCommon, "MAP common settings" + field = "frequency-based MAP", hasFrequencyReportingMapSensor + field = "Low value threshold", mapErrorDetectionTooLow + field = "High value threshold", mapErrorDetectionTooHigh + field = "" field = "Measure Map Only In One Cylinder", measureMapOnlyInOneCylinder - field = baroSensor_lowValue, baroSensor_lowValue - field = baroSensor_highValue, baroSensor_highValue - field = baroSensor_type, baroSensor_type + field = "Minimum MAP samples", mapMinBufferLength - dialog = mapSensorFDlg, "MAP frequency sensor", yAxis - field = "0 kPa freq", mapFrequency0Kpa, {hasFrequencyReportingMapSensor == 1} - field = "100 kpa freq", mapFrequency100Kpa, {hasFrequencyReportingMapSensor == 1} + dialog = mapSettings, "", yAxis + panel = mapCommon + panel = mapSensorAnalog, {hasFrequencyReportingMapSensor == 0} + panel = mapSensorFreq, {hasFrequencyReportingMapSensor == 1} + panel = mapErrorDetection - dialog = mapSwitch, "MAP input type" - field = "frequency-based MAP", hasFrequencyReportingMapSensor - - dialog = mapSwitchAndSettings, "", yAxis - field = "Low value threshold", mapErrorDetectionTooLow - field = "High value threshold", mapErrorDetectionTooHigh - - panel = mapSwitch - panel = mapSensorVDlg - panel = mapSensorFDlg - - dialog = mapCurves, "", yAxis - panel = map_samplingAngleCurve + dialog = baroSettings, "Baro sensor" + field = "Baro ADC input", baroSensor_hwChannel + field = baroSensor_lowValue, baroSensor_lowValue, {baroSensor_hwChannel != 16} + field = baroSensor_highValue, baroSensor_highValue, {baroSensor_hwChannel != 16} + field = baroSensor_type, baroSensor_type, {baroSensor_hwChannel != 16} + + dialog = mapCurves, "MAP sampling", yAxis + panel = map_samplingAngleCurve panel = map_samplingWindowCurve - - dialog = mapSettings, "", xAxis - panel = mapCurves - panel = mapSwitchAndSettings + + dialog = mafSettings, "MAF sensor", yAxis + field = "MAF ADC input", mafAdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" @@ -2752,12 +2764,14 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "high voltage", afr_v2 field = "high value", afr_value2 field = "Correction", egoValueShift + dialog = egoSettings_IO, "EGO Sensor I/O" - field = "AFR ADC input", afr_hwChannel - field = "O2 heater pin", o2heaterPin + field = "Input channel", afr_hwChannel + field = "Heater pin", o2heaterPin + dialog = egoSettings, "", yAxis - panel = egoSettings_sensor, North - panel = egoSettings_IO, South + panel = egoSettings_IO + panel = egoSettings_sensor, {afr_hwChannel != 16} ; Engine->EGT inputs dialog = egtInputs, "EGT inputs" @@ -3001,17 +3015,17 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = batteryDialog panel = alternator -; Sensors->Vehicle Speed Sensor Setting - dialog = speedSensor, "Speed sensor", xAxis + dialog = speedSensorLeft + field = "Input pin", vehicleSpeedSensorInputPin field = "revolution to speed mult", vehicleSpeedCoef + + dialog = speedSensor, "Speed sensor", xAxis + panel = speedSensorLeft gauge = VSSGauge ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" field = "!ECU reboot needed to apply these settings" - field = "TPS low value detection threshold", tpsErrorDetectionTooLow - field = "TPS high value detection threshold", tpsErrorDetectionTooHigh - field = "!todo: move MAF channel to maf curve dialog" field = "Use fixed baro corr from MAP", useFixedBaroCorrFromMap field = "Analog divider", analogInputDividerCoefficient field = "Use BiQuad averaging", useBiQuadAnalogFiltering diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index 38b9f02810..b82f6465ad 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -72,7 +72,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Wed Jun 05 00:34:53 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Wed Jun 05 21:36:01 EDT 2019 pageSize = 20000 page = 1 @@ -2008,8 +2008,8 @@ menuDialog = main menu = "Fuel" # basic - subMenu = injectionSettings, "Injection Settings" - subMenu = injectionDeadTime, "Injector Dead Time", 0, {isInjectionEnabled == 1} + subMenu = injectionSettings, "Injection settings" + subMenu = injectionDeadTime, "Injector dead time", 0, {isInjectionEnabled == 1} subMenu = std_separator # Targets & closed loop @@ -2019,7 +2019,7 @@ menuDialog = main subMenu = std_separator # Fuel table/VE - subMenu = fuelTableDialog, "Alpha-N fuel table", 0, {isInjectionEnabled == 1 && fuelAlgorithm != LM_SPEED_DENSITY} + subMenu = fuelTableDialog, "Fuel table", 0, {isInjectionEnabled == 1 && fuelAlgorithm != LM_SPEED_DENSITY} subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY} subMenu = injPhaseTableTbl, "Injection phase", 0, {isInjectionEnabled == 1} subMenu = std_separator @@ -2028,17 +2028,17 @@ menuDialog = main subMenu = cltFuelCorrCurve, "CLT multiplier", 0, {isInjectionEnabled == 1 && useWarmupPidAfr == 0} subMenu = iatFuelCorrCurve, "IAT multiplier", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Baro multiplier", 0, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY} - subMenu = tChargeSettings, "tCharge Settings", 0, {isInjectionEnabled == 1} + subMenu = tChargeSettings, "tCharge settings", 0, {isInjectionEnabled == 1} subMenu = std_separator # Accel enrichment - subMenu = AccelEnrich, "Accel/Decel Enrichment/Enleanment", 0, {isInjectionEnabled == 1} + subMenu = AccelEnrich, "Accel/decel enrichment/enleanment", 0, {isInjectionEnabled == 1} subMenu = tpsTpsAccelTbl, "TPS/TPS acceleration extra fuel", 0, {isInjectionEnabled == 1} subMenu = mapAccelTaper, "Engine load AE taper", 0, {isInjectionEnabled == 1} menu = "Ignition" - subMenu = ignitionSettings, "Ignition Settings" + subMenu = ignitionSettings, "Ignition settings" subMenu = std_separator subMenu = dwellSettings, "Dwell", 0, {isIgnitionEnabled == 1} @@ -2054,7 +2054,7 @@ menuDialog = main subMenu = ignitionIatCorrTableTbl, "IAT correction", 0, {isIgnitionEnabled == 1} menu = "&Cranking" - subMenu = crankingDialog, "Cranking Settings" + subMenu = crankingDialog, "Cranking settings" subMenu = std_separator subMenu = crankingCltCurve, "Fuel CLT multiplier" @@ -2068,8 +2068,8 @@ menuDialog = main subMenu = cltCrankingCurve, "IAC multiplier", 0, {overrideCrankingIacSetting == 1} menu = "&Idle" - subMenu = idleSettings, "Idle Settings" - subMenu = idlehw, "Idle Hardware" + subMenu = idleSettings, "Idle settings" + subMenu = idlehw, "Idle hardware" subMenu = std_separator subMenu = cltIdleRPMCurve, "Target RPM", 0, {idleMode == 0} subMenu = idleVeCurve, "VE", 0, {useSeparateVeForIdle == 1} @@ -2095,8 +2095,9 @@ menuDialog = main menu = "&Sensors" # Base analog input settings - subMenu = sensorInputs, "Sensor Inputs" - subMenu = analogInputSettings, "Analog Input Settings" + subMenu = triggerInputs, "Trigger inputs" + subMenu = otherSensorInputs, "Misc sensors" + subMenu = analogInputSettings, "Analog input settings" subMenu = std_separator # Thermistors @@ -2106,17 +2107,28 @@ menuDialog = main subMenu = auxTempSensor2Sensor, "AuxTemp2 sensor" subMenu = std_separator - # MAP/MAF + # TPS/pedal + subMenu = tpsSensor, "TPS" + subMenu = pedalSensor, "Accelerator pedal" + subMenu = std_separator + + # MAP/Baro subMenu = mapSettings, "MAP sensor" - subMenu = mafDecodingCurve, "MAF sensor" + subMenu = mapCurves, "MAP sampling" + subMenu = baroSettings, "Baro sensor" + subMenu = std_separator + + # MAF + subMenu = mafSettings, "MAF sensor" + subMenu = mafDecodingCurve, "MAF transfer function", 0, {mafAdcChannel != 16} subMenu = std_separator # O2 sensor(s) subMenu = egoSettings, "EGO sensor" subMenu = narrowToWideOxygenCurve, "Narrow to Wideband approximation" - subMenu = cj125Function, "CJ125 Settings (wbo decoder)" + subMenu = cj125Function, "CJ125 settings (wbo decoder)" subMenu = std_separator - + # Misc sensors subMenu = speedSensor, "Vehicle speed sensor" subMenu = oilPressureSensor, "Oil pressure" @@ -2143,7 +2155,7 @@ menuDialog = main # EXPERIMENTAL FEATURES subMenu = parkingLot, "Experimental/Broken" subMenu = warmupTargetAfrCurve, "Warmup fuel auto correction AFR target" - subMenu = smLaunchControl, "Launch Control" + subMenu = smLaunchControl, "Launch control" subMenu = std_separator subMenu = std_separator @@ -2406,63 +2418,57 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; Sensors->AUX1 Thermistor Sensor Setting dialog = auxTempSensor1Sensor, "aux1 Thermistor Settings" + field = "Input channel", auxTempSensor1_adcChannel + field = "Bias resistor", auxTempSensor1_bias_resistor, {auxTempSensor1_adcChannel != 16} + field = "#Here is three pairs of thermistor temperature and resistance." field = "#Typical temperatures is -40°C, 0°C and 100°C" field = "" - field = "Lowest temperature", auxTempSensor1_tempC_1 - field = "Resistance @ LT", auxTempSensor1_resistance_1 + field = "Lowest temperature", auxTempSensor1_tempC_1, {auxTempSensor1_adcChannel != 16} + field = "Resistance @ LT", auxTempSensor1_resistance_1, {auxTempSensor1_adcChannel != 16} field = "" - field = "Middle temperature", auxTempSensor1_tempC_2 - field = "Resistance @ MT", auxTempSensor1_resistance_2 + field = "Middle temperature", auxTempSensor1_tempC_2, {auxTempSensor1_adcChannel != 16} + field = "Resistance @ MT", auxTempSensor1_resistance_2, {auxTempSensor1_adcChannel != 16} field = "" - field = "Highest temperature", auxTempSensor1_tempC_3 - field = "Resistance @ HT", auxTempSensor1_resistance_3 + field = "Highest temperature", auxTempSensor1_tempC_3, {auxTempSensor1_adcChannel != 16} + field = "Resistance @ HT", auxTempSensor1_resistance_3, {auxTempSensor1_adcChannel != 16} ; Sensors->AUX2 Thermistor Sensor Setting dialog = auxTempSensor2Sensor, "aux2 Thermistor Settings" + field = "Input channel", auxTempSensor2_adcChannel + field = "Bias resistor", auxTempSensor2_bias_resistor, {auxTempSensor2_adcChannel != 16} + field = "#Here is three pairs of thermistor temperature and resistance." field = "#Typical temperatures is -40°C, 0°C and 100°C" field = "" - field = "Lowest temperature", auxTempSensor2_tempC_1 - field = "Resistance @ LT", auxTempSensor2_resistance_1 + field = "Lowest temperature", auxTempSensor2_tempC_1, {auxTempSensor2_adcChannel != 16} + field = "Resistance @ LT", auxTempSensor2_resistance_1, {auxTempSensor2_adcChannel != 16} field = "" - field = "Middle temperature", auxTempSensor2_tempC_2 - field = "Resistance @ MT", auxTempSensor2_resistance_2 + field = "Middle temperature", auxTempSensor2_tempC_2, {auxTempSensor2_adcChannel != 16} + field = "Resistance @ MT", auxTempSensor2_resistance_2, {auxTempSensor2_adcChannel != 16} field = "" - field = "Highest temperature", auxTempSensor2_tempC_3 - field = "Resistance @ HT", auxTempSensor2_resistance_3 - -; Sensor Inputs - dialog = otherSensorInputs, "Other Sensor Inputs" - field = "aux1 TempSensor ADC input", auxTempSensor1_adcChannel - field = "aux1 Bias Resistor Value", auxTempSensor1_bias_resistor - field = "aux2 TempSensor ADC input", auxTempSensor2_adcChannel - field = "aux2 Bias Resistor Value", auxTempSensor2_bias_resistor - field = "Accelerator position sensor", throttlePedalPositionAdcChannel - field = "Oil Pressure ADC input", oilPressure_hwChannel - field = "fuelLevelSensor", fuelLevelSensor - field = "Baro ADC input", baroSensor_hwChannel - field = "Flex Fuel", flexFuelSensor - field = "Vehicle speed sensor", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin - field = "A/C Switch", acSwitchAdc - - dialog = mainSensorInputs, "Main Sensor Inputs" - field = "MAP ADC input", map_sensor_hwChannel, {hasFrequencyReportingMapSensor == 0} - field = "MAP Freq", frequencyReportingMapInputPin, {hasFrequencyReportingMapSensor == 1} - field = "MAF ADC input", mafAdcChannel - field = "CLT ADC input", clt_adcChannel - field = "CLT Bias Resistor Value", clt_bias_resistor - field = "IAT ADC input", iat_adcChannel - field = "IAT Bias Resistor Value", iat_bias_resistor - field = "AFR ADC input", afr_hwChannel - field = "vBatt ADC input", vbattAdcChannel + field = "Highest temperature", auxTempSensor2_tempC_3, {auxTempSensor2_adcChannel != 16} + field = "Resistance @ HT", auxTempSensor2_resistance_3, {auxTempSensor2_adcChannel != 16} + + dialog = tpsSensor, "TPS" field = "!See Tools>Calibrate TPS" field = "Throttle1 position sensor", tps1_1AdcChannel field = "Throttle2 position sensor", tps2_1AdcChannel - + field = "TPS low value detection threshold", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16} + field = "TPS high value detection threshold", tpsErrorDetectionTooHigh, {tps1_1AdcChannel != 16} + + dialog = pedalSensor, "Accelerator pedal" + field = "Accelerator position sensor", throttlePedalPositionAdcChannel + +; Sensor Inputs + dialog = otherSensorInputs, "Other Sensor Inputs" + field = "Fuel level", fuelLevelSensor + field = "Flex fuel", flexFuelSensor + field = "Clutch down pin", clutchDownPin + field = "Clutch up pin", clutchUpPin + field = "Brake pedal pin", brakePedalPin + field = "A/C switch", acSwitchAdc + dialog = triggerInputs, "Trigger Inputs" field = "!ECU reboot needed to apply these settings" field = "#Cam is primary if you have cam sensor" @@ -2472,12 +2478,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} field = "Cam Sync/VVT input", camInput - - dialog = sensorInputs, "", xAxis - panel = triggerInputs, West - panel = mainSensorInputs, Center - panel = otherSensorInputs, East - dialog = allPinsSensors, "Sensors" field = "CLT ADC input", clt_adcChannel field = "IAT ADC input", iat_adcChannel @@ -2662,19 +2662,22 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; Sensors->CLT sensor dialog = clt_thermistor, "CLT sensor" + 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°C, 0°C and 100°C" field = "" - field = "Lowest temperature", clt_tempC_1 - field = "Resistance @ LT", clt_resistance_1 + field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 16} + field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 16} field = "" - field = "Middle temperature", clt_tempC_2 - field = "Resistance @ MT", clt_resistance_2 + field = "Middle temperature", clt_tempC_2, {clt_adcChannel != 16} + field = "Resistance @ MT", clt_resistance_2, {clt_adcChannel != 16} field = "" - field = "Highest temperature", clt_tempC_3 - field = "Resistance @ HT", clt_resistance_3 + field = "Highest temperature", clt_tempC_3, {clt_adcChannel != 16} + field = "Resistance @ HT", clt_resistance_3, {clt_adcChannel != 16} field = "" - field = "Linear characteristic", useLinearCltSensor + field = "Linear characteristic", useLinearCltSensor, {clt_adcChannel != 16} dialog = cltSensor, "", xAxis panel = clt_thermistor @@ -2682,19 +2685,22 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; 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°C, 0°C and 100°C" field = "" - field = "Lowest temperature", iat_tempC_1 - field = "Resistance @ LT", iat_resistance_1 + field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 16} + field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 16} field = "" - field = "Middle temperature", iat_tempC_2 - field = "Resistance @ MT", iat_resistance_2 + field = "Middle temperature", iat_tempC_2, {iat_adcChannel != 16} + field = "Resistance @ MT", iat_resistance_2, {iat_adcChannel != 16} field = "" - field = "Highest temperature", iat_tempC_3 - field = "Resistance @ HT", iat_resistance_3 + field = "Highest temperature", iat_tempC_3, {iat_adcChannel != 16} + field = "Resistance @ HT", iat_resistance_3, {iat_adcChannel != 16} field = "" - field = "Linear characteristic", useLinearIatSensor + field = "Linear characteristic", useLinearIatSensor, {iat_adcChannel != 16} dialog = iatSensor, "", xAxis panel = iat_thermistor @@ -2702,50 +2708,56 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; Sensors->Oil pressure sensor dialog = oilp_settings, "Oil pressure sensor" - field = "low voltage", oilPressure_v1 - field = "low pressure", oilPressure_value1 - field = "high voltage", oilPressure_v2 - field = "high pressure", oilPressure_value2 + 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 gauge = OilPressGauge ; Sensors->MAP sensor - dialog = mapSensorVDlg, "MAP sensor", yAxis - field = "MAP type", map_sensor_type, {hasFrequencyReportingMapSensor == 0} - field = "MAP value low point", map_sensor_lowValue, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0} - field = "MAP voltage low point", mapLowValueVoltage, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0} - field = "MAP value high point", map_sensor_highValue, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0} - field = "MAP voltage high value", mapHighValueVoltage, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0} - field = "Use minimal value of", mapMinBufferLength + dialog = mapSensorAnalog, "MAP sensor", yAxis + field = "MAP ADC input", map_sensor_hwChannel + field = "MAP type", map_sensor_type + field = "MAP value low point", map_sensor_lowValue + field = "MAP voltage low point", mapLowValueVoltage + field = "MAP value high point", map_sensor_highValue + field = "MAP voltage high value", mapHighValueVoltage + + dialog = mapSensorFreq, "MAP frequency sensor", yAxis + field = "MAP Freq", frequencyReportingMapInputPin + field = "0 kPa freq", mapFrequency0Kpa + field = "100 kpa freq", mapFrequency100Kpa + + dialog = mapCommon, "MAP common settings" + field = "frequency-based MAP", hasFrequencyReportingMapSensor + field = "Low value threshold", mapErrorDetectionTooLow + field = "High value threshold", mapErrorDetectionTooHigh + field = "" field = "Measure Map Only In One Cylinder", measureMapOnlyInOneCylinder - field = baroSensor_lowValue, baroSensor_lowValue - field = baroSensor_highValue, baroSensor_highValue - field = baroSensor_type, baroSensor_type + field = "Minimum MAP samples", mapMinBufferLength - dialog = mapSensorFDlg, "MAP frequency sensor", yAxis - field = "0 kPa freq", mapFrequency0Kpa, {hasFrequencyReportingMapSensor == 1} - field = "100 kpa freq", mapFrequency100Kpa, {hasFrequencyReportingMapSensor == 1} + dialog = mapSettings, "", yAxis + panel = mapCommon + panel = mapSensorAnalog, {hasFrequencyReportingMapSensor == 0} + panel = mapSensorFreq, {hasFrequencyReportingMapSensor == 1} + panel = mapErrorDetection - dialog = mapSwitch, "MAP input type" - field = "frequency-based MAP", hasFrequencyReportingMapSensor - - dialog = mapSwitchAndSettings, "", yAxis - field = "Low value threshold", mapErrorDetectionTooLow - field = "High value threshold", mapErrorDetectionTooHigh - - panel = mapSwitch - panel = mapSensorVDlg - panel = mapSensorFDlg - - dialog = mapCurves, "", yAxis - panel = map_samplingAngleCurve + dialog = baroSettings, "Baro sensor" + field = "Baro ADC input", baroSensor_hwChannel + field = baroSensor_lowValue, baroSensor_lowValue, {baroSensor_hwChannel != 16} + field = baroSensor_highValue, baroSensor_highValue, {baroSensor_hwChannel != 16} + field = baroSensor_type, baroSensor_type, {baroSensor_hwChannel != 16} + + dialog = mapCurves, "MAP sampling", yAxis + panel = map_samplingAngleCurve panel = map_samplingWindowCurve - - dialog = mapSettings, "", xAxis - panel = mapCurves - panel = mapSwitchAndSettings + + dialog = mafSettings, "MAF sensor", yAxis + field = "MAF ADC input", mafAdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" @@ -2756,12 +2768,14 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "high voltage", afr_v2 field = "high value", afr_value2 field = "Correction", egoValueShift + dialog = egoSettings_IO, "EGO Sensor I/O" - field = "AFR ADC input", afr_hwChannel - field = "O2 heater pin", o2heaterPin + field = "Input channel", afr_hwChannel + field = "Heater pin", o2heaterPin + dialog = egoSettings, "", yAxis - panel = egoSettings_sensor, North - panel = egoSettings_IO, South + panel = egoSettings_IO + panel = egoSettings_sensor, {afr_hwChannel != 16} ; Engine->EGT inputs dialog = egtInputs, "EGT inputs" @@ -3005,17 +3019,17 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = batteryDialog panel = alternator -; Sensors->Vehicle Speed Sensor Setting - dialog = speedSensor, "Speed sensor", xAxis + dialog = speedSensorLeft + field = "Input pin", vehicleSpeedSensorInputPin field = "revolution to speed mult", vehicleSpeedCoef + + dialog = speedSensor, "Speed sensor", xAxis + panel = speedSensorLeft gauge = VSSGauge ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" field = "!ECU reboot needed to apply these settings" - field = "TPS low value detection threshold", tpsErrorDetectionTooLow - field = "TPS high value detection threshold", tpsErrorDetectionTooHigh - field = "!todo: move MAF channel to maf curve dialog" field = "Use fixed baro corr from MAP", useFixedBaroCorrFromMap field = "Analog divider", analogInputDividerCoefficient field = "Use BiQuad averaging", useBiQuadAnalogFiltering