mirror of https://github.com/rusefi/rusefi-1.git
Auto-generated configs and docs
This commit is contained in:
GitHub build-firmware Action
parent
5e265dd8ea
commit
f5114d7f1b
|
|
@ -1,4 +1,4 @@
|
|||
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Sep 19 21:19:02 UTC 2020
|
||||
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Sep 20 17:44:42 UTC 2020
|
||||
// by class com.rusefi.output.CHeaderConsumer
|
||||
// begin
|
||||
#pragma once
|
||||
|
|
@ -3722,4 +3722,4 @@ struct persistent_config_s {
|
|||
typedef struct persistent_config_s persistent_config_s;
|
||||
|
||||
// end
|
||||
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Sep 19 21:19:02 UTC 2020
|
||||
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Sep 20 17:44:42 UTC 2020
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#define activateAuxPid4_offset 76
|
||||
#define adc_channel_e_enum "Disabled", "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17"
|
||||
#define adc_channel_mode_e_auto_enum "ADC_OFF", "ADC_SLOW", "ADC_FAST"
|
||||
#define ADC_CHANNEL_NONE 16
|
||||
#define ADC_CHANNEL_NONE 0
|
||||
#define adcVcc_offset 548
|
||||
#define afr_alignmentFill_afr_offset 561
|
||||
#define afr_hwChannel_offset 560
|
||||
|
|
@ -1169,8 +1169,8 @@
|
|||
#define showHumanReadableWarning_offset 976
|
||||
#define showSdCardWarning_offset 76
|
||||
#define SIGNATURE_BOARD kin
|
||||
#define SIGNATURE_DATE 2020.09.19
|
||||
#define SIGNATURE_HASH 2286810213
|
||||
#define SIGNATURE_DATE 2020.09.20
|
||||
#define SIGNATURE_HASH 3061855702
|
||||
#define silentTriggerError_offset 1464
|
||||
#define slowAdcAlpha_offset 2088
|
||||
#define solenoidPadding_offset 1198
|
||||
|
|
@ -1482,7 +1482,7 @@
|
|||
#define ts_show_spi true
|
||||
#define ts_show_trigger_comparator true
|
||||
#define ts_show_tunerstudio_port true
|
||||
#define TS_SIGNATURE "rusEFI 2020.09.19.kin.2286810213"
|
||||
#define TS_SIGNATURE "rusEFI 2020.09.20.kin.3061855702"
|
||||
#define TS_SINGLE_WRITE_COMMAND 'W'
|
||||
#define TS_SINGLE_WRITE_COMMAND_char W
|
||||
#define TS_TEST_COMMAND 't' // 0x74
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 19 21:18:44 UTC 2020
|
||||
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 20 17:44:24 UTC 2020
|
||||
// by class com.rusefi.output.CHeaderConsumer
|
||||
// begin
|
||||
#pragma once
|
||||
|
|
@ -3722,4 +3722,4 @@ struct persistent_config_s {
|
|||
typedef struct persistent_config_s persistent_config_s;
|
||||
|
||||
// end
|
||||
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 19 21:18:44 UTC 2020
|
||||
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 20 17:44:24 UTC 2020
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 19 21:18:44 UTC 2020
|
||||
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 20 17:44:24 UTC 2020
|
||||
|
||||
// by class com.rusefi.output.FileFsioSettingsConsumer
|
||||
FSIO_SETTING_FANONTEMPERATURE = 1000,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 19 21:18:44 UTC 2020
|
||||
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 20 17:44:24 UTC 2020
|
||||
|
||||
// by class com.rusefi.output.FileFsioSettingsConsumer
|
||||
case FSIO_SETTING_FANONTEMPERATURE:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 19 21:18:44 UTC 2020
|
||||
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 20 17:44:24 UTC 2020
|
||||
|
||||
// by class com.rusefi.output.FileFsioSettingsConsumer
|
||||
static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature");
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 19 21:18:44 UTC 2020
|
||||
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 20 17:44:24 UTC 2020
|
||||
|
||||
// by class com.rusefi.output.FileFsioSettingsConsumer
|
||||
case FSIO_SETTING_FANONTEMPERATURE:
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#define activateAuxPid4_offset 76
|
||||
#define adc_channel_e_enum "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5"
|
||||
#define adc_channel_mode_e_auto_enum "ADC_OFF", "ADC_SLOW", "ADC_FAST"
|
||||
#define ADC_CHANNEL_NONE 16
|
||||
#define ADC_CHANNEL_NONE 0
|
||||
#define adcVcc_offset 548
|
||||
#define afr_alignmentFill_afr_offset 561
|
||||
#define afr_hwChannel_offset 560
|
||||
|
|
@ -1169,8 +1169,8 @@
|
|||
#define showHumanReadableWarning_offset 976
|
||||
#define showSdCardWarning_offset 76
|
||||
#define SIGNATURE_BOARD all
|
||||
#define SIGNATURE_DATE 2020.09.19
|
||||
#define SIGNATURE_HASH 1670828001
|
||||
#define SIGNATURE_DATE 2020.09.20
|
||||
#define SIGNATURE_HASH 1566248530
|
||||
#define silentTriggerError_offset 1464
|
||||
#define slowAdcAlpha_offset 2088
|
||||
#define solenoidPadding_offset 1198
|
||||
|
|
@ -1482,7 +1482,7 @@
|
|||
#define ts_show_spi true
|
||||
#define ts_show_trigger_comparator false
|
||||
#define ts_show_tunerstudio_port true
|
||||
#define TS_SIGNATURE "rusEFI 2020.09.19.all.1670828001"
|
||||
#define TS_SIGNATURE "rusEFI 2020.09.20.all.1566248530"
|
||||
#define TS_SINGLE_WRITE_COMMAND 'W'
|
||||
#define TS_SINGLE_WRITE_COMMAND_char W
|
||||
#define TS_TEST_COMMAND 't' // 0x74
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@
|
|||
//
|
||||
|
||||
#define SIGNATURE_BOARD all
|
||||
#define SIGNATURE_DATE 2020.09.19
|
||||
#define SIGNATURE_HASH 1670828001
|
||||
#define TS_SIGNATURE "rusEFI 2020.09.19.all.1670828001"
|
||||
#define SIGNATURE_DATE 2020.09.20
|
||||
#define SIGNATURE_HASH 1566248530
|
||||
#define TS_SIGNATURE "rusEFI 2020.09.20.all.1566248530"
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@
|
|||
//
|
||||
|
||||
#define SIGNATURE_BOARD frankenso_na6
|
||||
#define SIGNATURE_DATE 2020.09.19
|
||||
#define SIGNATURE_HASH 3289229786
|
||||
#define TS_SIGNATURE "rusEFI 2020.09.19.frankenso_na6.3289229786"
|
||||
#define SIGNATURE_DATE 2020.09.20
|
||||
#define SIGNATURE_HASH 4206913641
|
||||
#define TS_SIGNATURE "rusEFI 2020.09.20.frankenso_na6.4206913641"
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@
|
|||
//
|
||||
|
||||
#define SIGNATURE_BOARD kin
|
||||
#define SIGNATURE_DATE 2020.09.19
|
||||
#define SIGNATURE_HASH 2286810213
|
||||
#define TS_SIGNATURE "rusEFI 2020.09.19.kin.2286810213"
|
||||
#define SIGNATURE_DATE 2020.09.20
|
||||
#define SIGNATURE_HASH 3061855702
|
||||
#define TS_SIGNATURE "rusEFI 2020.09.20.kin.3061855702"
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@
|
|||
//
|
||||
|
||||
#define SIGNATURE_BOARD mre_f4
|
||||
#define SIGNATURE_DATE 2020.09.19
|
||||
#define SIGNATURE_HASH 1920166731
|
||||
#define TS_SIGNATURE "rusEFI 2020.09.19.mre_f4.1920166731"
|
||||
#define SIGNATURE_DATE 2020.09.20
|
||||
#define SIGNATURE_HASH 1287564024
|
||||
#define TS_SIGNATURE "rusEFI 2020.09.20.mre_f4.1287564024"
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@
|
|||
//
|
||||
|
||||
#define SIGNATURE_BOARD mre_f7
|
||||
#define SIGNATURE_DATE 2020.09.19
|
||||
#define SIGNATURE_HASH 1920166731
|
||||
#define TS_SIGNATURE "rusEFI 2020.09.19.mre_f7.1920166731"
|
||||
#define SIGNATURE_DATE 2020.09.20
|
||||
#define SIGNATURE_HASH 1287564024
|
||||
#define TS_SIGNATURE "rusEFI 2020.09.20.mre_f7.1287564024"
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@
|
|||
//
|
||||
|
||||
#define SIGNATURE_BOARD prometheus_405
|
||||
#define SIGNATURE_DATE 2020.09.19
|
||||
#define SIGNATURE_HASH 3602458258
|
||||
#define TS_SIGNATURE "rusEFI 2020.09.19.prometheus_405.3602458258"
|
||||
#define SIGNATURE_DATE 2020.09.20
|
||||
#define SIGNATURE_HASH 3899975457
|
||||
#define TS_SIGNATURE "rusEFI 2020.09.20.prometheus_405.3899975457"
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@
|
|||
//
|
||||
|
||||
#define SIGNATURE_BOARD prometheus_469
|
||||
#define SIGNATURE_DATE 2020.09.19
|
||||
#define SIGNATURE_HASH 3602458258
|
||||
#define TS_SIGNATURE "rusEFI 2020.09.19.prometheus_469.3602458258"
|
||||
#define SIGNATURE_DATE 2020.09.20
|
||||
#define SIGNATURE_HASH 3899975457
|
||||
#define TS_SIGNATURE "rusEFI 2020.09.20.prometheus_469.3899975457"
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@
|
|||
//
|
||||
|
||||
#define SIGNATURE_BOARD proteus_f4
|
||||
#define SIGNATURE_DATE 2020.09.19
|
||||
#define SIGNATURE_HASH 2152142065
|
||||
#define TS_SIGNATURE "rusEFI 2020.09.19.proteus_f4.2152142065"
|
||||
#define SIGNATURE_DATE 2020.09.20
|
||||
#define SIGNATURE_HASH 3196769602
|
||||
#define TS_SIGNATURE "rusEFI 2020.09.20.proteus_f4.3196769602"
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@
|
|||
//
|
||||
|
||||
#define SIGNATURE_BOARD proteus_f7
|
||||
#define SIGNATURE_DATE 2020.09.19
|
||||
#define SIGNATURE_HASH 2152142065
|
||||
#define TS_SIGNATURE "rusEFI 2020.09.19.proteus_f7.2152142065"
|
||||
#define SIGNATURE_DATE 2020.09.20
|
||||
#define SIGNATURE_HASH 3196769602
|
||||
#define TS_SIGNATURE "rusEFI 2020.09.20.proteus_f7.3196769602"
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -33,12 +33,12 @@ enable2ndByteCanID = false
|
|||
|
||||
[MegaTune]
|
||||
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
|
||||
signature = "rusEFI 2020.09.19.all.1670828001"
|
||||
signature = "rusEFI 2020.09.20.all.1566248530"
|
||||
|
||||
[TunerStudio]
|
||||
queryCommand = "S"
|
||||
versionInfo = "V" ; firmwave version for title bar.
|
||||
signature = "rusEFI 2020.09.19.all.1670828001" ; signature is expected to be 7 or more characters.
|
||||
signature = "rusEFI 2020.09.20.all.1566248530" ; signature is expected to be 7 or more characters.
|
||||
|
||||
[Constants]
|
||||
; new packet serial format with CRC
|
||||
|
|
@ -74,7 +74,7 @@ enable2ndByteCanID = false
|
|||
|
||||
; see PAGE_0_SIZE in C source code
|
||||
; CONFIG_DEFINITION_START
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 19 21:18:44 UTC 2020
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 20 17:44:24 UTC 2020
|
||||
|
||||
pageSize = 20000
|
||||
page = 1
|
||||
|
|
@ -2730,7 +2730,7 @@ menuDialog = main
|
|||
|
||||
# MAF
|
||||
subMenu = mafSettings, "MAF sensor"
|
||||
subMenu = mafDecodingCurve, "MAF transfer function", 0, {mafAdcChannel != 16 }
|
||||
subMenu = mafDecodingCurve, "MAF transfer function", 0, {mafAdcChannel != 0 }
|
||||
subMenu = std_separator
|
||||
|
||||
# O2 sensor(s)
|
||||
|
|
@ -3147,59 +3147,59 @@ cmd_set_engine_type_default = "Z\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 = "Bias resistor", auxTempSensor1_bias_resistor, {auxTempSensor1_adcChannel != 0}
|
||||
|
||||
field = "#Here is three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", auxTempSensor1_tempC_1, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Resistance @ LT", auxTempSensor1_resistance_1, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Lowest temperature", auxTempSensor1_tempC_1, {auxTempSensor1_adcChannel != 0}
|
||||
field = "Resistance @ LT", auxTempSensor1_resistance_1, {auxTempSensor1_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", auxTempSensor1_tempC_2, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Resistance @ MT", auxTempSensor1_resistance_2, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Middle temperature", auxTempSensor1_tempC_2, {auxTempSensor1_adcChannel != 0}
|
||||
field = "Resistance @ MT", auxTempSensor1_resistance_2, {auxTempSensor1_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", auxTempSensor1_tempC_3, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Resistance @ HT", auxTempSensor1_resistance_3, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Highest temperature", auxTempSensor1_tempC_3, {auxTempSensor1_adcChannel != 0}
|
||||
field = "Resistance @ HT", auxTempSensor1_resistance_3, {auxTempSensor1_adcChannel != 0}
|
||||
|
||||
; 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 = "Bias resistor", auxTempSensor2_bias_resistor, {auxTempSensor2_adcChannel != 0}
|
||||
|
||||
field = "#Here is three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", auxTempSensor2_tempC_1, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Resistance @ LT", auxTempSensor2_resistance_1, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Lowest temperature", auxTempSensor2_tempC_1, {auxTempSensor2_adcChannel != 0}
|
||||
field = "Resistance @ LT", auxTempSensor2_resistance_1, {auxTempSensor2_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", auxTempSensor2_tempC_2, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Resistance @ MT", auxTempSensor2_resistance_2, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Middle temperature", auxTempSensor2_tempC_2, {auxTempSensor2_adcChannel != 0}
|
||||
field = "Resistance @ MT", auxTempSensor2_resistance_2, {auxTempSensor2_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", auxTempSensor2_tempC_3, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Resistance @ HT", auxTempSensor2_resistance_3, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Highest temperature", auxTempSensor2_tempC_3, {auxTempSensor2_adcChannel != 0}
|
||||
field = "Resistance @ HT", auxTempSensor2_resistance_3, {auxTempSensor2_adcChannel != 0}
|
||||
|
||||
dialog = tpsNum1, "Throttle #1"
|
||||
field = "!See Tools>Calibrate TPS"
|
||||
field = "Primary sensor", tps1_1AdcChannel
|
||||
field = "Primary min", tpsMin, {tps1_1AdcChannel != 16}
|
||||
field = "Primary max", tpsMax, {tps1_1AdcChannel != 16}
|
||||
field = "Primary min", tpsMin, {tps1_1AdcChannel != 0}
|
||||
field = "Primary max", tpsMax, {tps1_1AdcChannel != 0}
|
||||
field = "Secondary sensor", tps1_2AdcChannel
|
||||
field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 16}
|
||||
field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 16}
|
||||
commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate, {tps1_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
|
||||
field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0}
|
||||
field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0}
|
||||
commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate, {tps1_2AdcChannel != 0 && throttlePedalPositionAdcChannel != 0}
|
||||
|
||||
dialog = tpsNum2, "Throttle #2"
|
||||
field = "Primary sensor", tps2_1AdcChannel
|
||||
field = "Primary min", tps2Min, {tps2_1AdcChannel != 16}
|
||||
field = "Primary max", tps2Max, {tps2_1AdcChannel != 16}
|
||||
field = "Primary min", tps2Min, {tps2_1AdcChannel != 0}
|
||||
field = "Primary max", tps2Max, {tps2_1AdcChannel != 0}
|
||||
field = "Secondary sensor", tps2_2AdcChannel
|
||||
field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 16}
|
||||
field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 16}
|
||||
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2, {tps2_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
|
||||
field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0}
|
||||
field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0}
|
||||
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2, {tps2_2AdcChannel != 0 && throttlePedalPositionAdcChannel != 0}
|
||||
|
||||
dialog = tpsLimits, "TPS Limits"
|
||||
field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16}
|
||||
field = "TPS maximum valid value", tpsErrorDetectionTooHigh, {tps1_1AdcChannel != 16}
|
||||
field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0}
|
||||
field = "TPS maximum valid value", tpsErrorDetectionTooHigh, {tps1_1AdcChannel != 0}
|
||||
|
||||
dialog = tpsSensor, "TPS"
|
||||
panel = tpsLimits
|
||||
|
|
@ -3509,21 +3509,21 @@ cmd_set_engine_type_default = "Z\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 = "Bias resistor", clt_bias_resistor, {clt_adcChannel != 0}
|
||||
|
||||
field = "#Input three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 16}
|
||||
field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 16}
|
||||
field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 0}
|
||||
field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", clt_tempC_2, {clt_adcChannel != 16}
|
||||
field = "Resistance @ MT", clt_resistance_2, {clt_adcChannel != 16}
|
||||
field = "Middle temperature", clt_tempC_2, {clt_adcChannel != 0}
|
||||
field = "Resistance @ MT", clt_resistance_2, {clt_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", clt_tempC_3, {clt_adcChannel != 16}
|
||||
field = "Resistance @ HT", clt_resistance_3, {clt_adcChannel != 16}
|
||||
field = "Highest temperature", clt_tempC_3, {clt_adcChannel != 0}
|
||||
field = "Resistance @ HT", clt_resistance_3, {clt_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Linear characteristic", useLinearCltSensor, {clt_adcChannel != 16}
|
||||
field = "Linear characteristic", useLinearCltSensor, {clt_adcChannel != 0}
|
||||
|
||||
dialog = cltGauges
|
||||
gauge = CLTGauge
|
||||
|
|
@ -3536,21 +3536,21 @@ cmd_set_engine_type_default = "Z\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 = "Bias resistor", iat_bias_resistor, {iat_adcChannel != 0}
|
||||
|
||||
field = "#Input three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 16}
|
||||
field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 16}
|
||||
field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 0}
|
||||
field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", iat_tempC_2, {iat_adcChannel != 16}
|
||||
field = "Resistance @ MT", iat_resistance_2, {iat_adcChannel != 16}
|
||||
field = "Middle temperature", iat_tempC_2, {iat_adcChannel != 0}
|
||||
field = "Resistance @ MT", iat_resistance_2, {iat_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", iat_tempC_3, {iat_adcChannel != 16}
|
||||
field = "Resistance @ HT", iat_resistance_3, {iat_adcChannel != 16}
|
||||
field = "Highest temperature", iat_tempC_3, {iat_adcChannel != 0}
|
||||
field = "Resistance @ HT", iat_resistance_3, {iat_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Linear characteristic", useLinearIatSensor, {iat_adcChannel != 16}
|
||||
field = "Linear characteristic", useLinearIatSensor, {iat_adcChannel != 0}
|
||||
|
||||
dialog = iatGauges
|
||||
gauge = IATGauge
|
||||
|
|
@ -3563,10 +3563,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
; Sensors->Oil pressure sensor
|
||||
dialog = oilp_settings, "Oil Pressure Sensor"
|
||||
field = "Oil Pressure ADC input", oilPressure_hwChannel
|
||||
field = "low voltage", oilPressure_v1, {oilPressure_hwChannel != 16}
|
||||
field = "low pressure", oilPressure_value1, {oilPressure_hwChannel != 16}
|
||||
field = "high voltage", oilPressure_v2, {oilPressure_hwChannel != 16}
|
||||
field = "high pressure", oilPressure_value2, {oilPressure_hwChannel != 16}
|
||||
field = "low voltage", oilPressure_v1, {oilPressure_hwChannel != 0}
|
||||
field = "low pressure", oilPressure_value1, {oilPressure_hwChannel != 0}
|
||||
field = "high voltage", oilPressure_v2, {oilPressure_hwChannel != 0}
|
||||
field = "high pressure", oilPressure_value2, {oilPressure_hwChannel != 0}
|
||||
|
||||
dialog = oilPressureGauges
|
||||
gauge = OilPressGauge
|
||||
|
|
@ -3579,11 +3579,11 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
; Sensors->MAP sensor
|
||||
dialog = mapSensorAnalog, "MAP sensor", yAxis
|
||||
field = "MAP ADC input", map_sensor_hwChannel
|
||||
field = "MAP type", map_sensor_type, { map_sensor_hwChannel != 16 }
|
||||
field = "MAP value low point", map_sensor_lowValue, { map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP voltage low point", mapLowValueVoltage, { map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP value high point", map_sensor_highValue,{ map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP voltage high value", mapHighValueVoltage, { map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP type", map_sensor_type, { map_sensor_hwChannel != 0 }
|
||||
field = "MAP value low point", map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
field = "MAP voltage low point", mapLowValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
field = "MAP value high point", map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
field = "MAP voltage high value", mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
|
||||
dialog = mapSensorFreq, "MAP frequency sensor", yAxis
|
||||
field = "MAP Freq", frequencyReportingMapInputPin
|
||||
|
|
@ -3605,9 +3605,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
|
||||
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}
|
||||
field = baroSensor_lowValue, baroSensor_lowValue, {baroSensor_hwChannel != 0}
|
||||
field = baroSensor_highValue, baroSensor_highValue, {baroSensor_hwChannel != 0}
|
||||
field = baroSensor_type, baroSensor_type, {baroSensor_hwChannel != 0}
|
||||
|
||||
dialog = mapCurves, "MAP sampling", yAxis
|
||||
field = "isMapAveragingEnabled", isMapAveragingEnabled
|
||||
|
|
@ -3633,7 +3633,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
|
||||
dialog = egoSettings, "", yAxis
|
||||
panel = egoSettings_IO
|
||||
panel = egoSettings_sensor, {afr_hwChannel != 16 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
|
||||
panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
|
||||
field = "Enable AEM X-Series CANbus", enableAemXSeries, { canReadEnabled }
|
||||
field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
|
||||
|
||||
|
|
@ -3718,7 +3718,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
dialog = idleSettings, "", yAxis
|
||||
field = "Idle IAC control mode", idleMode
|
||||
field = useInstantRpmForIdle, useInstantRpmForIdle
|
||||
field = "use ETB for idle", useETBforIdleControl, { throttlePedalPositionAdcChannel != 16 }
|
||||
field = "use ETB for idle", useETBforIdleControl, { throttlePedalPositionAdcChannel != 0 }
|
||||
field = "ETB Idle range", etbIdleThrottleRange, {useETBforIdleControl == 1}
|
||||
field = "Use separate Ignition Table for idle", useSeparateAdvanceForIdle
|
||||
field = "Use separate VE Table for idle", useSeparateVeForIdle
|
||||
|
|
@ -4381,12 +4381,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
|
||||
dialog = etbDialogLeft
|
||||
field = "https://rusefi.com/s/etb"
|
||||
field = "Late 90s German DC Motor idle", dcMotorIdleValve, { throttlePedalPositionAdcChannel == 16 }
|
||||
field = "Late 90s German DC Motor idle", dcMotorIdleValve, { throttlePedalPositionAdcChannel == 0 }
|
||||
field = "Detailed status in console", isVerboseETB
|
||||
field = "Disable ETB Motor", pauseEtbControl
|
||||
; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility
|
||||
; criteria for the same panel when used in multiple places
|
||||
panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 16 || (useStepperIdle && useHbridges) || dcMotorIdleValve }
|
||||
panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridges) || dcMotorIdleValve }
|
||||
|
||||
dialog = etbAutotune, "PID Autotune"
|
||||
field = "First step: calibrate TPS and hit 'Burn'"
|
||||
|
|
@ -4401,8 +4401,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
field = "Debug mode", debugMode
|
||||
|
||||
dialog = etbDialogRight
|
||||
panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 16 }
|
||||
panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 16) || dcMotorIdleValve }
|
||||
panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 }
|
||||
panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || dcMotorIdleValve }
|
||||
panel = etbAutotune
|
||||
|
||||
; Neutral position handling not yet implemented!
|
||||
|
|
|
|||
|
|
@ -33,12 +33,12 @@ enable2ndByteCanID = false
|
|||
|
||||
[MegaTune]
|
||||
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
|
||||
signature = "rusEFI 2020.09.19.frankenso_na6.3289229786"
|
||||
signature = "rusEFI 2020.09.20.frankenso_na6.4206913641"
|
||||
|
||||
[TunerStudio]
|
||||
queryCommand = "S"
|
||||
versionInfo = "V" ; firmwave version for title bar.
|
||||
signature = "rusEFI 2020.09.19.frankenso_na6.3289229786" ; signature is expected to be 7 or more characters.
|
||||
signature = "rusEFI 2020.09.20.frankenso_na6.4206913641" ; signature is expected to be 7 or more characters.
|
||||
|
||||
[Constants]
|
||||
; new packet serial format with CRC
|
||||
|
|
@ -74,7 +74,7 @@ enable2ndByteCanID = false
|
|||
|
||||
; see PAGE_0_SIZE in C source code
|
||||
; CONFIG_DEFINITION_START
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 19 21:18:50 UTC 2020
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 20 17:44:34 UTC 2020
|
||||
|
||||
pageSize = 20000
|
||||
page = 1
|
||||
|
|
@ -2730,7 +2730,7 @@ menuDialog = main
|
|||
|
||||
# MAF
|
||||
subMenu = mafSettings, "MAF sensor"
|
||||
subMenu = mafDecodingCurve, "MAF transfer function", 0, {mafAdcChannel != 16 }
|
||||
subMenu = mafDecodingCurve, "MAF transfer function", 0, {mafAdcChannel != 0 }
|
||||
subMenu = std_separator
|
||||
|
||||
# O2 sensor(s)
|
||||
|
|
@ -3147,59 +3147,59 @@ cmd_set_engine_type_default = "Z\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 = "Bias resistor", auxTempSensor1_bias_resistor, {auxTempSensor1_adcChannel != 0}
|
||||
|
||||
field = "#Here is three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", auxTempSensor1_tempC_1, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Resistance @ LT", auxTempSensor1_resistance_1, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Lowest temperature", auxTempSensor1_tempC_1, {auxTempSensor1_adcChannel != 0}
|
||||
field = "Resistance @ LT", auxTempSensor1_resistance_1, {auxTempSensor1_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", auxTempSensor1_tempC_2, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Resistance @ MT", auxTempSensor1_resistance_2, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Middle temperature", auxTempSensor1_tempC_2, {auxTempSensor1_adcChannel != 0}
|
||||
field = "Resistance @ MT", auxTempSensor1_resistance_2, {auxTempSensor1_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", auxTempSensor1_tempC_3, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Resistance @ HT", auxTempSensor1_resistance_3, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Highest temperature", auxTempSensor1_tempC_3, {auxTempSensor1_adcChannel != 0}
|
||||
field = "Resistance @ HT", auxTempSensor1_resistance_3, {auxTempSensor1_adcChannel != 0}
|
||||
|
||||
; 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 = "Bias resistor", auxTempSensor2_bias_resistor, {auxTempSensor2_adcChannel != 0}
|
||||
|
||||
field = "#Here is three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", auxTempSensor2_tempC_1, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Resistance @ LT", auxTempSensor2_resistance_1, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Lowest temperature", auxTempSensor2_tempC_1, {auxTempSensor2_adcChannel != 0}
|
||||
field = "Resistance @ LT", auxTempSensor2_resistance_1, {auxTempSensor2_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", auxTempSensor2_tempC_2, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Resistance @ MT", auxTempSensor2_resistance_2, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Middle temperature", auxTempSensor2_tempC_2, {auxTempSensor2_adcChannel != 0}
|
||||
field = "Resistance @ MT", auxTempSensor2_resistance_2, {auxTempSensor2_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", auxTempSensor2_tempC_3, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Resistance @ HT", auxTempSensor2_resistance_3, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Highest temperature", auxTempSensor2_tempC_3, {auxTempSensor2_adcChannel != 0}
|
||||
field = "Resistance @ HT", auxTempSensor2_resistance_3, {auxTempSensor2_adcChannel != 0}
|
||||
|
||||
dialog = tpsNum1, "Throttle #1"
|
||||
field = "!See Tools>Calibrate TPS"
|
||||
field = "Primary sensor", tps1_1AdcChannel
|
||||
field = "Primary min", tpsMin, {tps1_1AdcChannel != 16}
|
||||
field = "Primary max", tpsMax, {tps1_1AdcChannel != 16}
|
||||
field = "Primary min", tpsMin, {tps1_1AdcChannel != 0}
|
||||
field = "Primary max", tpsMax, {tps1_1AdcChannel != 0}
|
||||
field = "Secondary sensor", tps1_2AdcChannel
|
||||
field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 16}
|
||||
field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 16}
|
||||
commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate, {tps1_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
|
||||
field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0}
|
||||
field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0}
|
||||
commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate, {tps1_2AdcChannel != 0 && throttlePedalPositionAdcChannel != 0}
|
||||
|
||||
dialog = tpsNum2, "Throttle #2"
|
||||
field = "Primary sensor", tps2_1AdcChannel
|
||||
field = "Primary min", tps2Min, {tps2_1AdcChannel != 16}
|
||||
field = "Primary max", tps2Max, {tps2_1AdcChannel != 16}
|
||||
field = "Primary min", tps2Min, {tps2_1AdcChannel != 0}
|
||||
field = "Primary max", tps2Max, {tps2_1AdcChannel != 0}
|
||||
field = "Secondary sensor", tps2_2AdcChannel
|
||||
field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 16}
|
||||
field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 16}
|
||||
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2, {tps2_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
|
||||
field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0}
|
||||
field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0}
|
||||
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2, {tps2_2AdcChannel != 0 && throttlePedalPositionAdcChannel != 0}
|
||||
|
||||
dialog = tpsLimits, "TPS Limits"
|
||||
field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16}
|
||||
field = "TPS maximum valid value", tpsErrorDetectionTooHigh, {tps1_1AdcChannel != 16}
|
||||
field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0}
|
||||
field = "TPS maximum valid value", tpsErrorDetectionTooHigh, {tps1_1AdcChannel != 0}
|
||||
|
||||
dialog = tpsSensor, "TPS"
|
||||
panel = tpsLimits
|
||||
|
|
@ -3509,21 +3509,21 @@ cmd_set_engine_type_default = "Z\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 = "Bias resistor", clt_bias_resistor, {clt_adcChannel != 0}
|
||||
|
||||
field = "#Input three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 16}
|
||||
field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 16}
|
||||
field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 0}
|
||||
field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", clt_tempC_2, {clt_adcChannel != 16}
|
||||
field = "Resistance @ MT", clt_resistance_2, {clt_adcChannel != 16}
|
||||
field = "Middle temperature", clt_tempC_2, {clt_adcChannel != 0}
|
||||
field = "Resistance @ MT", clt_resistance_2, {clt_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", clt_tempC_3, {clt_adcChannel != 16}
|
||||
field = "Resistance @ HT", clt_resistance_3, {clt_adcChannel != 16}
|
||||
field = "Highest temperature", clt_tempC_3, {clt_adcChannel != 0}
|
||||
field = "Resistance @ HT", clt_resistance_3, {clt_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Linear characteristic", useLinearCltSensor, {clt_adcChannel != 16}
|
||||
field = "Linear characteristic", useLinearCltSensor, {clt_adcChannel != 0}
|
||||
|
||||
dialog = cltGauges
|
||||
gauge = CLTGauge
|
||||
|
|
@ -3536,21 +3536,21 @@ cmd_set_engine_type_default = "Z\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 = "Bias resistor", iat_bias_resistor, {iat_adcChannel != 0}
|
||||
|
||||
field = "#Input three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 16}
|
||||
field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 16}
|
||||
field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 0}
|
||||
field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", iat_tempC_2, {iat_adcChannel != 16}
|
||||
field = "Resistance @ MT", iat_resistance_2, {iat_adcChannel != 16}
|
||||
field = "Middle temperature", iat_tempC_2, {iat_adcChannel != 0}
|
||||
field = "Resistance @ MT", iat_resistance_2, {iat_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", iat_tempC_3, {iat_adcChannel != 16}
|
||||
field = "Resistance @ HT", iat_resistance_3, {iat_adcChannel != 16}
|
||||
field = "Highest temperature", iat_tempC_3, {iat_adcChannel != 0}
|
||||
field = "Resistance @ HT", iat_resistance_3, {iat_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Linear characteristic", useLinearIatSensor, {iat_adcChannel != 16}
|
||||
field = "Linear characteristic", useLinearIatSensor, {iat_adcChannel != 0}
|
||||
|
||||
dialog = iatGauges
|
||||
gauge = IATGauge
|
||||
|
|
@ -3563,10 +3563,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
; Sensors->Oil pressure sensor
|
||||
dialog = oilp_settings, "Oil Pressure Sensor"
|
||||
field = "Oil Pressure ADC input", oilPressure_hwChannel
|
||||
field = "low voltage", oilPressure_v1, {oilPressure_hwChannel != 16}
|
||||
field = "low pressure", oilPressure_value1, {oilPressure_hwChannel != 16}
|
||||
field = "high voltage", oilPressure_v2, {oilPressure_hwChannel != 16}
|
||||
field = "high pressure", oilPressure_value2, {oilPressure_hwChannel != 16}
|
||||
field = "low voltage", oilPressure_v1, {oilPressure_hwChannel != 0}
|
||||
field = "low pressure", oilPressure_value1, {oilPressure_hwChannel != 0}
|
||||
field = "high voltage", oilPressure_v2, {oilPressure_hwChannel != 0}
|
||||
field = "high pressure", oilPressure_value2, {oilPressure_hwChannel != 0}
|
||||
|
||||
dialog = oilPressureGauges
|
||||
gauge = OilPressGauge
|
||||
|
|
@ -3579,11 +3579,11 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
; Sensors->MAP sensor
|
||||
dialog = mapSensorAnalog, "MAP sensor", yAxis
|
||||
field = "MAP ADC input", map_sensor_hwChannel
|
||||
field = "MAP type", map_sensor_type, { map_sensor_hwChannel != 16 }
|
||||
field = "MAP value low point", map_sensor_lowValue, { map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP voltage low point", mapLowValueVoltage, { map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP value high point", map_sensor_highValue,{ map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP voltage high value", mapHighValueVoltage, { map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP type", map_sensor_type, { map_sensor_hwChannel != 0 }
|
||||
field = "MAP value low point", map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
field = "MAP voltage low point", mapLowValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
field = "MAP value high point", map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
field = "MAP voltage high value", mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
|
||||
dialog = mapSensorFreq, "MAP frequency sensor", yAxis
|
||||
field = "MAP Freq", frequencyReportingMapInputPin
|
||||
|
|
@ -3605,9 +3605,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
|
||||
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}
|
||||
field = baroSensor_lowValue, baroSensor_lowValue, {baroSensor_hwChannel != 0}
|
||||
field = baroSensor_highValue, baroSensor_highValue, {baroSensor_hwChannel != 0}
|
||||
field = baroSensor_type, baroSensor_type, {baroSensor_hwChannel != 0}
|
||||
|
||||
dialog = mapCurves, "MAP sampling", yAxis
|
||||
field = "isMapAveragingEnabled", isMapAveragingEnabled
|
||||
|
|
@ -3633,7 +3633,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
|
||||
dialog = egoSettings, "", yAxis
|
||||
panel = egoSettings_IO
|
||||
panel = egoSettings_sensor, {afr_hwChannel != 16 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
|
||||
panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
|
||||
field = "Enable AEM X-Series CANbus", enableAemXSeries, { canReadEnabled }
|
||||
field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
|
||||
|
||||
|
|
@ -3718,7 +3718,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
dialog = idleSettings, "", yAxis
|
||||
field = "Idle IAC control mode", idleMode
|
||||
field = useInstantRpmForIdle, useInstantRpmForIdle
|
||||
field = "use ETB for idle", useETBforIdleControl, { throttlePedalPositionAdcChannel != 16 }
|
||||
field = "use ETB for idle", useETBforIdleControl, { throttlePedalPositionAdcChannel != 0 }
|
||||
field = "ETB Idle range", etbIdleThrottleRange, {useETBforIdleControl == 1}
|
||||
field = "Use separate Ignition Table for idle", useSeparateAdvanceForIdle
|
||||
field = "Use separate VE Table for idle", useSeparateVeForIdle
|
||||
|
|
@ -4381,12 +4381,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
|
||||
dialog = etbDialogLeft
|
||||
field = "https://rusefi.com/s/etb"
|
||||
field = "Late 90s German DC Motor idle", dcMotorIdleValve, { throttlePedalPositionAdcChannel == 16 }
|
||||
field = "Late 90s German DC Motor idle", dcMotorIdleValve, { throttlePedalPositionAdcChannel == 0 }
|
||||
field = "Detailed status in console", isVerboseETB
|
||||
field = "Disable ETB Motor", pauseEtbControl
|
||||
; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility
|
||||
; criteria for the same panel when used in multiple places
|
||||
panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 16 || (useStepperIdle && useHbridges) || dcMotorIdleValve }
|
||||
panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridges) || dcMotorIdleValve }
|
||||
|
||||
dialog = etbAutotune, "PID Autotune"
|
||||
field = "First step: calibrate TPS and hit 'Burn'"
|
||||
|
|
@ -4401,8 +4401,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
field = "Debug mode", debugMode
|
||||
|
||||
dialog = etbDialogRight
|
||||
panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 16 }
|
||||
panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 16) || dcMotorIdleValve }
|
||||
panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 }
|
||||
panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || dcMotorIdleValve }
|
||||
panel = etbAutotune
|
||||
|
||||
; Neutral position handling not yet implemented!
|
||||
|
|
|
|||
|
|
@ -33,12 +33,12 @@ enable2ndByteCanID = false
|
|||
|
||||
[MegaTune]
|
||||
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
|
||||
signature = "rusEFI 2020.09.19.kin.2286810213"
|
||||
signature = "rusEFI 2020.09.20.kin.3061855702"
|
||||
|
||||
[TunerStudio]
|
||||
queryCommand = "S"
|
||||
versionInfo = "V" ; firmwave version for title bar.
|
||||
signature = "rusEFI 2020.09.19.kin.2286810213" ; signature is expected to be 7 or more characters.
|
||||
signature = "rusEFI 2020.09.20.kin.3061855702" ; signature is expected to be 7 or more characters.
|
||||
|
||||
[Constants]
|
||||
; new packet serial format with CRC
|
||||
|
|
@ -74,7 +74,7 @@ enable2ndByteCanID = false
|
|||
|
||||
; see PAGE_0_SIZE in C source code
|
||||
; CONFIG_DEFINITION_START
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Sep 19 21:19:02 UTC 2020
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Sep 20 17:44:42 UTC 2020
|
||||
|
||||
pageSize = 20000
|
||||
page = 1
|
||||
|
|
@ -2730,7 +2730,7 @@ menuDialog = main
|
|||
|
||||
# MAF
|
||||
subMenu = mafSettings, "MAF sensor"
|
||||
subMenu = mafDecodingCurve, "MAF transfer function", 0, {mafAdcChannel != 16 }
|
||||
subMenu = mafDecodingCurve, "MAF transfer function", 0, {mafAdcChannel != 0 }
|
||||
subMenu = std_separator
|
||||
|
||||
# O2 sensor(s)
|
||||
|
|
@ -3148,59 +3148,59 @@ cmd_set_engine_type_default = "Z\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 = "Bias resistor", auxTempSensor1_bias_resistor, {auxTempSensor1_adcChannel != 0}
|
||||
|
||||
field = "#Here is three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", auxTempSensor1_tempC_1, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Resistance @ LT", auxTempSensor1_resistance_1, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Lowest temperature", auxTempSensor1_tempC_1, {auxTempSensor1_adcChannel != 0}
|
||||
field = "Resistance @ LT", auxTempSensor1_resistance_1, {auxTempSensor1_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", auxTempSensor1_tempC_2, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Resistance @ MT", auxTempSensor1_resistance_2, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Middle temperature", auxTempSensor1_tempC_2, {auxTempSensor1_adcChannel != 0}
|
||||
field = "Resistance @ MT", auxTempSensor1_resistance_2, {auxTempSensor1_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", auxTempSensor1_tempC_3, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Resistance @ HT", auxTempSensor1_resistance_3, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Highest temperature", auxTempSensor1_tempC_3, {auxTempSensor1_adcChannel != 0}
|
||||
field = "Resistance @ HT", auxTempSensor1_resistance_3, {auxTempSensor1_adcChannel != 0}
|
||||
|
||||
; 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 = "Bias resistor", auxTempSensor2_bias_resistor, {auxTempSensor2_adcChannel != 0}
|
||||
|
||||
field = "#Here is three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", auxTempSensor2_tempC_1, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Resistance @ LT", auxTempSensor2_resistance_1, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Lowest temperature", auxTempSensor2_tempC_1, {auxTempSensor2_adcChannel != 0}
|
||||
field = "Resistance @ LT", auxTempSensor2_resistance_1, {auxTempSensor2_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", auxTempSensor2_tempC_2, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Resistance @ MT", auxTempSensor2_resistance_2, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Middle temperature", auxTempSensor2_tempC_2, {auxTempSensor2_adcChannel != 0}
|
||||
field = "Resistance @ MT", auxTempSensor2_resistance_2, {auxTempSensor2_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", auxTempSensor2_tempC_3, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Resistance @ HT", auxTempSensor2_resistance_3, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Highest temperature", auxTempSensor2_tempC_3, {auxTempSensor2_adcChannel != 0}
|
||||
field = "Resistance @ HT", auxTempSensor2_resistance_3, {auxTempSensor2_adcChannel != 0}
|
||||
|
||||
dialog = tpsNum1, "Throttle #1"
|
||||
field = "!See Tools>Calibrate TPS"
|
||||
field = "Primary sensor", tps1_1AdcChannel
|
||||
field = "Primary min", tpsMin, {tps1_1AdcChannel != 16}
|
||||
field = "Primary max", tpsMax, {tps1_1AdcChannel != 16}
|
||||
field = "Primary min", tpsMin, {tps1_1AdcChannel != 0}
|
||||
field = "Primary max", tpsMax, {tps1_1AdcChannel != 0}
|
||||
field = "Secondary sensor", tps1_2AdcChannel
|
||||
field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 16}
|
||||
field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 16}
|
||||
commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate, {tps1_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
|
||||
field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0}
|
||||
field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0}
|
||||
commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate, {tps1_2AdcChannel != 0 && throttlePedalPositionAdcChannel != 0}
|
||||
|
||||
dialog = tpsNum2, "Throttle #2"
|
||||
field = "Primary sensor", tps2_1AdcChannel
|
||||
field = "Primary min", tps2Min, {tps2_1AdcChannel != 16}
|
||||
field = "Primary max", tps2Max, {tps2_1AdcChannel != 16}
|
||||
field = "Primary min", tps2Min, {tps2_1AdcChannel != 0}
|
||||
field = "Primary max", tps2Max, {tps2_1AdcChannel != 0}
|
||||
field = "Secondary sensor", tps2_2AdcChannel
|
||||
field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 16}
|
||||
field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 16}
|
||||
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2, {tps2_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
|
||||
field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0}
|
||||
field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0}
|
||||
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2, {tps2_2AdcChannel != 0 && throttlePedalPositionAdcChannel != 0}
|
||||
|
||||
dialog = tpsLimits, "TPS Limits"
|
||||
field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16}
|
||||
field = "TPS maximum valid value", tpsErrorDetectionTooHigh, {tps1_1AdcChannel != 16}
|
||||
field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0}
|
||||
field = "TPS maximum valid value", tpsErrorDetectionTooHigh, {tps1_1AdcChannel != 0}
|
||||
|
||||
dialog = tpsSensor, "TPS"
|
||||
panel = tpsLimits
|
||||
|
|
@ -3510,21 +3510,21 @@ cmd_set_engine_type_default = "Z\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 = "Bias resistor", clt_bias_resistor, {clt_adcChannel != 0}
|
||||
|
||||
field = "#Input three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 16}
|
||||
field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 16}
|
||||
field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 0}
|
||||
field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", clt_tempC_2, {clt_adcChannel != 16}
|
||||
field = "Resistance @ MT", clt_resistance_2, {clt_adcChannel != 16}
|
||||
field = "Middle temperature", clt_tempC_2, {clt_adcChannel != 0}
|
||||
field = "Resistance @ MT", clt_resistance_2, {clt_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", clt_tempC_3, {clt_adcChannel != 16}
|
||||
field = "Resistance @ HT", clt_resistance_3, {clt_adcChannel != 16}
|
||||
field = "Highest temperature", clt_tempC_3, {clt_adcChannel != 0}
|
||||
field = "Resistance @ HT", clt_resistance_3, {clt_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Linear characteristic", useLinearCltSensor, {clt_adcChannel != 16}
|
||||
field = "Linear characteristic", useLinearCltSensor, {clt_adcChannel != 0}
|
||||
|
||||
dialog = cltGauges
|
||||
gauge = CLTGauge
|
||||
|
|
@ -3537,21 +3537,21 @@ cmd_set_engine_type_default = "Z\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 = "Bias resistor", iat_bias_resistor, {iat_adcChannel != 0}
|
||||
|
||||
field = "#Input three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 16}
|
||||
field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 16}
|
||||
field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 0}
|
||||
field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", iat_tempC_2, {iat_adcChannel != 16}
|
||||
field = "Resistance @ MT", iat_resistance_2, {iat_adcChannel != 16}
|
||||
field = "Middle temperature", iat_tempC_2, {iat_adcChannel != 0}
|
||||
field = "Resistance @ MT", iat_resistance_2, {iat_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", iat_tempC_3, {iat_adcChannel != 16}
|
||||
field = "Resistance @ HT", iat_resistance_3, {iat_adcChannel != 16}
|
||||
field = "Highest temperature", iat_tempC_3, {iat_adcChannel != 0}
|
||||
field = "Resistance @ HT", iat_resistance_3, {iat_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Linear characteristic", useLinearIatSensor, {iat_adcChannel != 16}
|
||||
field = "Linear characteristic", useLinearIatSensor, {iat_adcChannel != 0}
|
||||
|
||||
dialog = iatGauges
|
||||
gauge = IATGauge
|
||||
|
|
@ -3564,10 +3564,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
; Sensors->Oil pressure sensor
|
||||
dialog = oilp_settings, "Oil Pressure Sensor"
|
||||
field = "Oil Pressure ADC input", oilPressure_hwChannel
|
||||
field = "low voltage", oilPressure_v1, {oilPressure_hwChannel != 16}
|
||||
field = "low pressure", oilPressure_value1, {oilPressure_hwChannel != 16}
|
||||
field = "high voltage", oilPressure_v2, {oilPressure_hwChannel != 16}
|
||||
field = "high pressure", oilPressure_value2, {oilPressure_hwChannel != 16}
|
||||
field = "low voltage", oilPressure_v1, {oilPressure_hwChannel != 0}
|
||||
field = "low pressure", oilPressure_value1, {oilPressure_hwChannel != 0}
|
||||
field = "high voltage", oilPressure_v2, {oilPressure_hwChannel != 0}
|
||||
field = "high pressure", oilPressure_value2, {oilPressure_hwChannel != 0}
|
||||
|
||||
dialog = oilPressureGauges
|
||||
gauge = OilPressGauge
|
||||
|
|
@ -3580,11 +3580,11 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
; Sensors->MAP sensor
|
||||
dialog = mapSensorAnalog, "MAP sensor", yAxis
|
||||
field = "MAP ADC input", map_sensor_hwChannel
|
||||
field = "MAP type", map_sensor_type, { map_sensor_hwChannel != 16 }
|
||||
field = "MAP value low point", map_sensor_lowValue, { map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP voltage low point", mapLowValueVoltage, { map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP value high point", map_sensor_highValue,{ map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP voltage high value", mapHighValueVoltage, { map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP type", map_sensor_type, { map_sensor_hwChannel != 0 }
|
||||
field = "MAP value low point", map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
field = "MAP voltage low point", mapLowValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
field = "MAP value high point", map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
field = "MAP voltage high value", mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
|
||||
dialog = mapSensorFreq, "MAP frequency sensor", yAxis
|
||||
field = "MAP Freq", frequencyReportingMapInputPin
|
||||
|
|
@ -3606,9 +3606,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
|
||||
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}
|
||||
field = baroSensor_lowValue, baroSensor_lowValue, {baroSensor_hwChannel != 0}
|
||||
field = baroSensor_highValue, baroSensor_highValue, {baroSensor_hwChannel != 0}
|
||||
field = baroSensor_type, baroSensor_type, {baroSensor_hwChannel != 0}
|
||||
|
||||
dialog = mapCurves, "MAP sampling", yAxis
|
||||
field = "isMapAveragingEnabled", isMapAveragingEnabled
|
||||
|
|
@ -3634,7 +3634,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
|
||||
dialog = egoSettings, "", yAxis
|
||||
panel = egoSettings_IO
|
||||
panel = egoSettings_sensor, {afr_hwChannel != 16 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
|
||||
panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
|
||||
field = "Enable AEM X-Series CANbus", enableAemXSeries, { canReadEnabled }
|
||||
field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
|
||||
|
||||
|
|
@ -3719,7 +3719,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
dialog = idleSettings, "", yAxis
|
||||
field = "Idle IAC control mode", idleMode
|
||||
field = useInstantRpmForIdle, useInstantRpmForIdle
|
||||
field = "use ETB for idle", useETBforIdleControl, { throttlePedalPositionAdcChannel != 16 }
|
||||
field = "use ETB for idle", useETBforIdleControl, { throttlePedalPositionAdcChannel != 0 }
|
||||
field = "ETB Idle range", etbIdleThrottleRange, {useETBforIdleControl == 1}
|
||||
field = "Use separate Ignition Table for idle", useSeparateAdvanceForIdle
|
||||
field = "Use separate VE Table for idle", useSeparateVeForIdle
|
||||
|
|
@ -4382,12 +4382,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
|
||||
dialog = etbDialogLeft
|
||||
field = "https://rusefi.com/s/etb"
|
||||
field = "Late 90s German DC Motor idle", dcMotorIdleValve, { throttlePedalPositionAdcChannel == 16 }
|
||||
field = "Late 90s German DC Motor idle", dcMotorIdleValve, { throttlePedalPositionAdcChannel == 0 }
|
||||
field = "Detailed status in console", isVerboseETB
|
||||
field = "Disable ETB Motor", pauseEtbControl
|
||||
; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility
|
||||
; criteria for the same panel when used in multiple places
|
||||
panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 16 || (useStepperIdle && useHbridges) || dcMotorIdleValve }
|
||||
panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridges) || dcMotorIdleValve }
|
||||
|
||||
dialog = etbAutotune, "PID Autotune"
|
||||
field = "First step: calibrate TPS and hit 'Burn'"
|
||||
|
|
@ -4402,8 +4402,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
field = "Debug mode", debugMode
|
||||
|
||||
dialog = etbDialogRight
|
||||
panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 16 }
|
||||
panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 16) || dcMotorIdleValve }
|
||||
panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 }
|
||||
panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || dcMotorIdleValve }
|
||||
panel = etbAutotune
|
||||
|
||||
; Neutral position handling not yet implemented!
|
||||
|
|
|
|||
|
|
@ -33,12 +33,12 @@ enable2ndByteCanID = false
|
|||
|
||||
[MegaTune]
|
||||
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
|
||||
signature = "rusEFI 2020.09.19.mre_f4.1920166731"
|
||||
signature = "rusEFI 2020.09.20.mre_f4.1287564024"
|
||||
|
||||
[TunerStudio]
|
||||
queryCommand = "S"
|
||||
versionInfo = "V" ; firmwave version for title bar.
|
||||
signature = "rusEFI 2020.09.19.mre_f4.1920166731" ; signature is expected to be 7 or more characters.
|
||||
signature = "rusEFI 2020.09.20.mre_f4.1287564024" ; signature is expected to be 7 or more characters.
|
||||
|
||||
[Constants]
|
||||
; new packet serial format with CRC
|
||||
|
|
@ -74,7 +74,7 @@ enable2ndByteCanID = false
|
|||
|
||||
; see PAGE_0_SIZE in C source code
|
||||
; CONFIG_DEFINITION_START
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 19 21:18:48 UTC 2020
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 20 17:44:31 UTC 2020
|
||||
|
||||
pageSize = 20000
|
||||
page = 1
|
||||
|
|
@ -2730,7 +2730,7 @@ menuDialog = main
|
|||
|
||||
# MAF
|
||||
subMenu = mafSettings, "MAF sensor"
|
||||
subMenu = mafDecodingCurve, "MAF transfer function", 0, {mafAdcChannel != 16 }
|
||||
subMenu = mafDecodingCurve, "MAF transfer function", 0, {mafAdcChannel != 0 }
|
||||
subMenu = std_separator
|
||||
|
||||
# O2 sensor(s)
|
||||
|
|
@ -3142,59 +3142,59 @@ cmd_set_engine_type_default = "Z\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 = "Bias resistor", auxTempSensor1_bias_resistor, {auxTempSensor1_adcChannel != 0}
|
||||
|
||||
field = "#Here is three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", auxTempSensor1_tempC_1, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Resistance @ LT", auxTempSensor1_resistance_1, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Lowest temperature", auxTempSensor1_tempC_1, {auxTempSensor1_adcChannel != 0}
|
||||
field = "Resistance @ LT", auxTempSensor1_resistance_1, {auxTempSensor1_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", auxTempSensor1_tempC_2, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Resistance @ MT", auxTempSensor1_resistance_2, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Middle temperature", auxTempSensor1_tempC_2, {auxTempSensor1_adcChannel != 0}
|
||||
field = "Resistance @ MT", auxTempSensor1_resistance_2, {auxTempSensor1_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", auxTempSensor1_tempC_3, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Resistance @ HT", auxTempSensor1_resistance_3, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Highest temperature", auxTempSensor1_tempC_3, {auxTempSensor1_adcChannel != 0}
|
||||
field = "Resistance @ HT", auxTempSensor1_resistance_3, {auxTempSensor1_adcChannel != 0}
|
||||
|
||||
; 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 = "Bias resistor", auxTempSensor2_bias_resistor, {auxTempSensor2_adcChannel != 0}
|
||||
|
||||
field = "#Here is three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", auxTempSensor2_tempC_1, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Resistance @ LT", auxTempSensor2_resistance_1, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Lowest temperature", auxTempSensor2_tempC_1, {auxTempSensor2_adcChannel != 0}
|
||||
field = "Resistance @ LT", auxTempSensor2_resistance_1, {auxTempSensor2_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", auxTempSensor2_tempC_2, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Resistance @ MT", auxTempSensor2_resistance_2, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Middle temperature", auxTempSensor2_tempC_2, {auxTempSensor2_adcChannel != 0}
|
||||
field = "Resistance @ MT", auxTempSensor2_resistance_2, {auxTempSensor2_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", auxTempSensor2_tempC_3, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Resistance @ HT", auxTempSensor2_resistance_3, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Highest temperature", auxTempSensor2_tempC_3, {auxTempSensor2_adcChannel != 0}
|
||||
field = "Resistance @ HT", auxTempSensor2_resistance_3, {auxTempSensor2_adcChannel != 0}
|
||||
|
||||
dialog = tpsNum1, "Throttle #1"
|
||||
field = "!See Tools>Calibrate TPS"
|
||||
field = "Primary sensor", tps1_1AdcChannel
|
||||
field = "Primary min", tpsMin, {tps1_1AdcChannel != 16}
|
||||
field = "Primary max", tpsMax, {tps1_1AdcChannel != 16}
|
||||
field = "Primary min", tpsMin, {tps1_1AdcChannel != 0}
|
||||
field = "Primary max", tpsMax, {tps1_1AdcChannel != 0}
|
||||
field = "Secondary sensor", tps1_2AdcChannel
|
||||
field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 16}
|
||||
field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 16}
|
||||
commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate, {tps1_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
|
||||
field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0}
|
||||
field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0}
|
||||
commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate, {tps1_2AdcChannel != 0 && throttlePedalPositionAdcChannel != 0}
|
||||
|
||||
dialog = tpsNum2, "Throttle #2"
|
||||
field = "Primary sensor", tps2_1AdcChannel
|
||||
field = "Primary min", tps2Min, {tps2_1AdcChannel != 16}
|
||||
field = "Primary max", tps2Max, {tps2_1AdcChannel != 16}
|
||||
field = "Primary min", tps2Min, {tps2_1AdcChannel != 0}
|
||||
field = "Primary max", tps2Max, {tps2_1AdcChannel != 0}
|
||||
field = "Secondary sensor", tps2_2AdcChannel
|
||||
field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 16}
|
||||
field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 16}
|
||||
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2, {tps2_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
|
||||
field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0}
|
||||
field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0}
|
||||
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2, {tps2_2AdcChannel != 0 && throttlePedalPositionAdcChannel != 0}
|
||||
|
||||
dialog = tpsLimits, "TPS Limits"
|
||||
field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16}
|
||||
field = "TPS maximum valid value", tpsErrorDetectionTooHigh, {tps1_1AdcChannel != 16}
|
||||
field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0}
|
||||
field = "TPS maximum valid value", tpsErrorDetectionTooHigh, {tps1_1AdcChannel != 0}
|
||||
|
||||
dialog = tpsSensor, "TPS"
|
||||
panel = tpsLimits
|
||||
|
|
@ -3492,21 +3492,21 @@ cmd_set_engine_type_default = "Z\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 = "Bias resistor", clt_bias_resistor, {clt_adcChannel != 0}
|
||||
|
||||
field = "#Input three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 16}
|
||||
field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 16}
|
||||
field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 0}
|
||||
field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", clt_tempC_2, {clt_adcChannel != 16}
|
||||
field = "Resistance @ MT", clt_resistance_2, {clt_adcChannel != 16}
|
||||
field = "Middle temperature", clt_tempC_2, {clt_adcChannel != 0}
|
||||
field = "Resistance @ MT", clt_resistance_2, {clt_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", clt_tempC_3, {clt_adcChannel != 16}
|
||||
field = "Resistance @ HT", clt_resistance_3, {clt_adcChannel != 16}
|
||||
field = "Highest temperature", clt_tempC_3, {clt_adcChannel != 0}
|
||||
field = "Resistance @ HT", clt_resistance_3, {clt_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Linear characteristic", useLinearCltSensor, {clt_adcChannel != 16}
|
||||
field = "Linear characteristic", useLinearCltSensor, {clt_adcChannel != 0}
|
||||
|
||||
dialog = cltGauges
|
||||
gauge = CLTGauge
|
||||
|
|
@ -3519,21 +3519,21 @@ cmd_set_engine_type_default = "Z\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 = "Bias resistor", iat_bias_resistor, {iat_adcChannel != 0}
|
||||
|
||||
field = "#Input three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 16}
|
||||
field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 16}
|
||||
field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 0}
|
||||
field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", iat_tempC_2, {iat_adcChannel != 16}
|
||||
field = "Resistance @ MT", iat_resistance_2, {iat_adcChannel != 16}
|
||||
field = "Middle temperature", iat_tempC_2, {iat_adcChannel != 0}
|
||||
field = "Resistance @ MT", iat_resistance_2, {iat_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", iat_tempC_3, {iat_adcChannel != 16}
|
||||
field = "Resistance @ HT", iat_resistance_3, {iat_adcChannel != 16}
|
||||
field = "Highest temperature", iat_tempC_3, {iat_adcChannel != 0}
|
||||
field = "Resistance @ HT", iat_resistance_3, {iat_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Linear characteristic", useLinearIatSensor, {iat_adcChannel != 16}
|
||||
field = "Linear characteristic", useLinearIatSensor, {iat_adcChannel != 0}
|
||||
|
||||
dialog = iatGauges
|
||||
gauge = IATGauge
|
||||
|
|
@ -3546,10 +3546,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
; Sensors->Oil pressure sensor
|
||||
dialog = oilp_settings, "Oil Pressure Sensor"
|
||||
field = "Oil Pressure ADC input", oilPressure_hwChannel
|
||||
field = "low voltage", oilPressure_v1, {oilPressure_hwChannel != 16}
|
||||
field = "low pressure", oilPressure_value1, {oilPressure_hwChannel != 16}
|
||||
field = "high voltage", oilPressure_v2, {oilPressure_hwChannel != 16}
|
||||
field = "high pressure", oilPressure_value2, {oilPressure_hwChannel != 16}
|
||||
field = "low voltage", oilPressure_v1, {oilPressure_hwChannel != 0}
|
||||
field = "low pressure", oilPressure_value1, {oilPressure_hwChannel != 0}
|
||||
field = "high voltage", oilPressure_v2, {oilPressure_hwChannel != 0}
|
||||
field = "high pressure", oilPressure_value2, {oilPressure_hwChannel != 0}
|
||||
|
||||
dialog = oilPressureGauges
|
||||
gauge = OilPressGauge
|
||||
|
|
@ -3562,11 +3562,11 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
; Sensors->MAP sensor
|
||||
dialog = mapSensorAnalog, "MAP sensor", yAxis
|
||||
field = "MAP ADC input", map_sensor_hwChannel
|
||||
field = "MAP type", map_sensor_type, { map_sensor_hwChannel != 16 }
|
||||
field = "MAP value low point", map_sensor_lowValue, { map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP voltage low point", mapLowValueVoltage, { map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP value high point", map_sensor_highValue,{ map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP voltage high value", mapHighValueVoltage, { map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP type", map_sensor_type, { map_sensor_hwChannel != 0 }
|
||||
field = "MAP value low point", map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
field = "MAP voltage low point", mapLowValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
field = "MAP value high point", map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
field = "MAP voltage high value", mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
|
||||
dialog = mapSensorFreq, "MAP frequency sensor", yAxis
|
||||
field = "MAP Freq", frequencyReportingMapInputPin
|
||||
|
|
@ -3588,9 +3588,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
|
||||
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}
|
||||
field = baroSensor_lowValue, baroSensor_lowValue, {baroSensor_hwChannel != 0}
|
||||
field = baroSensor_highValue, baroSensor_highValue, {baroSensor_hwChannel != 0}
|
||||
field = baroSensor_type, baroSensor_type, {baroSensor_hwChannel != 0}
|
||||
|
||||
dialog = mapCurves, "MAP sampling", yAxis
|
||||
field = "isMapAveragingEnabled", isMapAveragingEnabled
|
||||
|
|
@ -3616,7 +3616,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
|
||||
dialog = egoSettings, "", yAxis
|
||||
panel = egoSettings_IO
|
||||
panel = egoSettings_sensor, {afr_hwChannel != 16 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
|
||||
panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
|
||||
field = "Enable AEM X-Series CANbus", enableAemXSeries, { canReadEnabled }
|
||||
field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
|
||||
|
||||
|
|
@ -3701,7 +3701,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
dialog = idleSettings, "", yAxis
|
||||
field = "Idle IAC control mode", idleMode
|
||||
field = useInstantRpmForIdle, useInstantRpmForIdle
|
||||
field = "use ETB for idle", useETBforIdleControl, { throttlePedalPositionAdcChannel != 16 }
|
||||
field = "use ETB for idle", useETBforIdleControl, { throttlePedalPositionAdcChannel != 0 }
|
||||
field = "ETB Idle range", etbIdleThrottleRange, {useETBforIdleControl == 1}
|
||||
field = "Use separate Ignition Table for idle", useSeparateAdvanceForIdle
|
||||
field = "Use separate VE Table for idle", useSeparateVeForIdle
|
||||
|
|
@ -4355,12 +4355,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
|
||||
dialog = etbDialogLeft
|
||||
field = "https://rusefi.com/s/etb"
|
||||
field = "Late 90s German DC Motor idle", dcMotorIdleValve, { throttlePedalPositionAdcChannel == 16 }
|
||||
field = "Late 90s German DC Motor idle", dcMotorIdleValve, { throttlePedalPositionAdcChannel == 0 }
|
||||
field = "Detailed status in console", isVerboseETB
|
||||
field = "Disable ETB Motor", pauseEtbControl
|
||||
; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility
|
||||
; criteria for the same panel when used in multiple places
|
||||
panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 16 || (useStepperIdle && useHbridges) || dcMotorIdleValve }
|
||||
panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridges) || dcMotorIdleValve }
|
||||
|
||||
dialog = etbAutotune, "PID Autotune"
|
||||
field = "First step: calibrate TPS and hit 'Burn'"
|
||||
|
|
@ -4375,8 +4375,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
field = "Debug mode", debugMode
|
||||
|
||||
dialog = etbDialogRight
|
||||
panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 16 }
|
||||
panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 16) || dcMotorIdleValve }
|
||||
panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 }
|
||||
panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || dcMotorIdleValve }
|
||||
panel = etbAutotune
|
||||
|
||||
; Neutral position handling not yet implemented!
|
||||
|
|
|
|||
|
|
@ -33,12 +33,12 @@ enable2ndByteCanID = false
|
|||
|
||||
[MegaTune]
|
||||
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
|
||||
signature = "rusEFI 2020.09.19.mre_f7.1920166731"
|
||||
signature = "rusEFI 2020.09.20.mre_f7.1287564024"
|
||||
|
||||
[TunerStudio]
|
||||
queryCommand = "S"
|
||||
versionInfo = "V" ; firmwave version for title bar.
|
||||
signature = "rusEFI 2020.09.19.mre_f7.1920166731" ; signature is expected to be 7 or more characters.
|
||||
signature = "rusEFI 2020.09.20.mre_f7.1287564024" ; signature is expected to be 7 or more characters.
|
||||
|
||||
[Constants]
|
||||
; new packet serial format with CRC
|
||||
|
|
@ -74,7 +74,7 @@ enable2ndByteCanID = false
|
|||
|
||||
; see PAGE_0_SIZE in C source code
|
||||
; CONFIG_DEFINITION_START
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 19 21:18:46 UTC 2020
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 20 17:44:29 UTC 2020
|
||||
|
||||
pageSize = 20000
|
||||
page = 1
|
||||
|
|
@ -2730,7 +2730,7 @@ menuDialog = main
|
|||
|
||||
# MAF
|
||||
subMenu = mafSettings, "MAF sensor"
|
||||
subMenu = mafDecodingCurve, "MAF transfer function", 0, {mafAdcChannel != 16 }
|
||||
subMenu = mafDecodingCurve, "MAF transfer function", 0, {mafAdcChannel != 0 }
|
||||
subMenu = std_separator
|
||||
|
||||
# O2 sensor(s)
|
||||
|
|
@ -3142,59 +3142,59 @@ cmd_set_engine_type_default = "Z\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 = "Bias resistor", auxTempSensor1_bias_resistor, {auxTempSensor1_adcChannel != 0}
|
||||
|
||||
field = "#Here is three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", auxTempSensor1_tempC_1, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Resistance @ LT", auxTempSensor1_resistance_1, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Lowest temperature", auxTempSensor1_tempC_1, {auxTempSensor1_adcChannel != 0}
|
||||
field = "Resistance @ LT", auxTempSensor1_resistance_1, {auxTempSensor1_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", auxTempSensor1_tempC_2, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Resistance @ MT", auxTempSensor1_resistance_2, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Middle temperature", auxTempSensor1_tempC_2, {auxTempSensor1_adcChannel != 0}
|
||||
field = "Resistance @ MT", auxTempSensor1_resistance_2, {auxTempSensor1_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", auxTempSensor1_tempC_3, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Resistance @ HT", auxTempSensor1_resistance_3, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Highest temperature", auxTempSensor1_tempC_3, {auxTempSensor1_adcChannel != 0}
|
||||
field = "Resistance @ HT", auxTempSensor1_resistance_3, {auxTempSensor1_adcChannel != 0}
|
||||
|
||||
; 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 = "Bias resistor", auxTempSensor2_bias_resistor, {auxTempSensor2_adcChannel != 0}
|
||||
|
||||
field = "#Here is three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", auxTempSensor2_tempC_1, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Resistance @ LT", auxTempSensor2_resistance_1, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Lowest temperature", auxTempSensor2_tempC_1, {auxTempSensor2_adcChannel != 0}
|
||||
field = "Resistance @ LT", auxTempSensor2_resistance_1, {auxTempSensor2_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", auxTempSensor2_tempC_2, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Resistance @ MT", auxTempSensor2_resistance_2, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Middle temperature", auxTempSensor2_tempC_2, {auxTempSensor2_adcChannel != 0}
|
||||
field = "Resistance @ MT", auxTempSensor2_resistance_2, {auxTempSensor2_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", auxTempSensor2_tempC_3, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Resistance @ HT", auxTempSensor2_resistance_3, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Highest temperature", auxTempSensor2_tempC_3, {auxTempSensor2_adcChannel != 0}
|
||||
field = "Resistance @ HT", auxTempSensor2_resistance_3, {auxTempSensor2_adcChannel != 0}
|
||||
|
||||
dialog = tpsNum1, "Throttle #1"
|
||||
field = "!See Tools>Calibrate TPS"
|
||||
field = "Primary sensor", tps1_1AdcChannel
|
||||
field = "Primary min", tpsMin, {tps1_1AdcChannel != 16}
|
||||
field = "Primary max", tpsMax, {tps1_1AdcChannel != 16}
|
||||
field = "Primary min", tpsMin, {tps1_1AdcChannel != 0}
|
||||
field = "Primary max", tpsMax, {tps1_1AdcChannel != 0}
|
||||
field = "Secondary sensor", tps1_2AdcChannel
|
||||
field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 16}
|
||||
field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 16}
|
||||
commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate, {tps1_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
|
||||
field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0}
|
||||
field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0}
|
||||
commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate, {tps1_2AdcChannel != 0 && throttlePedalPositionAdcChannel != 0}
|
||||
|
||||
dialog = tpsNum2, "Throttle #2"
|
||||
field = "Primary sensor", tps2_1AdcChannel
|
||||
field = "Primary min", tps2Min, {tps2_1AdcChannel != 16}
|
||||
field = "Primary max", tps2Max, {tps2_1AdcChannel != 16}
|
||||
field = "Primary min", tps2Min, {tps2_1AdcChannel != 0}
|
||||
field = "Primary max", tps2Max, {tps2_1AdcChannel != 0}
|
||||
field = "Secondary sensor", tps2_2AdcChannel
|
||||
field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 16}
|
||||
field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 16}
|
||||
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2, {tps2_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
|
||||
field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0}
|
||||
field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0}
|
||||
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2, {tps2_2AdcChannel != 0 && throttlePedalPositionAdcChannel != 0}
|
||||
|
||||
dialog = tpsLimits, "TPS Limits"
|
||||
field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16}
|
||||
field = "TPS maximum valid value", tpsErrorDetectionTooHigh, {tps1_1AdcChannel != 16}
|
||||
field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0}
|
||||
field = "TPS maximum valid value", tpsErrorDetectionTooHigh, {tps1_1AdcChannel != 0}
|
||||
|
||||
dialog = tpsSensor, "TPS"
|
||||
panel = tpsLimits
|
||||
|
|
@ -3492,21 +3492,21 @@ cmd_set_engine_type_default = "Z\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 = "Bias resistor", clt_bias_resistor, {clt_adcChannel != 0}
|
||||
|
||||
field = "#Input three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 16}
|
||||
field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 16}
|
||||
field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 0}
|
||||
field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", clt_tempC_2, {clt_adcChannel != 16}
|
||||
field = "Resistance @ MT", clt_resistance_2, {clt_adcChannel != 16}
|
||||
field = "Middle temperature", clt_tempC_2, {clt_adcChannel != 0}
|
||||
field = "Resistance @ MT", clt_resistance_2, {clt_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", clt_tempC_3, {clt_adcChannel != 16}
|
||||
field = "Resistance @ HT", clt_resistance_3, {clt_adcChannel != 16}
|
||||
field = "Highest temperature", clt_tempC_3, {clt_adcChannel != 0}
|
||||
field = "Resistance @ HT", clt_resistance_3, {clt_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Linear characteristic", useLinearCltSensor, {clt_adcChannel != 16}
|
||||
field = "Linear characteristic", useLinearCltSensor, {clt_adcChannel != 0}
|
||||
|
||||
dialog = cltGauges
|
||||
gauge = CLTGauge
|
||||
|
|
@ -3519,21 +3519,21 @@ cmd_set_engine_type_default = "Z\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 = "Bias resistor", iat_bias_resistor, {iat_adcChannel != 0}
|
||||
|
||||
field = "#Input three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 16}
|
||||
field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 16}
|
||||
field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 0}
|
||||
field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", iat_tempC_2, {iat_adcChannel != 16}
|
||||
field = "Resistance @ MT", iat_resistance_2, {iat_adcChannel != 16}
|
||||
field = "Middle temperature", iat_tempC_2, {iat_adcChannel != 0}
|
||||
field = "Resistance @ MT", iat_resistance_2, {iat_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", iat_tempC_3, {iat_adcChannel != 16}
|
||||
field = "Resistance @ HT", iat_resistance_3, {iat_adcChannel != 16}
|
||||
field = "Highest temperature", iat_tempC_3, {iat_adcChannel != 0}
|
||||
field = "Resistance @ HT", iat_resistance_3, {iat_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Linear characteristic", useLinearIatSensor, {iat_adcChannel != 16}
|
||||
field = "Linear characteristic", useLinearIatSensor, {iat_adcChannel != 0}
|
||||
|
||||
dialog = iatGauges
|
||||
gauge = IATGauge
|
||||
|
|
@ -3546,10 +3546,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
; Sensors->Oil pressure sensor
|
||||
dialog = oilp_settings, "Oil Pressure Sensor"
|
||||
field = "Oil Pressure ADC input", oilPressure_hwChannel
|
||||
field = "low voltage", oilPressure_v1, {oilPressure_hwChannel != 16}
|
||||
field = "low pressure", oilPressure_value1, {oilPressure_hwChannel != 16}
|
||||
field = "high voltage", oilPressure_v2, {oilPressure_hwChannel != 16}
|
||||
field = "high pressure", oilPressure_value2, {oilPressure_hwChannel != 16}
|
||||
field = "low voltage", oilPressure_v1, {oilPressure_hwChannel != 0}
|
||||
field = "low pressure", oilPressure_value1, {oilPressure_hwChannel != 0}
|
||||
field = "high voltage", oilPressure_v2, {oilPressure_hwChannel != 0}
|
||||
field = "high pressure", oilPressure_value2, {oilPressure_hwChannel != 0}
|
||||
|
||||
dialog = oilPressureGauges
|
||||
gauge = OilPressGauge
|
||||
|
|
@ -3562,11 +3562,11 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
; Sensors->MAP sensor
|
||||
dialog = mapSensorAnalog, "MAP sensor", yAxis
|
||||
field = "MAP ADC input", map_sensor_hwChannel
|
||||
field = "MAP type", map_sensor_type, { map_sensor_hwChannel != 16 }
|
||||
field = "MAP value low point", map_sensor_lowValue, { map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP voltage low point", mapLowValueVoltage, { map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP value high point", map_sensor_highValue,{ map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP voltage high value", mapHighValueVoltage, { map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP type", map_sensor_type, { map_sensor_hwChannel != 0 }
|
||||
field = "MAP value low point", map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
field = "MAP voltage low point", mapLowValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
field = "MAP value high point", map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
field = "MAP voltage high value", mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
|
||||
dialog = mapSensorFreq, "MAP frequency sensor", yAxis
|
||||
field = "MAP Freq", frequencyReportingMapInputPin
|
||||
|
|
@ -3588,9 +3588,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
|
||||
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}
|
||||
field = baroSensor_lowValue, baroSensor_lowValue, {baroSensor_hwChannel != 0}
|
||||
field = baroSensor_highValue, baroSensor_highValue, {baroSensor_hwChannel != 0}
|
||||
field = baroSensor_type, baroSensor_type, {baroSensor_hwChannel != 0}
|
||||
|
||||
dialog = mapCurves, "MAP sampling", yAxis
|
||||
field = "isMapAveragingEnabled", isMapAveragingEnabled
|
||||
|
|
@ -3616,7 +3616,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
|
||||
dialog = egoSettings, "", yAxis
|
||||
panel = egoSettings_IO
|
||||
panel = egoSettings_sensor, {afr_hwChannel != 16 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
|
||||
panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
|
||||
field = "Enable AEM X-Series CANbus", enableAemXSeries, { canReadEnabled }
|
||||
field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
|
||||
|
||||
|
|
@ -3701,7 +3701,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
dialog = idleSettings, "", yAxis
|
||||
field = "Idle IAC control mode", idleMode
|
||||
field = useInstantRpmForIdle, useInstantRpmForIdle
|
||||
field = "use ETB for idle", useETBforIdleControl, { throttlePedalPositionAdcChannel != 16 }
|
||||
field = "use ETB for idle", useETBforIdleControl, { throttlePedalPositionAdcChannel != 0 }
|
||||
field = "ETB Idle range", etbIdleThrottleRange, {useETBforIdleControl == 1}
|
||||
field = "Use separate Ignition Table for idle", useSeparateAdvanceForIdle
|
||||
field = "Use separate VE Table for idle", useSeparateVeForIdle
|
||||
|
|
@ -4355,12 +4355,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
|
||||
dialog = etbDialogLeft
|
||||
field = "https://rusefi.com/s/etb"
|
||||
field = "Late 90s German DC Motor idle", dcMotorIdleValve, { throttlePedalPositionAdcChannel == 16 }
|
||||
field = "Late 90s German DC Motor idle", dcMotorIdleValve, { throttlePedalPositionAdcChannel == 0 }
|
||||
field = "Detailed status in console", isVerboseETB
|
||||
field = "Disable ETB Motor", pauseEtbControl
|
||||
; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility
|
||||
; criteria for the same panel when used in multiple places
|
||||
panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 16 || (useStepperIdle && useHbridges) || dcMotorIdleValve }
|
||||
panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridges) || dcMotorIdleValve }
|
||||
|
||||
dialog = etbAutotune, "PID Autotune"
|
||||
field = "First step: calibrate TPS and hit 'Burn'"
|
||||
|
|
@ -4375,8 +4375,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
field = "Debug mode", debugMode
|
||||
|
||||
dialog = etbDialogRight
|
||||
panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 16 }
|
||||
panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 16) || dcMotorIdleValve }
|
||||
panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 }
|
||||
panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || dcMotorIdleValve }
|
||||
panel = etbAutotune
|
||||
|
||||
; Neutral position handling not yet implemented!
|
||||
|
|
|
|||
|
|
@ -33,12 +33,12 @@ enable2ndByteCanID = false
|
|||
|
||||
[MegaTune]
|
||||
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
|
||||
signature = "rusEFI 2020.09.19.prometheus_405.3602458258"
|
||||
signature = "rusEFI 2020.09.20.prometheus_405.3899975457"
|
||||
|
||||
[TunerStudio]
|
||||
queryCommand = "S"
|
||||
versionInfo = "V" ; firmwave version for title bar.
|
||||
signature = "rusEFI 2020.09.19.prometheus_405.3602458258" ; signature is expected to be 7 or more characters.
|
||||
signature = "rusEFI 2020.09.20.prometheus_405.3899975457" ; signature is expected to be 7 or more characters.
|
||||
|
||||
[Constants]
|
||||
; new packet serial format with CRC
|
||||
|
|
@ -74,7 +74,7 @@ enable2ndByteCanID = false
|
|||
|
||||
; see PAGE_0_SIZE in C source code
|
||||
; CONFIG_DEFINITION_START
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 19 21:18:53 UTC 2020
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 20 17:44:37 UTC 2020
|
||||
|
||||
pageSize = 20000
|
||||
page = 1
|
||||
|
|
@ -2730,7 +2730,7 @@ menuDialog = main
|
|||
|
||||
# MAF
|
||||
subMenu = mafSettings, "MAF sensor"
|
||||
subMenu = mafDecodingCurve, "MAF transfer function", 0, {mafAdcChannel != 16 }
|
||||
subMenu = mafDecodingCurve, "MAF transfer function", 0, {mafAdcChannel != 0 }
|
||||
subMenu = std_separator
|
||||
|
||||
# O2 sensor(s)
|
||||
|
|
@ -3143,59 +3143,59 @@ cmd_set_engine_type_default = "Z\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 = "Bias resistor", auxTempSensor1_bias_resistor, {auxTempSensor1_adcChannel != 0}
|
||||
|
||||
field = "#Here is three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", auxTempSensor1_tempC_1, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Resistance @ LT", auxTempSensor1_resistance_1, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Lowest temperature", auxTempSensor1_tempC_1, {auxTempSensor1_adcChannel != 0}
|
||||
field = "Resistance @ LT", auxTempSensor1_resistance_1, {auxTempSensor1_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", auxTempSensor1_tempC_2, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Resistance @ MT", auxTempSensor1_resistance_2, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Middle temperature", auxTempSensor1_tempC_2, {auxTempSensor1_adcChannel != 0}
|
||||
field = "Resistance @ MT", auxTempSensor1_resistance_2, {auxTempSensor1_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", auxTempSensor1_tempC_3, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Resistance @ HT", auxTempSensor1_resistance_3, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Highest temperature", auxTempSensor1_tempC_3, {auxTempSensor1_adcChannel != 0}
|
||||
field = "Resistance @ HT", auxTempSensor1_resistance_3, {auxTempSensor1_adcChannel != 0}
|
||||
|
||||
; 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 = "Bias resistor", auxTempSensor2_bias_resistor, {auxTempSensor2_adcChannel != 0}
|
||||
|
||||
field = "#Here is three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", auxTempSensor2_tempC_1, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Resistance @ LT", auxTempSensor2_resistance_1, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Lowest temperature", auxTempSensor2_tempC_1, {auxTempSensor2_adcChannel != 0}
|
||||
field = "Resistance @ LT", auxTempSensor2_resistance_1, {auxTempSensor2_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", auxTempSensor2_tempC_2, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Resistance @ MT", auxTempSensor2_resistance_2, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Middle temperature", auxTempSensor2_tempC_2, {auxTempSensor2_adcChannel != 0}
|
||||
field = "Resistance @ MT", auxTempSensor2_resistance_2, {auxTempSensor2_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", auxTempSensor2_tempC_3, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Resistance @ HT", auxTempSensor2_resistance_3, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Highest temperature", auxTempSensor2_tempC_3, {auxTempSensor2_adcChannel != 0}
|
||||
field = "Resistance @ HT", auxTempSensor2_resistance_3, {auxTempSensor2_adcChannel != 0}
|
||||
|
||||
dialog = tpsNum1, "Throttle #1"
|
||||
field = "!See Tools>Calibrate TPS"
|
||||
field = "Primary sensor", tps1_1AdcChannel
|
||||
field = "Primary min", tpsMin, {tps1_1AdcChannel != 16}
|
||||
field = "Primary max", tpsMax, {tps1_1AdcChannel != 16}
|
||||
field = "Primary min", tpsMin, {tps1_1AdcChannel != 0}
|
||||
field = "Primary max", tpsMax, {tps1_1AdcChannel != 0}
|
||||
field = "Secondary sensor", tps1_2AdcChannel
|
||||
field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 16}
|
||||
field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 16}
|
||||
commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate, {tps1_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
|
||||
field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0}
|
||||
field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0}
|
||||
commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate, {tps1_2AdcChannel != 0 && throttlePedalPositionAdcChannel != 0}
|
||||
|
||||
dialog = tpsNum2, "Throttle #2"
|
||||
field = "Primary sensor", tps2_1AdcChannel
|
||||
field = "Primary min", tps2Min, {tps2_1AdcChannel != 16}
|
||||
field = "Primary max", tps2Max, {tps2_1AdcChannel != 16}
|
||||
field = "Primary min", tps2Min, {tps2_1AdcChannel != 0}
|
||||
field = "Primary max", tps2Max, {tps2_1AdcChannel != 0}
|
||||
field = "Secondary sensor", tps2_2AdcChannel
|
||||
field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 16}
|
||||
field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 16}
|
||||
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2, {tps2_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
|
||||
field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0}
|
||||
field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0}
|
||||
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2, {tps2_2AdcChannel != 0 && throttlePedalPositionAdcChannel != 0}
|
||||
|
||||
dialog = tpsLimits, "TPS Limits"
|
||||
field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16}
|
||||
field = "TPS maximum valid value", tpsErrorDetectionTooHigh, {tps1_1AdcChannel != 16}
|
||||
field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0}
|
||||
field = "TPS maximum valid value", tpsErrorDetectionTooHigh, {tps1_1AdcChannel != 0}
|
||||
|
||||
dialog = tpsSensor, "TPS"
|
||||
panel = tpsLimits
|
||||
|
|
@ -3505,21 +3505,21 @@ cmd_set_engine_type_default = "Z\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 = "Bias resistor", clt_bias_resistor, {clt_adcChannel != 0}
|
||||
|
||||
field = "#Input three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 16}
|
||||
field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 16}
|
||||
field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 0}
|
||||
field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", clt_tempC_2, {clt_adcChannel != 16}
|
||||
field = "Resistance @ MT", clt_resistance_2, {clt_adcChannel != 16}
|
||||
field = "Middle temperature", clt_tempC_2, {clt_adcChannel != 0}
|
||||
field = "Resistance @ MT", clt_resistance_2, {clt_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", clt_tempC_3, {clt_adcChannel != 16}
|
||||
field = "Resistance @ HT", clt_resistance_3, {clt_adcChannel != 16}
|
||||
field = "Highest temperature", clt_tempC_3, {clt_adcChannel != 0}
|
||||
field = "Resistance @ HT", clt_resistance_3, {clt_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Linear characteristic", useLinearCltSensor, {clt_adcChannel != 16}
|
||||
field = "Linear characteristic", useLinearCltSensor, {clt_adcChannel != 0}
|
||||
|
||||
dialog = cltGauges
|
||||
gauge = CLTGauge
|
||||
|
|
@ -3532,21 +3532,21 @@ cmd_set_engine_type_default = "Z\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 = "Bias resistor", iat_bias_resistor, {iat_adcChannel != 0}
|
||||
|
||||
field = "#Input three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 16}
|
||||
field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 16}
|
||||
field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 0}
|
||||
field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", iat_tempC_2, {iat_adcChannel != 16}
|
||||
field = "Resistance @ MT", iat_resistance_2, {iat_adcChannel != 16}
|
||||
field = "Middle temperature", iat_tempC_2, {iat_adcChannel != 0}
|
||||
field = "Resistance @ MT", iat_resistance_2, {iat_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", iat_tempC_3, {iat_adcChannel != 16}
|
||||
field = "Resistance @ HT", iat_resistance_3, {iat_adcChannel != 16}
|
||||
field = "Highest temperature", iat_tempC_3, {iat_adcChannel != 0}
|
||||
field = "Resistance @ HT", iat_resistance_3, {iat_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Linear characteristic", useLinearIatSensor, {iat_adcChannel != 16}
|
||||
field = "Linear characteristic", useLinearIatSensor, {iat_adcChannel != 0}
|
||||
|
||||
dialog = iatGauges
|
||||
gauge = IATGauge
|
||||
|
|
@ -3559,10 +3559,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
; Sensors->Oil pressure sensor
|
||||
dialog = oilp_settings, "Oil Pressure Sensor"
|
||||
field = "Oil Pressure ADC input", oilPressure_hwChannel
|
||||
field = "low voltage", oilPressure_v1, {oilPressure_hwChannel != 16}
|
||||
field = "low pressure", oilPressure_value1, {oilPressure_hwChannel != 16}
|
||||
field = "high voltage", oilPressure_v2, {oilPressure_hwChannel != 16}
|
||||
field = "high pressure", oilPressure_value2, {oilPressure_hwChannel != 16}
|
||||
field = "low voltage", oilPressure_v1, {oilPressure_hwChannel != 0}
|
||||
field = "low pressure", oilPressure_value1, {oilPressure_hwChannel != 0}
|
||||
field = "high voltage", oilPressure_v2, {oilPressure_hwChannel != 0}
|
||||
field = "high pressure", oilPressure_value2, {oilPressure_hwChannel != 0}
|
||||
|
||||
dialog = oilPressureGauges
|
||||
gauge = OilPressGauge
|
||||
|
|
@ -3575,11 +3575,11 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
; Sensors->MAP sensor
|
||||
dialog = mapSensorAnalog, "MAP sensor", yAxis
|
||||
field = "MAP ADC input", map_sensor_hwChannel
|
||||
field = "MAP type", map_sensor_type, { map_sensor_hwChannel != 16 }
|
||||
field = "MAP value low point", map_sensor_lowValue, { map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP voltage low point", mapLowValueVoltage, { map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP value high point", map_sensor_highValue,{ map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP voltage high value", mapHighValueVoltage, { map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP type", map_sensor_type, { map_sensor_hwChannel != 0 }
|
||||
field = "MAP value low point", map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
field = "MAP voltage low point", mapLowValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
field = "MAP value high point", map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
field = "MAP voltage high value", mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
|
||||
dialog = mapSensorFreq, "MAP frequency sensor", yAxis
|
||||
field = "MAP Freq", frequencyReportingMapInputPin
|
||||
|
|
@ -3601,9 +3601,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
|
||||
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}
|
||||
field = baroSensor_lowValue, baroSensor_lowValue, {baroSensor_hwChannel != 0}
|
||||
field = baroSensor_highValue, baroSensor_highValue, {baroSensor_hwChannel != 0}
|
||||
field = baroSensor_type, baroSensor_type, {baroSensor_hwChannel != 0}
|
||||
|
||||
dialog = mapCurves, "MAP sampling", yAxis
|
||||
field = "isMapAveragingEnabled", isMapAveragingEnabled
|
||||
|
|
@ -3629,7 +3629,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
|
||||
dialog = egoSettings, "", yAxis
|
||||
panel = egoSettings_IO
|
||||
panel = egoSettings_sensor, {afr_hwChannel != 16 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
|
||||
panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
|
||||
field = "Enable AEM X-Series CANbus", enableAemXSeries, { canReadEnabled }
|
||||
field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
|
||||
|
||||
|
|
@ -3714,7 +3714,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
dialog = idleSettings, "", yAxis
|
||||
field = "Idle IAC control mode", idleMode
|
||||
field = useInstantRpmForIdle, useInstantRpmForIdle
|
||||
field = "use ETB for idle", useETBforIdleControl, { throttlePedalPositionAdcChannel != 16 }
|
||||
field = "use ETB for idle", useETBforIdleControl, { throttlePedalPositionAdcChannel != 0 }
|
||||
field = "ETB Idle range", etbIdleThrottleRange, {useETBforIdleControl == 1}
|
||||
field = "Use separate Ignition Table for idle", useSeparateAdvanceForIdle
|
||||
field = "Use separate VE Table for idle", useSeparateVeForIdle
|
||||
|
|
@ -4377,12 +4377,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
|
||||
dialog = etbDialogLeft
|
||||
field = "https://rusefi.com/s/etb"
|
||||
field = "Late 90s German DC Motor idle", dcMotorIdleValve, { throttlePedalPositionAdcChannel == 16 }
|
||||
field = "Late 90s German DC Motor idle", dcMotorIdleValve, { throttlePedalPositionAdcChannel == 0 }
|
||||
field = "Detailed status in console", isVerboseETB
|
||||
field = "Disable ETB Motor", pauseEtbControl
|
||||
; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility
|
||||
; criteria for the same panel when used in multiple places
|
||||
panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 16 || (useStepperIdle && useHbridges) || dcMotorIdleValve }
|
||||
panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridges) || dcMotorIdleValve }
|
||||
|
||||
dialog = etbAutotune, "PID Autotune"
|
||||
field = "First step: calibrate TPS and hit 'Burn'"
|
||||
|
|
@ -4397,8 +4397,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
field = "Debug mode", debugMode
|
||||
|
||||
dialog = etbDialogRight
|
||||
panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 16 }
|
||||
panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 16) || dcMotorIdleValve }
|
||||
panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 }
|
||||
panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || dcMotorIdleValve }
|
||||
panel = etbAutotune
|
||||
|
||||
; Neutral position handling not yet implemented!
|
||||
|
|
|
|||
|
|
@ -33,12 +33,12 @@ enable2ndByteCanID = false
|
|||
|
||||
[MegaTune]
|
||||
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
|
||||
signature = "rusEFI 2020.09.19.prometheus_469.3602458258"
|
||||
signature = "rusEFI 2020.09.20.prometheus_469.3899975457"
|
||||
|
||||
[TunerStudio]
|
||||
queryCommand = "S"
|
||||
versionInfo = "V" ; firmwave version for title bar.
|
||||
signature = "rusEFI 2020.09.19.prometheus_469.3602458258" ; signature is expected to be 7 or more characters.
|
||||
signature = "rusEFI 2020.09.20.prometheus_469.3899975457" ; signature is expected to be 7 or more characters.
|
||||
|
||||
[Constants]
|
||||
; new packet serial format with CRC
|
||||
|
|
@ -74,7 +74,7 @@ enable2ndByteCanID = false
|
|||
|
||||
; see PAGE_0_SIZE in C source code
|
||||
; CONFIG_DEFINITION_START
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 19 21:18:51 UTC 2020
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 20 17:44:36 UTC 2020
|
||||
|
||||
pageSize = 20000
|
||||
page = 1
|
||||
|
|
@ -2730,7 +2730,7 @@ menuDialog = main
|
|||
|
||||
# MAF
|
||||
subMenu = mafSettings, "MAF sensor"
|
||||
subMenu = mafDecodingCurve, "MAF transfer function", 0, {mafAdcChannel != 16 }
|
||||
subMenu = mafDecodingCurve, "MAF transfer function", 0, {mafAdcChannel != 0 }
|
||||
subMenu = std_separator
|
||||
|
||||
# O2 sensor(s)
|
||||
|
|
@ -3143,59 +3143,59 @@ cmd_set_engine_type_default = "Z\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 = "Bias resistor", auxTempSensor1_bias_resistor, {auxTempSensor1_adcChannel != 0}
|
||||
|
||||
field = "#Here is three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", auxTempSensor1_tempC_1, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Resistance @ LT", auxTempSensor1_resistance_1, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Lowest temperature", auxTempSensor1_tempC_1, {auxTempSensor1_adcChannel != 0}
|
||||
field = "Resistance @ LT", auxTempSensor1_resistance_1, {auxTempSensor1_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", auxTempSensor1_tempC_2, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Resistance @ MT", auxTempSensor1_resistance_2, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Middle temperature", auxTempSensor1_tempC_2, {auxTempSensor1_adcChannel != 0}
|
||||
field = "Resistance @ MT", auxTempSensor1_resistance_2, {auxTempSensor1_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", auxTempSensor1_tempC_3, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Resistance @ HT", auxTempSensor1_resistance_3, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Highest temperature", auxTempSensor1_tempC_3, {auxTempSensor1_adcChannel != 0}
|
||||
field = "Resistance @ HT", auxTempSensor1_resistance_3, {auxTempSensor1_adcChannel != 0}
|
||||
|
||||
; 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 = "Bias resistor", auxTempSensor2_bias_resistor, {auxTempSensor2_adcChannel != 0}
|
||||
|
||||
field = "#Here is three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", auxTempSensor2_tempC_1, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Resistance @ LT", auxTempSensor2_resistance_1, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Lowest temperature", auxTempSensor2_tempC_1, {auxTempSensor2_adcChannel != 0}
|
||||
field = "Resistance @ LT", auxTempSensor2_resistance_1, {auxTempSensor2_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", auxTempSensor2_tempC_2, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Resistance @ MT", auxTempSensor2_resistance_2, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Middle temperature", auxTempSensor2_tempC_2, {auxTempSensor2_adcChannel != 0}
|
||||
field = "Resistance @ MT", auxTempSensor2_resistance_2, {auxTempSensor2_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", auxTempSensor2_tempC_3, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Resistance @ HT", auxTempSensor2_resistance_3, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Highest temperature", auxTempSensor2_tempC_3, {auxTempSensor2_adcChannel != 0}
|
||||
field = "Resistance @ HT", auxTempSensor2_resistance_3, {auxTempSensor2_adcChannel != 0}
|
||||
|
||||
dialog = tpsNum1, "Throttle #1"
|
||||
field = "!See Tools>Calibrate TPS"
|
||||
field = "Primary sensor", tps1_1AdcChannel
|
||||
field = "Primary min", tpsMin, {tps1_1AdcChannel != 16}
|
||||
field = "Primary max", tpsMax, {tps1_1AdcChannel != 16}
|
||||
field = "Primary min", tpsMin, {tps1_1AdcChannel != 0}
|
||||
field = "Primary max", tpsMax, {tps1_1AdcChannel != 0}
|
||||
field = "Secondary sensor", tps1_2AdcChannel
|
||||
field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 16}
|
||||
field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 16}
|
||||
commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate, {tps1_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
|
||||
field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0}
|
||||
field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0}
|
||||
commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate, {tps1_2AdcChannel != 0 && throttlePedalPositionAdcChannel != 0}
|
||||
|
||||
dialog = tpsNum2, "Throttle #2"
|
||||
field = "Primary sensor", tps2_1AdcChannel
|
||||
field = "Primary min", tps2Min, {tps2_1AdcChannel != 16}
|
||||
field = "Primary max", tps2Max, {tps2_1AdcChannel != 16}
|
||||
field = "Primary min", tps2Min, {tps2_1AdcChannel != 0}
|
||||
field = "Primary max", tps2Max, {tps2_1AdcChannel != 0}
|
||||
field = "Secondary sensor", tps2_2AdcChannel
|
||||
field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 16}
|
||||
field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 16}
|
||||
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2, {tps2_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
|
||||
field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0}
|
||||
field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0}
|
||||
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2, {tps2_2AdcChannel != 0 && throttlePedalPositionAdcChannel != 0}
|
||||
|
||||
dialog = tpsLimits, "TPS Limits"
|
||||
field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16}
|
||||
field = "TPS maximum valid value", tpsErrorDetectionTooHigh, {tps1_1AdcChannel != 16}
|
||||
field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0}
|
||||
field = "TPS maximum valid value", tpsErrorDetectionTooHigh, {tps1_1AdcChannel != 0}
|
||||
|
||||
dialog = tpsSensor, "TPS"
|
||||
panel = tpsLimits
|
||||
|
|
@ -3505,21 +3505,21 @@ cmd_set_engine_type_default = "Z\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 = "Bias resistor", clt_bias_resistor, {clt_adcChannel != 0}
|
||||
|
||||
field = "#Input three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 16}
|
||||
field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 16}
|
||||
field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 0}
|
||||
field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", clt_tempC_2, {clt_adcChannel != 16}
|
||||
field = "Resistance @ MT", clt_resistance_2, {clt_adcChannel != 16}
|
||||
field = "Middle temperature", clt_tempC_2, {clt_adcChannel != 0}
|
||||
field = "Resistance @ MT", clt_resistance_2, {clt_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", clt_tempC_3, {clt_adcChannel != 16}
|
||||
field = "Resistance @ HT", clt_resistance_3, {clt_adcChannel != 16}
|
||||
field = "Highest temperature", clt_tempC_3, {clt_adcChannel != 0}
|
||||
field = "Resistance @ HT", clt_resistance_3, {clt_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Linear characteristic", useLinearCltSensor, {clt_adcChannel != 16}
|
||||
field = "Linear characteristic", useLinearCltSensor, {clt_adcChannel != 0}
|
||||
|
||||
dialog = cltGauges
|
||||
gauge = CLTGauge
|
||||
|
|
@ -3532,21 +3532,21 @@ cmd_set_engine_type_default = "Z\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 = "Bias resistor", iat_bias_resistor, {iat_adcChannel != 0}
|
||||
|
||||
field = "#Input three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 16}
|
||||
field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 16}
|
||||
field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 0}
|
||||
field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", iat_tempC_2, {iat_adcChannel != 16}
|
||||
field = "Resistance @ MT", iat_resistance_2, {iat_adcChannel != 16}
|
||||
field = "Middle temperature", iat_tempC_2, {iat_adcChannel != 0}
|
||||
field = "Resistance @ MT", iat_resistance_2, {iat_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", iat_tempC_3, {iat_adcChannel != 16}
|
||||
field = "Resistance @ HT", iat_resistance_3, {iat_adcChannel != 16}
|
||||
field = "Highest temperature", iat_tempC_3, {iat_adcChannel != 0}
|
||||
field = "Resistance @ HT", iat_resistance_3, {iat_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Linear characteristic", useLinearIatSensor, {iat_adcChannel != 16}
|
||||
field = "Linear characteristic", useLinearIatSensor, {iat_adcChannel != 0}
|
||||
|
||||
dialog = iatGauges
|
||||
gauge = IATGauge
|
||||
|
|
@ -3559,10 +3559,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
; Sensors->Oil pressure sensor
|
||||
dialog = oilp_settings, "Oil Pressure Sensor"
|
||||
field = "Oil Pressure ADC input", oilPressure_hwChannel
|
||||
field = "low voltage", oilPressure_v1, {oilPressure_hwChannel != 16}
|
||||
field = "low pressure", oilPressure_value1, {oilPressure_hwChannel != 16}
|
||||
field = "high voltage", oilPressure_v2, {oilPressure_hwChannel != 16}
|
||||
field = "high pressure", oilPressure_value2, {oilPressure_hwChannel != 16}
|
||||
field = "low voltage", oilPressure_v1, {oilPressure_hwChannel != 0}
|
||||
field = "low pressure", oilPressure_value1, {oilPressure_hwChannel != 0}
|
||||
field = "high voltage", oilPressure_v2, {oilPressure_hwChannel != 0}
|
||||
field = "high pressure", oilPressure_value2, {oilPressure_hwChannel != 0}
|
||||
|
||||
dialog = oilPressureGauges
|
||||
gauge = OilPressGauge
|
||||
|
|
@ -3575,11 +3575,11 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
; Sensors->MAP sensor
|
||||
dialog = mapSensorAnalog, "MAP sensor", yAxis
|
||||
field = "MAP ADC input", map_sensor_hwChannel
|
||||
field = "MAP type", map_sensor_type, { map_sensor_hwChannel != 16 }
|
||||
field = "MAP value low point", map_sensor_lowValue, { map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP voltage low point", mapLowValueVoltage, { map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP value high point", map_sensor_highValue,{ map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP voltage high value", mapHighValueVoltage, { map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP type", map_sensor_type, { map_sensor_hwChannel != 0 }
|
||||
field = "MAP value low point", map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
field = "MAP voltage low point", mapLowValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
field = "MAP value high point", map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
field = "MAP voltage high value", mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
|
||||
dialog = mapSensorFreq, "MAP frequency sensor", yAxis
|
||||
field = "MAP Freq", frequencyReportingMapInputPin
|
||||
|
|
@ -3601,9 +3601,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
|
||||
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}
|
||||
field = baroSensor_lowValue, baroSensor_lowValue, {baroSensor_hwChannel != 0}
|
||||
field = baroSensor_highValue, baroSensor_highValue, {baroSensor_hwChannel != 0}
|
||||
field = baroSensor_type, baroSensor_type, {baroSensor_hwChannel != 0}
|
||||
|
||||
dialog = mapCurves, "MAP sampling", yAxis
|
||||
field = "isMapAveragingEnabled", isMapAveragingEnabled
|
||||
|
|
@ -3629,7 +3629,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
|
||||
dialog = egoSettings, "", yAxis
|
||||
panel = egoSettings_IO
|
||||
panel = egoSettings_sensor, {afr_hwChannel != 16 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
|
||||
panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
|
||||
field = "Enable AEM X-Series CANbus", enableAemXSeries, { canReadEnabled }
|
||||
field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
|
||||
|
||||
|
|
@ -3714,7 +3714,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
dialog = idleSettings, "", yAxis
|
||||
field = "Idle IAC control mode", idleMode
|
||||
field = useInstantRpmForIdle, useInstantRpmForIdle
|
||||
field = "use ETB for idle", useETBforIdleControl, { throttlePedalPositionAdcChannel != 16 }
|
||||
field = "use ETB for idle", useETBforIdleControl, { throttlePedalPositionAdcChannel != 0 }
|
||||
field = "ETB Idle range", etbIdleThrottleRange, {useETBforIdleControl == 1}
|
||||
field = "Use separate Ignition Table for idle", useSeparateAdvanceForIdle
|
||||
field = "Use separate VE Table for idle", useSeparateVeForIdle
|
||||
|
|
@ -4377,12 +4377,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
|
||||
dialog = etbDialogLeft
|
||||
field = "https://rusefi.com/s/etb"
|
||||
field = "Late 90s German DC Motor idle", dcMotorIdleValve, { throttlePedalPositionAdcChannel == 16 }
|
||||
field = "Late 90s German DC Motor idle", dcMotorIdleValve, { throttlePedalPositionAdcChannel == 0 }
|
||||
field = "Detailed status in console", isVerboseETB
|
||||
field = "Disable ETB Motor", pauseEtbControl
|
||||
; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility
|
||||
; criteria for the same panel when used in multiple places
|
||||
panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 16 || (useStepperIdle && useHbridges) || dcMotorIdleValve }
|
||||
panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridges) || dcMotorIdleValve }
|
||||
|
||||
dialog = etbAutotune, "PID Autotune"
|
||||
field = "First step: calibrate TPS and hit 'Burn'"
|
||||
|
|
@ -4397,8 +4397,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
field = "Debug mode", debugMode
|
||||
|
||||
dialog = etbDialogRight
|
||||
panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 16 }
|
||||
panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 16) || dcMotorIdleValve }
|
||||
panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 }
|
||||
panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || dcMotorIdleValve }
|
||||
panel = etbAutotune
|
||||
|
||||
; Neutral position handling not yet implemented!
|
||||
|
|
|
|||
|
|
@ -33,12 +33,12 @@ enable2ndByteCanID = false
|
|||
|
||||
[MegaTune]
|
||||
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
|
||||
signature = "rusEFI 2020.09.19.proteus_f4.2152142065"
|
||||
signature = "rusEFI 2020.09.20.proteus_f4.3196769602"
|
||||
|
||||
[TunerStudio]
|
||||
queryCommand = "S"
|
||||
versionInfo = "V" ; firmwave version for title bar.
|
||||
signature = "rusEFI 2020.09.19.proteus_f4.2152142065" ; signature is expected to be 7 or more characters.
|
||||
signature = "rusEFI 2020.09.20.proteus_f4.3196769602" ; signature is expected to be 7 or more characters.
|
||||
|
||||
[Constants]
|
||||
; new packet serial format with CRC
|
||||
|
|
@ -74,7 +74,7 @@ enable2ndByteCanID = false
|
|||
|
||||
; see PAGE_0_SIZE in C source code
|
||||
; CONFIG_DEFINITION_START
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 19 21:19:01 UTC 2020
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 20 17:44:41 UTC 2020
|
||||
|
||||
pageSize = 20000
|
||||
page = 1
|
||||
|
|
@ -2730,7 +2730,7 @@ menuDialog = main
|
|||
|
||||
# MAF
|
||||
subMenu = mafSettings, "MAF sensor"
|
||||
subMenu = mafDecodingCurve, "MAF transfer function", 0, {mafAdcChannel != 16 }
|
||||
subMenu = mafDecodingCurve, "MAF transfer function", 0, {mafAdcChannel != 0 }
|
||||
subMenu = std_separator
|
||||
|
||||
# O2 sensor(s)
|
||||
|
|
@ -3138,59 +3138,59 @@ cmd_set_engine_type_default = "Z\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 = "Bias resistor", auxTempSensor1_bias_resistor, {auxTempSensor1_adcChannel != 0}
|
||||
|
||||
field = "#Here is three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", auxTempSensor1_tempC_1, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Resistance @ LT", auxTempSensor1_resistance_1, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Lowest temperature", auxTempSensor1_tempC_1, {auxTempSensor1_adcChannel != 0}
|
||||
field = "Resistance @ LT", auxTempSensor1_resistance_1, {auxTempSensor1_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", auxTempSensor1_tempC_2, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Resistance @ MT", auxTempSensor1_resistance_2, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Middle temperature", auxTempSensor1_tempC_2, {auxTempSensor1_adcChannel != 0}
|
||||
field = "Resistance @ MT", auxTempSensor1_resistance_2, {auxTempSensor1_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", auxTempSensor1_tempC_3, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Resistance @ HT", auxTempSensor1_resistance_3, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Highest temperature", auxTempSensor1_tempC_3, {auxTempSensor1_adcChannel != 0}
|
||||
field = "Resistance @ HT", auxTempSensor1_resistance_3, {auxTempSensor1_adcChannel != 0}
|
||||
|
||||
; 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 = "Bias resistor", auxTempSensor2_bias_resistor, {auxTempSensor2_adcChannel != 0}
|
||||
|
||||
field = "#Here is three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", auxTempSensor2_tempC_1, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Resistance @ LT", auxTempSensor2_resistance_1, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Lowest temperature", auxTempSensor2_tempC_1, {auxTempSensor2_adcChannel != 0}
|
||||
field = "Resistance @ LT", auxTempSensor2_resistance_1, {auxTempSensor2_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", auxTempSensor2_tempC_2, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Resistance @ MT", auxTempSensor2_resistance_2, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Middle temperature", auxTempSensor2_tempC_2, {auxTempSensor2_adcChannel != 0}
|
||||
field = "Resistance @ MT", auxTempSensor2_resistance_2, {auxTempSensor2_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", auxTempSensor2_tempC_3, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Resistance @ HT", auxTempSensor2_resistance_3, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Highest temperature", auxTempSensor2_tempC_3, {auxTempSensor2_adcChannel != 0}
|
||||
field = "Resistance @ HT", auxTempSensor2_resistance_3, {auxTempSensor2_adcChannel != 0}
|
||||
|
||||
dialog = tpsNum1, "Throttle #1"
|
||||
field = "!See Tools>Calibrate TPS"
|
||||
field = "Primary sensor", tps1_1AdcChannel
|
||||
field = "Primary min", tpsMin, {tps1_1AdcChannel != 16}
|
||||
field = "Primary max", tpsMax, {tps1_1AdcChannel != 16}
|
||||
field = "Primary min", tpsMin, {tps1_1AdcChannel != 0}
|
||||
field = "Primary max", tpsMax, {tps1_1AdcChannel != 0}
|
||||
field = "Secondary sensor", tps1_2AdcChannel
|
||||
field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 16}
|
||||
field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 16}
|
||||
commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate, {tps1_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
|
||||
field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0}
|
||||
field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0}
|
||||
commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate, {tps1_2AdcChannel != 0 && throttlePedalPositionAdcChannel != 0}
|
||||
|
||||
dialog = tpsNum2, "Throttle #2"
|
||||
field = "Primary sensor", tps2_1AdcChannel
|
||||
field = "Primary min", tps2Min, {tps2_1AdcChannel != 16}
|
||||
field = "Primary max", tps2Max, {tps2_1AdcChannel != 16}
|
||||
field = "Primary min", tps2Min, {tps2_1AdcChannel != 0}
|
||||
field = "Primary max", tps2Max, {tps2_1AdcChannel != 0}
|
||||
field = "Secondary sensor", tps2_2AdcChannel
|
||||
field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 16}
|
||||
field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 16}
|
||||
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2, {tps2_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
|
||||
field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0}
|
||||
field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0}
|
||||
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2, {tps2_2AdcChannel != 0 && throttlePedalPositionAdcChannel != 0}
|
||||
|
||||
dialog = tpsLimits, "TPS Limits"
|
||||
field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16}
|
||||
field = "TPS maximum valid value", tpsErrorDetectionTooHigh, {tps1_1AdcChannel != 16}
|
||||
field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0}
|
||||
field = "TPS maximum valid value", tpsErrorDetectionTooHigh, {tps1_1AdcChannel != 0}
|
||||
|
||||
dialog = tpsSensor, "TPS"
|
||||
panel = tpsLimits
|
||||
|
|
@ -3484,21 +3484,21 @@ cmd_set_engine_type_default = "Z\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 = "Bias resistor", clt_bias_resistor, {clt_adcChannel != 0}
|
||||
|
||||
field = "#Input three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 16}
|
||||
field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 16}
|
||||
field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 0}
|
||||
field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", clt_tempC_2, {clt_adcChannel != 16}
|
||||
field = "Resistance @ MT", clt_resistance_2, {clt_adcChannel != 16}
|
||||
field = "Middle temperature", clt_tempC_2, {clt_adcChannel != 0}
|
||||
field = "Resistance @ MT", clt_resistance_2, {clt_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", clt_tempC_3, {clt_adcChannel != 16}
|
||||
field = "Resistance @ HT", clt_resistance_3, {clt_adcChannel != 16}
|
||||
field = "Highest temperature", clt_tempC_3, {clt_adcChannel != 0}
|
||||
field = "Resistance @ HT", clt_resistance_3, {clt_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Linear characteristic", useLinearCltSensor, {clt_adcChannel != 16}
|
||||
field = "Linear characteristic", useLinearCltSensor, {clt_adcChannel != 0}
|
||||
|
||||
dialog = cltGauges
|
||||
gauge = CLTGauge
|
||||
|
|
@ -3511,21 +3511,21 @@ cmd_set_engine_type_default = "Z\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 = "Bias resistor", iat_bias_resistor, {iat_adcChannel != 0}
|
||||
|
||||
field = "#Input three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 16}
|
||||
field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 16}
|
||||
field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 0}
|
||||
field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", iat_tempC_2, {iat_adcChannel != 16}
|
||||
field = "Resistance @ MT", iat_resistance_2, {iat_adcChannel != 16}
|
||||
field = "Middle temperature", iat_tempC_2, {iat_adcChannel != 0}
|
||||
field = "Resistance @ MT", iat_resistance_2, {iat_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", iat_tempC_3, {iat_adcChannel != 16}
|
||||
field = "Resistance @ HT", iat_resistance_3, {iat_adcChannel != 16}
|
||||
field = "Highest temperature", iat_tempC_3, {iat_adcChannel != 0}
|
||||
field = "Resistance @ HT", iat_resistance_3, {iat_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Linear characteristic", useLinearIatSensor, {iat_adcChannel != 16}
|
||||
field = "Linear characteristic", useLinearIatSensor, {iat_adcChannel != 0}
|
||||
|
||||
dialog = iatGauges
|
||||
gauge = IATGauge
|
||||
|
|
@ -3538,10 +3538,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
; Sensors->Oil pressure sensor
|
||||
dialog = oilp_settings, "Oil Pressure Sensor"
|
||||
field = "Oil Pressure ADC input", oilPressure_hwChannel
|
||||
field = "low voltage", oilPressure_v1, {oilPressure_hwChannel != 16}
|
||||
field = "low pressure", oilPressure_value1, {oilPressure_hwChannel != 16}
|
||||
field = "high voltage", oilPressure_v2, {oilPressure_hwChannel != 16}
|
||||
field = "high pressure", oilPressure_value2, {oilPressure_hwChannel != 16}
|
||||
field = "low voltage", oilPressure_v1, {oilPressure_hwChannel != 0}
|
||||
field = "low pressure", oilPressure_value1, {oilPressure_hwChannel != 0}
|
||||
field = "high voltage", oilPressure_v2, {oilPressure_hwChannel != 0}
|
||||
field = "high pressure", oilPressure_value2, {oilPressure_hwChannel != 0}
|
||||
|
||||
dialog = oilPressureGauges
|
||||
gauge = OilPressGauge
|
||||
|
|
@ -3554,11 +3554,11 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
; Sensors->MAP sensor
|
||||
dialog = mapSensorAnalog, "MAP sensor", yAxis
|
||||
field = "MAP ADC input", map_sensor_hwChannel
|
||||
field = "MAP type", map_sensor_type, { map_sensor_hwChannel != 16 }
|
||||
field = "MAP value low point", map_sensor_lowValue, { map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP voltage low point", mapLowValueVoltage, { map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP value high point", map_sensor_highValue,{ map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP voltage high value", mapHighValueVoltage, { map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP type", map_sensor_type, { map_sensor_hwChannel != 0 }
|
||||
field = "MAP value low point", map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
field = "MAP voltage low point", mapLowValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
field = "MAP value high point", map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
field = "MAP voltage high value", mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
|
||||
dialog = mapSensorFreq, "MAP frequency sensor", yAxis
|
||||
field = "MAP Freq", frequencyReportingMapInputPin
|
||||
|
|
@ -3580,9 +3580,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
|
||||
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}
|
||||
field = baroSensor_lowValue, baroSensor_lowValue, {baroSensor_hwChannel != 0}
|
||||
field = baroSensor_highValue, baroSensor_highValue, {baroSensor_hwChannel != 0}
|
||||
field = baroSensor_type, baroSensor_type, {baroSensor_hwChannel != 0}
|
||||
|
||||
dialog = mapCurves, "MAP sampling", yAxis
|
||||
field = "isMapAveragingEnabled", isMapAveragingEnabled
|
||||
|
|
@ -3608,7 +3608,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
|
||||
dialog = egoSettings, "", yAxis
|
||||
panel = egoSettings_IO
|
||||
panel = egoSettings_sensor, {afr_hwChannel != 16 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
|
||||
panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
|
||||
field = "Enable AEM X-Series CANbus", enableAemXSeries, { canReadEnabled }
|
||||
field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
|
||||
|
||||
|
|
@ -3693,7 +3693,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
dialog = idleSettings, "", yAxis
|
||||
field = "Idle IAC control mode", idleMode
|
||||
field = useInstantRpmForIdle, useInstantRpmForIdle
|
||||
field = "use ETB for idle", useETBforIdleControl, { throttlePedalPositionAdcChannel != 16 }
|
||||
field = "use ETB for idle", useETBforIdleControl, { throttlePedalPositionAdcChannel != 0 }
|
||||
field = "ETB Idle range", etbIdleThrottleRange, {useETBforIdleControl == 1}
|
||||
field = "Use separate Ignition Table for idle", useSeparateAdvanceForIdle
|
||||
field = "Use separate VE Table for idle", useSeparateVeForIdle
|
||||
|
|
@ -4346,12 +4346,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
|
||||
dialog = etbDialogLeft
|
||||
field = "https://rusefi.com/s/etb"
|
||||
field = "Late 90s German DC Motor idle", dcMotorIdleValve, { throttlePedalPositionAdcChannel == 16 }
|
||||
field = "Late 90s German DC Motor idle", dcMotorIdleValve, { throttlePedalPositionAdcChannel == 0 }
|
||||
field = "Detailed status in console", isVerboseETB
|
||||
field = "Disable ETB Motor", pauseEtbControl
|
||||
; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility
|
||||
; criteria for the same panel when used in multiple places
|
||||
panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 16 || (useStepperIdle && useHbridges) || dcMotorIdleValve }
|
||||
panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridges) || dcMotorIdleValve }
|
||||
|
||||
dialog = etbAutotune, "PID Autotune"
|
||||
field = "First step: calibrate TPS and hit 'Burn'"
|
||||
|
|
@ -4366,8 +4366,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
field = "Debug mode", debugMode
|
||||
|
||||
dialog = etbDialogRight
|
||||
panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 16 }
|
||||
panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 16) || dcMotorIdleValve }
|
||||
panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 }
|
||||
panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || dcMotorIdleValve }
|
||||
panel = etbAutotune
|
||||
|
||||
; Neutral position handling not yet implemented!
|
||||
|
|
|
|||
|
|
@ -33,12 +33,12 @@ enable2ndByteCanID = false
|
|||
|
||||
[MegaTune]
|
||||
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
|
||||
signature = "rusEFI 2020.09.19.proteus_f7.2152142065"
|
||||
signature = "rusEFI 2020.09.20.proteus_f7.3196769602"
|
||||
|
||||
[TunerStudio]
|
||||
queryCommand = "S"
|
||||
versionInfo = "V" ; firmwave version for title bar.
|
||||
signature = "rusEFI 2020.09.19.proteus_f7.2152142065" ; signature is expected to be 7 or more characters.
|
||||
signature = "rusEFI 2020.09.20.proteus_f7.3196769602" ; signature is expected to be 7 or more characters.
|
||||
|
||||
[Constants]
|
||||
; new packet serial format with CRC
|
||||
|
|
@ -74,7 +74,7 @@ enable2ndByteCanID = false
|
|||
|
||||
; see PAGE_0_SIZE in C source code
|
||||
; CONFIG_DEFINITION_START
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 19 21:18:56 UTC 2020
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 20 17:44:39 UTC 2020
|
||||
|
||||
pageSize = 20000
|
||||
page = 1
|
||||
|
|
@ -2730,7 +2730,7 @@ menuDialog = main
|
|||
|
||||
# MAF
|
||||
subMenu = mafSettings, "MAF sensor"
|
||||
subMenu = mafDecodingCurve, "MAF transfer function", 0, {mafAdcChannel != 16 }
|
||||
subMenu = mafDecodingCurve, "MAF transfer function", 0, {mafAdcChannel != 0 }
|
||||
subMenu = std_separator
|
||||
|
||||
# O2 sensor(s)
|
||||
|
|
@ -3138,59 +3138,59 @@ cmd_set_engine_type_default = "Z\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 = "Bias resistor", auxTempSensor1_bias_resistor, {auxTempSensor1_adcChannel != 0}
|
||||
|
||||
field = "#Here is three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", auxTempSensor1_tempC_1, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Resistance @ LT", auxTempSensor1_resistance_1, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Lowest temperature", auxTempSensor1_tempC_1, {auxTempSensor1_adcChannel != 0}
|
||||
field = "Resistance @ LT", auxTempSensor1_resistance_1, {auxTempSensor1_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", auxTempSensor1_tempC_2, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Resistance @ MT", auxTempSensor1_resistance_2, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Middle temperature", auxTempSensor1_tempC_2, {auxTempSensor1_adcChannel != 0}
|
||||
field = "Resistance @ MT", auxTempSensor1_resistance_2, {auxTempSensor1_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", auxTempSensor1_tempC_3, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Resistance @ HT", auxTempSensor1_resistance_3, {auxTempSensor1_adcChannel != 16}
|
||||
field = "Highest temperature", auxTempSensor1_tempC_3, {auxTempSensor1_adcChannel != 0}
|
||||
field = "Resistance @ HT", auxTempSensor1_resistance_3, {auxTempSensor1_adcChannel != 0}
|
||||
|
||||
; 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 = "Bias resistor", auxTempSensor2_bias_resistor, {auxTempSensor2_adcChannel != 0}
|
||||
|
||||
field = "#Here is three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", auxTempSensor2_tempC_1, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Resistance @ LT", auxTempSensor2_resistance_1, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Lowest temperature", auxTempSensor2_tempC_1, {auxTempSensor2_adcChannel != 0}
|
||||
field = "Resistance @ LT", auxTempSensor2_resistance_1, {auxTempSensor2_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", auxTempSensor2_tempC_2, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Resistance @ MT", auxTempSensor2_resistance_2, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Middle temperature", auxTempSensor2_tempC_2, {auxTempSensor2_adcChannel != 0}
|
||||
field = "Resistance @ MT", auxTempSensor2_resistance_2, {auxTempSensor2_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", auxTempSensor2_tempC_3, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Resistance @ HT", auxTempSensor2_resistance_3, {auxTempSensor2_adcChannel != 16}
|
||||
field = "Highest temperature", auxTempSensor2_tempC_3, {auxTempSensor2_adcChannel != 0}
|
||||
field = "Resistance @ HT", auxTempSensor2_resistance_3, {auxTempSensor2_adcChannel != 0}
|
||||
|
||||
dialog = tpsNum1, "Throttle #1"
|
||||
field = "!See Tools>Calibrate TPS"
|
||||
field = "Primary sensor", tps1_1AdcChannel
|
||||
field = "Primary min", tpsMin, {tps1_1AdcChannel != 16}
|
||||
field = "Primary max", tpsMax, {tps1_1AdcChannel != 16}
|
||||
field = "Primary min", tpsMin, {tps1_1AdcChannel != 0}
|
||||
field = "Primary max", tpsMax, {tps1_1AdcChannel != 0}
|
||||
field = "Secondary sensor", tps1_2AdcChannel
|
||||
field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 16}
|
||||
field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 16}
|
||||
commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate, {tps1_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
|
||||
field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0}
|
||||
field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0}
|
||||
commandButton = "Auto Calibrate TPS 1", cmb_etb_auto_calibrate, {tps1_2AdcChannel != 0 && throttlePedalPositionAdcChannel != 0}
|
||||
|
||||
dialog = tpsNum2, "Throttle #2"
|
||||
field = "Primary sensor", tps2_1AdcChannel
|
||||
field = "Primary min", tps2Min, {tps2_1AdcChannel != 16}
|
||||
field = "Primary max", tps2Max, {tps2_1AdcChannel != 16}
|
||||
field = "Primary min", tps2Min, {tps2_1AdcChannel != 0}
|
||||
field = "Primary max", tps2Max, {tps2_1AdcChannel != 0}
|
||||
field = "Secondary sensor", tps2_2AdcChannel
|
||||
field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 16}
|
||||
field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 16}
|
||||
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2, {tps2_2AdcChannel != 16 && throttlePedalPositionAdcChannel != 16}
|
||||
field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0}
|
||||
field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0}
|
||||
commandButton = "Auto Calibrate TPS 2", cmb_etb_auto_calibrate_2, {tps2_2AdcChannel != 0 && throttlePedalPositionAdcChannel != 0}
|
||||
|
||||
dialog = tpsLimits, "TPS Limits"
|
||||
field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 16}
|
||||
field = "TPS maximum valid value", tpsErrorDetectionTooHigh, {tps1_1AdcChannel != 16}
|
||||
field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0}
|
||||
field = "TPS maximum valid value", tpsErrorDetectionTooHigh, {tps1_1AdcChannel != 0}
|
||||
|
||||
dialog = tpsSensor, "TPS"
|
||||
panel = tpsLimits
|
||||
|
|
@ -3484,21 +3484,21 @@ cmd_set_engine_type_default = "Z\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 = "Bias resistor", clt_bias_resistor, {clt_adcChannel != 0}
|
||||
|
||||
field = "#Input three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 16}
|
||||
field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 16}
|
||||
field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 0}
|
||||
field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", clt_tempC_2, {clt_adcChannel != 16}
|
||||
field = "Resistance @ MT", clt_resistance_2, {clt_adcChannel != 16}
|
||||
field = "Middle temperature", clt_tempC_2, {clt_adcChannel != 0}
|
||||
field = "Resistance @ MT", clt_resistance_2, {clt_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", clt_tempC_3, {clt_adcChannel != 16}
|
||||
field = "Resistance @ HT", clt_resistance_3, {clt_adcChannel != 16}
|
||||
field = "Highest temperature", clt_tempC_3, {clt_adcChannel != 0}
|
||||
field = "Resistance @ HT", clt_resistance_3, {clt_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Linear characteristic", useLinearCltSensor, {clt_adcChannel != 16}
|
||||
field = "Linear characteristic", useLinearCltSensor, {clt_adcChannel != 0}
|
||||
|
||||
dialog = cltGauges
|
||||
gauge = CLTGauge
|
||||
|
|
@ -3511,21 +3511,21 @@ cmd_set_engine_type_default = "Z\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 = "Bias resistor", iat_bias_resistor, {iat_adcChannel != 0}
|
||||
|
||||
field = "#Input three pairs of thermistor temperature and resistance."
|
||||
field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C"
|
||||
field = ""
|
||||
field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 16}
|
||||
field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 16}
|
||||
field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 0}
|
||||
field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Middle temperature", iat_tempC_2, {iat_adcChannel != 16}
|
||||
field = "Resistance @ MT", iat_resistance_2, {iat_adcChannel != 16}
|
||||
field = "Middle temperature", iat_tempC_2, {iat_adcChannel != 0}
|
||||
field = "Resistance @ MT", iat_resistance_2, {iat_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Highest temperature", iat_tempC_3, {iat_adcChannel != 16}
|
||||
field = "Resistance @ HT", iat_resistance_3, {iat_adcChannel != 16}
|
||||
field = "Highest temperature", iat_tempC_3, {iat_adcChannel != 0}
|
||||
field = "Resistance @ HT", iat_resistance_3, {iat_adcChannel != 0}
|
||||
field = ""
|
||||
field = "Linear characteristic", useLinearIatSensor, {iat_adcChannel != 16}
|
||||
field = "Linear characteristic", useLinearIatSensor, {iat_adcChannel != 0}
|
||||
|
||||
dialog = iatGauges
|
||||
gauge = IATGauge
|
||||
|
|
@ -3538,10 +3538,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
; Sensors->Oil pressure sensor
|
||||
dialog = oilp_settings, "Oil Pressure Sensor"
|
||||
field = "Oil Pressure ADC input", oilPressure_hwChannel
|
||||
field = "low voltage", oilPressure_v1, {oilPressure_hwChannel != 16}
|
||||
field = "low pressure", oilPressure_value1, {oilPressure_hwChannel != 16}
|
||||
field = "high voltage", oilPressure_v2, {oilPressure_hwChannel != 16}
|
||||
field = "high pressure", oilPressure_value2, {oilPressure_hwChannel != 16}
|
||||
field = "low voltage", oilPressure_v1, {oilPressure_hwChannel != 0}
|
||||
field = "low pressure", oilPressure_value1, {oilPressure_hwChannel != 0}
|
||||
field = "high voltage", oilPressure_v2, {oilPressure_hwChannel != 0}
|
||||
field = "high pressure", oilPressure_value2, {oilPressure_hwChannel != 0}
|
||||
|
||||
dialog = oilPressureGauges
|
||||
gauge = OilPressGauge
|
||||
|
|
@ -3554,11 +3554,11 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
; Sensors->MAP sensor
|
||||
dialog = mapSensorAnalog, "MAP sensor", yAxis
|
||||
field = "MAP ADC input", map_sensor_hwChannel
|
||||
field = "MAP type", map_sensor_type, { map_sensor_hwChannel != 16 }
|
||||
field = "MAP value low point", map_sensor_lowValue, { map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP voltage low point", mapLowValueVoltage, { map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP value high point", map_sensor_highValue,{ map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP voltage high value", mapHighValueVoltage, { map_sensor_hwChannel != 16 && map_sensor_type == 0 }
|
||||
field = "MAP type", map_sensor_type, { map_sensor_hwChannel != 0 }
|
||||
field = "MAP value low point", map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
field = "MAP voltage low point", mapLowValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
field = "MAP value high point", map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
field = "MAP voltage high value", mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
|
||||
|
||||
dialog = mapSensorFreq, "MAP frequency sensor", yAxis
|
||||
field = "MAP Freq", frequencyReportingMapInputPin
|
||||
|
|
@ -3580,9 +3580,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
|
||||
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}
|
||||
field = baroSensor_lowValue, baroSensor_lowValue, {baroSensor_hwChannel != 0}
|
||||
field = baroSensor_highValue, baroSensor_highValue, {baroSensor_hwChannel != 0}
|
||||
field = baroSensor_type, baroSensor_type, {baroSensor_hwChannel != 0}
|
||||
|
||||
dialog = mapCurves, "MAP sampling", yAxis
|
||||
field = "isMapAveragingEnabled", isMapAveragingEnabled
|
||||
|
|
@ -3608,7 +3608,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
|
||||
dialog = egoSettings, "", yAxis
|
||||
panel = egoSettings_IO
|
||||
panel = egoSettings_sensor, {afr_hwChannel != 16 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
|
||||
panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
|
||||
field = "Enable AEM X-Series CANbus", enableAemXSeries, { canReadEnabled }
|
||||
field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
|
||||
|
||||
|
|
@ -3693,7 +3693,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
dialog = idleSettings, "", yAxis
|
||||
field = "Idle IAC control mode", idleMode
|
||||
field = useInstantRpmForIdle, useInstantRpmForIdle
|
||||
field = "use ETB for idle", useETBforIdleControl, { throttlePedalPositionAdcChannel != 16 }
|
||||
field = "use ETB for idle", useETBforIdleControl, { throttlePedalPositionAdcChannel != 0 }
|
||||
field = "ETB Idle range", etbIdleThrottleRange, {useETBforIdleControl == 1}
|
||||
field = "Use separate Ignition Table for idle", useSeparateAdvanceForIdle
|
||||
field = "Use separate VE Table for idle", useSeparateVeForIdle
|
||||
|
|
@ -4346,12 +4346,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
|
||||
dialog = etbDialogLeft
|
||||
field = "https://rusefi.com/s/etb"
|
||||
field = "Late 90s German DC Motor idle", dcMotorIdleValve, { throttlePedalPositionAdcChannel == 16 }
|
||||
field = "Late 90s German DC Motor idle", dcMotorIdleValve, { throttlePedalPositionAdcChannel == 0 }
|
||||
field = "Detailed status in console", isVerboseETB
|
||||
field = "Disable ETB Motor", pauseEtbControl
|
||||
; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility
|
||||
; criteria for the same panel when used in multiple places
|
||||
panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 16 || (useStepperIdle && useHbridges) || dcMotorIdleValve }
|
||||
panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridges) || dcMotorIdleValve }
|
||||
|
||||
dialog = etbAutotune, "PID Autotune"
|
||||
field = "First step: calibrate TPS and hit 'Burn'"
|
||||
|
|
@ -4366,8 +4366,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00"
|
|||
field = "Debug mode", debugMode
|
||||
|
||||
dialog = etbDialogRight
|
||||
panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 16 }
|
||||
panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 16) || dcMotorIdleValve }
|
||||
panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 }
|
||||
panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || dcMotorIdleValve }
|
||||
panel = etbAutotune
|
||||
|
||||
; Neutral position handling not yet implemented!
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package com.rusefi.config.generated;
|
||||
|
||||
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Sep 19 21:18:44 UTC 2020
|
||||
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Sep 20 17:44:24 UTC 2020
|
||||
|
||||
// by class com.rusefi.output.FileJavaFieldsConsumer
|
||||
import com.rusefi.config.*;
|
||||
|
|
@ -23,7 +23,7 @@ public class Fields {
|
|||
public static final int activateAuxPid2_offset = 76;
|
||||
public static final int activateAuxPid3_offset = 76;
|
||||
public static final int activateAuxPid4_offset = 76;
|
||||
public static final int ADC_CHANNEL_NONE = 16;
|
||||
public static final int ADC_CHANNEL_NONE = 0;
|
||||
public static final int adcVcc_offset = 548;
|
||||
public static final int afr_alignmentFill_afr_offset = 561;
|
||||
public static final int afr_hwChannel_offset = 560;
|
||||
|
|
@ -1125,7 +1125,7 @@ public class Fields {
|
|||
public static final int servoOutputPins8_offset = 3147;
|
||||
public static final int showHumanReadableWarning_offset = 976;
|
||||
public static final int showSdCardWarning_offset = 76;
|
||||
public static final int SIGNATURE_HASH = 1670828001;
|
||||
public static final int SIGNATURE_HASH = 1566248530;
|
||||
public static final int silentTriggerError_offset = 1464;
|
||||
public static final int slowAdcAlpha_offset = 2088;
|
||||
public static final int solenoidPadding_offset = 1198;
|
||||
|
|
@ -1387,7 +1387,7 @@ public class Fields {
|
|||
public static final char TS_SD_R_COMMAND = 'r';
|
||||
public static final char TS_SD_W_COMMAND = 'w';
|
||||
public static final char TS_SET_LOGGER_SWITCH = 'l';
|
||||
public static final String TS_SIGNATURE = "rusEFI 2020.09.19.all.1670828001";
|
||||
public static final String TS_SIGNATURE = "rusEFI 2020.09.20.all.1566248530";
|
||||
public static final char TS_SINGLE_WRITE_COMMAND = 'W';
|
||||
public static final int tunerStudioSerialSpeed_offset = 728;
|
||||
public static final int twoWireBatchIgnition_offset = 1476;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<roms>
|
||||
|
||||
<!-- was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh Sat Sep 19 21:18:45 UTC 2020 -->
|
||||
<!-- was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh Sun Sep 20 17:44:25 UTC 2020 -->
|
||||
|
||||
<rom>
|
||||
<romid>
|
||||
|
|
|
|||
Loading…
Reference in New Issue