parent
04e558fe11
commit
5afbcd55c7
|
@ -1,4 +1,4 @@
|
|||
// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon May 13 17:16:33 UTC 2024
|
||||
// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 14 17:16:20 UTC 2024
|
||||
// by class com.rusefi.output.CHeaderConsumer
|
||||
// begin
|
||||
#pragma once
|
||||
|
@ -216,12 +216,10 @@ struct gppwm_channel {
|
|||
*/
|
||||
gppwm_channel_e rpmAxis;
|
||||
/**
|
||||
* units: load
|
||||
* offset 10
|
||||
*/
|
||||
scaled_channel<int16_t, 2, 1> loadBins[GPPWM_LOAD_COUNT];
|
||||
/**
|
||||
* units: RPM
|
||||
* offset 26
|
||||
*/
|
||||
int16_t rpmBins[GPPWM_RPM_COUNT];
|
||||
|
@ -4816,7 +4814,6 @@ struct persistent_config_s {
|
|||
*/
|
||||
scaled_channel<uint8_t, 1, 2> boostTableClosedLoop[BOOST_LOAD_COUNT][BOOST_RPM_COUNT];
|
||||
/**
|
||||
* units: %
|
||||
* offset 5484
|
||||
*/
|
||||
uint8_t boostTpsBins[BOOST_LOAD_COUNT];
|
||||
|
@ -5619,4 +5616,4 @@ struct persistent_config_s {
|
|||
static_assert(sizeof(persistent_config_s) == 22656);
|
||||
|
||||
// end
|
||||
// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon May 13 17:16:33 UTC 2024
|
||||
// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 14 17:16:20 UTC 2024
|
||||
|
|
|
@ -1269,7 +1269,7 @@
|
|||
#define show_microRusEFI_presets false
|
||||
#define show_Proteus_presets false
|
||||
#define show_test_presets true
|
||||
#define SIGNATURE_HASH 2981332939
|
||||
#define SIGNATURE_HASH 307058682
|
||||
#define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin"
|
||||
#define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image"
|
||||
#define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin"
|
||||
|
@ -1656,7 +1656,7 @@
|
|||
#define ts_show_vr_threshold_all false
|
||||
#define ts_show_vr_threshold_pins true
|
||||
#define ts_show_vvt_output true
|
||||
#define TS_SIGNATURE "rusEFI default.2024.05.13.core8.2981332939"
|
||||
#define TS_SIGNATURE "rusEFI default.2024.05.14.core8.307058682"
|
||||
#define TS_SIMULATE_CAN '>'
|
||||
#define TS_SIMULATE_CAN_char >
|
||||
#define TS_SINGLE_WRITE_COMMAND 'W'
|
||||
|
|
|
@ -2,5 +2,5 @@
|
|||
// was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer
|
||||
//
|
||||
|
||||
#define SIGNATURE_HASH 2981332939
|
||||
#define TS_SIGNATURE "rusEFI default.2024.05.13.core8.2981332939"
|
||||
#define SIGNATURE_HASH 307058682
|
||||
#define TS_SIGNATURE "rusEFI default.2024.05.14.core8.307058682"
|
||||
|
|
|
@ -38,12 +38,12 @@ enable2ndByteCanID = false
|
|||
|
||||
[MegaTune]
|
||||
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
|
||||
signature = "rusEFI default.2024.05.13.core8.2981332939"
|
||||
signature = "rusEFI default.2024.05.14.core8.307058682"
|
||||
|
||||
[TunerStudio]
|
||||
queryCommand = "S"
|
||||
versionInfo = "V" ; firmware version for title bar.
|
||||
signature= "rusEFI default.2024.05.13.core8.2981332939" ; signature is expected to be 7 or more characters.
|
||||
signature= "rusEFI default.2024.05.14.core8.307058682" ; signature is expected to be 7 or more characters.
|
||||
|
||||
; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
|
||||
useLegacyFTempUnits = false
|
||||
|
@ -100,7 +100,7 @@ enable2ndByteCanID = false
|
|||
#define adc_channel_e_list="NONE","On-board Battery Sense (A0)","Analog Inputs 1 (A1)","Analog Inputs 2 (A2)","Analog Inputs 3 (A3)","Analog Inputs 4 (A4)","On-board MAP (A5)","Analog Inputs 6 (A6)","Analog Inputs 7 (A7)","On-board BARO (B0)","Analog Inputs 9 (B1)","Analog Inputs 10 (C0)","Primary On-board O2 (C1)","Secondary On-board O2 (C2)","Analog Inputs 13 (C3)","Analog Inputs 14 (C4)","Analog Inputs 15 (C5)"
|
||||
|
||||
; CONFIG_DEFINITION_START
|
||||
; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon May 13 17:16:33 UTC 2024
|
||||
; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 14 17:16:20 UTC 2024
|
||||
|
||||
pageSize = 22656
|
||||
page = 1
|
||||
|
@ -1056,8 +1056,8 @@ gppwm1_onAboveDuty = scalar, U08, 2654, "%", 1, 0, 0, 100, 0
|
|||
gppwm1_offBelowDuty = scalar, U08, 2655, "%", 1, 0, 0, 100, 0
|
||||
gppwm1_loadAxis = bits, U08, 2656, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)", "Baro pressure", "EGT 1", "EGT 2", "INVALID", "INVALID", "INVALID"
|
||||
gppwm1_rpmAxis = bits, U08, 2657, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)", "Baro pressure", "EGT 1", "EGT 2", "INVALID", "INVALID", "INVALID"
|
||||
gppwm1_loadBins = array, S16, 2658, [8], "load", 0.5, 0, -1000, 10000, 1
|
||||
gppwm1_rpmBins = array, S16, 2674, [8], "RPM", 1, 0, -30000, 30000, 0
|
||||
gppwm1_loadBins = array, S16, 2658, [8], "", 0.5, 0, -1000, 10000, 1
|
||||
gppwm1_rpmBins = array, S16, 2674, [8], "", 1, 0, -30000, 30000, 0
|
||||
gppwm1_table = array, U08, 2690, [8x8], "duty", 0.5, 0, 0, 100, 1
|
||||
gppwm2_pin = bits, U16, 2756, [0:8], $output_pin_e_list
|
||||
gppwm2_dutyIfError = scalar, U08, 2758, "%", 1, 0, 0, 100, 0
|
||||
|
@ -1066,8 +1066,8 @@ gppwm2_onAboveDuty = scalar, U08, 2762, "%", 1, 0, 0, 100, 0
|
|||
gppwm2_offBelowDuty = scalar, U08, 2763, "%", 1, 0, 0, 100, 0
|
||||
gppwm2_loadAxis = bits, U08, 2764, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)", "Baro pressure", "EGT 1", "EGT 2", "INVALID", "INVALID", "INVALID"
|
||||
gppwm2_rpmAxis = bits, U08, 2765, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)", "Baro pressure", "EGT 1", "EGT 2", "INVALID", "INVALID", "INVALID"
|
||||
gppwm2_loadBins = array, S16, 2766, [8], "load", 0.5, 0, -1000, 10000, 1
|
||||
gppwm2_rpmBins = array, S16, 2782, [8], "RPM", 1, 0, -30000, 30000, 0
|
||||
gppwm2_loadBins = array, S16, 2766, [8], "", 0.5, 0, -1000, 10000, 1
|
||||
gppwm2_rpmBins = array, S16, 2782, [8], "", 1, 0, -30000, 30000, 0
|
||||
gppwm2_table = array, U08, 2798, [8x8], "duty", 0.5, 0, 0, 100, 1
|
||||
gppwm3_pin = bits, U16, 2864, [0:8], $output_pin_e_list
|
||||
gppwm3_dutyIfError = scalar, U08, 2866, "%", 1, 0, 0, 100, 0
|
||||
|
@ -1076,8 +1076,8 @@ gppwm3_onAboveDuty = scalar, U08, 2870, "%", 1, 0, 0, 100, 0
|
|||
gppwm3_offBelowDuty = scalar, U08, 2871, "%", 1, 0, 0, 100, 0
|
||||
gppwm3_loadAxis = bits, U08, 2872, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)", "Baro pressure", "EGT 1", "EGT 2", "INVALID", "INVALID", "INVALID"
|
||||
gppwm3_rpmAxis = bits, U08, 2873, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)", "Baro pressure", "EGT 1", "EGT 2", "INVALID", "INVALID", "INVALID"
|
||||
gppwm3_loadBins = array, S16, 2874, [8], "load", 0.5, 0, -1000, 10000, 1
|
||||
gppwm3_rpmBins = array, S16, 2890, [8], "RPM", 1, 0, -30000, 30000, 0
|
||||
gppwm3_loadBins = array, S16, 2874, [8], "", 0.5, 0, -1000, 10000, 1
|
||||
gppwm3_rpmBins = array, S16, 2890, [8], "", 1, 0, -30000, 30000, 0
|
||||
gppwm3_table = array, U08, 2906, [8x8], "duty", 0.5, 0, 0, 100, 1
|
||||
gppwm4_pin = bits, U16, 2972, [0:8], $output_pin_e_list
|
||||
gppwm4_dutyIfError = scalar, U08, 2974, "%", 1, 0, 0, 100, 0
|
||||
|
@ -1086,8 +1086,8 @@ gppwm4_onAboveDuty = scalar, U08, 2978, "%", 1, 0, 0, 100, 0
|
|||
gppwm4_offBelowDuty = scalar, U08, 2979, "%", 1, 0, 0, 100, 0
|
||||
gppwm4_loadAxis = bits, U08, 2980, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)", "Baro pressure", "EGT 1", "EGT 2", "INVALID", "INVALID", "INVALID"
|
||||
gppwm4_rpmAxis = bits, U08, 2981, [0:4], "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)", "Baro pressure", "EGT 1", "EGT 2", "INVALID", "INVALID", "INVALID"
|
||||
gppwm4_loadBins = array, S16, 2982, [8], "load", 0.5, 0, -1000, 10000, 1
|
||||
gppwm4_rpmBins = array, S16, 2998, [8], "RPM", 1, 0, -30000, 30000, 0
|
||||
gppwm4_loadBins = array, S16, 2982, [8], "", 0.5, 0, -1000, 10000, 1
|
||||
gppwm4_rpmBins = array, S16, 2998, [8], "", 1, 0, -30000, 30000, 0
|
||||
gppwm4_table = array, U08, 3014, [8x8], "duty", 0.5, 0, 0, 100, 1
|
||||
mc33_i_boost = scalar, U16, 3080, "mA", 1, 0, 1000, 25000, 0
|
||||
mc33_i_peak = scalar, U16, 3082, "mA", 1, 0, 1000, 20000, 0
|
||||
|
@ -1412,7 +1412,7 @@ unusedGapHere = array, U08, 5332, [16], "", 1, 0, 0, 100, 0
|
|||
boostTableOpenLoop = array, U08, 5348, [8x8], "", 0.5, 0, 0, 100, 1
|
||||
boostRpmBins = array, U08, 5412, [8], "RPM", 100.0, 0, 0, 25000, 0
|
||||
boostTableClosedLoop = array, U08, 5420, [8x8], "", 2.0, 0, 0, 3000, 0
|
||||
boostTpsBins = array, U08, 5484, [8], "%", 1, 0, 0, 100, 0
|
||||
boostTpsBins = array, U08, 5484, [8], "", 1, 0, 0, 100, 0
|
||||
pedalToTpsTable = array, U08, 5492, [8x8], "%", 1, 0, 0, 100, 0
|
||||
pedalToTpsPedalBins = array, U08, 5556, [8], "%", 1, 0, 0, 120, 0
|
||||
pedalToTpsRpmBins = array, U08, 5564, [8], "RPM", 100.0, 0, 0, 25000, 0
|
||||
|
@ -3380,7 +3380,8 @@ lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0
|
|||
wbo0_hasFault = { enableAemXSeries && (faultCode0 >= 3) }
|
||||
|
||||
[PcVariables]
|
||||
fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua"
|
||||
fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua"
|
||||
pwmAxisLabels = bits, U08, [0:4], "Zero", "TPS %", "MAP kPa", "CLT C", "IAT C", "Fuel Load", "Ignition Load", "Aux Temp 1 C", "Aux Temp 2 C", "Accel Pedal %", "Battery Voltage Volts", "VVT 1 I Deg", "VVT 1 E Deg", "VVT 2 I Deg", "VVT 2 E Deg", "Ethanol (Flex) %", "Aux Linear 1 *", "Aux Linear 2 *", "GPPWM Output 1 %", "GPPWM Output 2 %", "GPPWM Output 3 %", "GPPWM Output 4 %", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)", "Baro pressure kPa", "EGT 1 C", "EGT 2 C", "INVALID", "INVALID", "INVALID"
|
||||
|
||||
tuneCrcPcVariable = continuousChannelValue, tuneCrc16
|
||||
|
||||
|
@ -4093,7 +4094,8 @@ curve = rangeMatrix, "Range Switch Input Matrix"
|
|||
yBins = tractionControlSlipBins, wheelSlipRatio
|
||||
zBins = tractionControlIgnitionSkip
|
||||
|
||||
table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1
|
||||
table = boostTableTbl, boostMapOpen, "Boost control duty cycle (open loop)", 1
|
||||
xyLabels = "RPMValue", {bitStringValue(pwmAxisLabels, boostOpenLoopYAxis)}
|
||||
xBins = boostRpmBins, RPMValue
|
||||
yBins = boostTpsBins, TPSValue
|
||||
zBins = boostTableOpenLoop
|
||||
|
@ -4483,25 +4485,25 @@ curve = rangeMatrix, "Range Switch Input Matrix"
|
|||
upDownLabel = "(Later)", "(Sooner)"
|
||||
|
||||
table = gppwm1Tbl, gppwm1Map, "GP#1", 1
|
||||
xyLabels = "RPM", ""
|
||||
xyLabels = {bitStringValue(pwmAxisLabels, gppwm1_rpmAxis)}, {bitStringValue(pwmAxisLabels, gppwm1_loadAxis)}
|
||||
xBins = gppwm1_rpmBins, gppwmXAxis1
|
||||
yBins = gppwm1_loadBins, gppwmYAxis1
|
||||
zBins = gppwm1_table
|
||||
|
||||
table = gppwm2Tbl, gppwm2Map, "GP#2", 1
|
||||
xyLabels = "RPM", ""
|
||||
xyLabels = {bitStringValue(pwmAxisLabels, gppwm2_rpmAxis)}, {bitStringValue(pwmAxisLabels, gppwm2_loadAxis)}
|
||||
xBins = gppwm2_rpmBins, gppwmXAxis2
|
||||
yBins = gppwm2_loadBins, gppwmYAxis2
|
||||
zBins = gppwm2_table
|
||||
|
||||
table = gppwm3Tbl, gppwm3Map, "GP#3", 1
|
||||
xyLabels = "RPM", ""
|
||||
xyLabels = {bitStringValue(pwmAxisLabels, gppwm3_rpmAxis)}, {bitStringValue(pwmAxisLabels, gppwm3_loadAxis)}
|
||||
xBins = gppwm3_rpmBins, gppwmXAxis3
|
||||
yBins = gppwm3_loadBins, gppwmYAxis3
|
||||
zBins = gppwm3_table
|
||||
|
||||
table = gppwm4Tbl, gppwm4Map, "GP#4", 1
|
||||
xyLabels = "RPM", ""
|
||||
xyLabels = {bitStringValue(pwmAxisLabels, gppwm4_rpmAxis)}, {bitStringValue(pwmAxisLabels, gppwm4_loadAxis)}
|
||||
xBins = gppwm4_rpmBins, gppwmXAxis4
|
||||
yBins = gppwm4_loadBins, gppwmYAxis4
|
||||
zBins = gppwm4_table
|
||||
|
@ -5873,7 +5875,7 @@ menuDialog = main
|
|||
# Accel enrichment
|
||||
subMenu = AccelEnrich, "Acceleration enrichment", 0, {isInjectionEnabled == 1}
|
||||
subMenu = tpsTpsAccelTbl, "TPS/TPS acceleration extra fuel", 0, {isInjectionEnabled == 1}
|
||||
subMenu = tpsTspRpmCorrection, "TPS/TPS extra fuelRPM correction", 0, {isInjectionEnabled == 1}
|
||||
subMenu = tpsTspRpmCorrection, "TPS/TPS extra fuel RPM correction", 0, {isInjectionEnabled == 1}
|
||||
|
||||
groupMenu = "Wall wetting AE"
|
||||
groupChildMenu = wwTauCurves, "Evap time", 0, { complexWallModel != 0 }
|
||||
|
@ -5933,14 +5935,14 @@ menuDialog = main
|
|||
subMenu = crankingAdvanceCurve, "Cranking ignition advance", 0, {useSeparateAdvanceForCranking == 1}
|
||||
subMenu = std_separator
|
||||
|
||||
subMenu = cltCrankingCurve, "Cranking IAC CLT multiplier", 0, {overrideCrankingIacSetting == 1}
|
||||
subMenu = cltCrankingCurve, "Cranking Idle Air CLT multiplier", 0, {overrideCrankingIacSetting == 1}
|
||||
|
||||
menu = "&Idle"
|
||||
subMenu = idleSettings, "Idle settings"
|
||||
subMenu = idlehw, "Idle hardware"
|
||||
subMenu = std_separator
|
||||
subMenu = cltIdleRPMCurve, "Target RPM"
|
||||
subMenu = cltIdleCurve, "CLT multiplier"
|
||||
subMenu = cltIdleCurve, "Idle CLT multiplier"
|
||||
subMenu = std_separator
|
||||
subMenu = idleTimingPidCorrDialog, "Closed-loop idle timing"
|
||||
subMenu = iacPidMultTbl, "IAC PID multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1}
|
||||
|
|
Loading…
Reference in New Issue