GitHub git update Action
parent
ac1f438ed2
commit
2c51bf7b52
|
|
@ -1,4 +1,4 @@
|
|||
// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jul 16 21:12:14 UTC 2024
|
||||
// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Fri Jul 26 21:11:56 UTC 2024
|
||||
// by class com.rusefi.output.CHeaderConsumer
|
||||
// begin
|
||||
#pragma once
|
||||
|
|
@ -5674,8 +5674,28 @@ struct persistent_config_s {
|
|||
* offset 24892
|
||||
*/
|
||||
uint16_t alternatorVoltageTargetRpmBins[ALTERNATOR_VOLTAGE_TARGET_SIZE];
|
||||
/**
|
||||
* units: C
|
||||
* offset 24900
|
||||
*/
|
||||
float cltBoostCorrBins[BOOST_CURVE_SIZE];
|
||||
/**
|
||||
* units: ratio
|
||||
* offset 24920
|
||||
*/
|
||||
float cltBoostCorr[BOOST_CURVE_SIZE];
|
||||
/**
|
||||
* units: C
|
||||
* offset 24940
|
||||
*/
|
||||
float iatBoostCorrBins[BOOST_CURVE_SIZE];
|
||||
/**
|
||||
* units: ratio
|
||||
* offset 24960
|
||||
*/
|
||||
float iatBoostCorr[BOOST_CURVE_SIZE];
|
||||
};
|
||||
static_assert(sizeof(persistent_config_s) == 24900);
|
||||
static_assert(sizeof(persistent_config_s) == 24980);
|
||||
|
||||
// end
|
||||
// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jul 16 21:12:14 UTC 2024
|
||||
// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Fri Jul 26 21:11:56 UTC 2024
|
||||
|
|
|
|||
|
|
@ -138,6 +138,7 @@
|
|||
#define BOARD_TABLES_FROM_FILE
|
||||
#define BOARD_VE_MENU_FROM_FILE
|
||||
#define BOOST_BLEND_COUNT 2
|
||||
#define BOOST_CURVE_SIZE 5
|
||||
#define BOOST_LOAD_COUNT 8
|
||||
#define BOOST_RPM_COUNT 8
|
||||
#define boostType_e_auto_enum 0="OPEN_LOOP",1="CLOSED_LOOP"
|
||||
|
|
@ -1209,7 +1210,7 @@
|
|||
#define PACK_PERCENT_BYTE_MULT 100.0
|
||||
#define PEDAL_TO_TPS_SIZE 8
|
||||
#define PERCENT_TRIM_BYTE_PACKING_DIV 0.02
|
||||
#define persistent_config_s_size 24900
|
||||
#define persistent_config_s_size 24980
|
||||
#define pid_s_size 20
|
||||
#define pin_input_mode_e_auto_enum 0="PI_DEFAULT",2="PI_PULLDOWN",1="PI_PULLUP"
|
||||
#define pin_input_mode_e_enum "DEFAULT", "PULLUP", "PULLDOWN"
|
||||
|
|
@ -1291,7 +1292,7 @@
|
|||
#define show_Proteus_presets false
|
||||
#define show_test_presets false
|
||||
#define show_vvt_output_pin true
|
||||
#define SIGNATURE_HASH 2635371453
|
||||
#define SIGNATURE_HASH 2490949806
|
||||
#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"
|
||||
|
|
@ -1348,7 +1349,7 @@
|
|||
#define TOOTH_PACKET_SIZE 2
|
||||
#define TOP_DEAD_CENTER_MESSAGE "r"
|
||||
#define TORQUE_CURVE_SIZE 6
|
||||
#define TOTAL_CONFIG_SIZE 24900
|
||||
#define TOTAL_CONFIG_SIZE 24980
|
||||
#define TPS_2_BYTE_PACKING_MULT 100
|
||||
#define TPS_PPS_TOO_HIGH_THRESHOLD 110
|
||||
#define TPS_PPS_TOO_LOW_THRESHOLD -10
|
||||
|
|
@ -1713,7 +1714,7 @@
|
|||
#define ts_show_vvt_output_pin true
|
||||
#define ts_show_wbo_canbus_index true
|
||||
#define ts_show_wbo_canbus_set_index true
|
||||
#define TS_SIGNATURE "rusEFI master.2024.07.25.paralela.2635371453"
|
||||
#define TS_SIGNATURE "rusEFI master.2024.07.26.paralela.2490949806"
|
||||
#define TS_SIMULATE_CAN '>'
|
||||
#define TS_SIMULATE_CAN_char >
|
||||
#define TS_SINGLE_WRITE_COMMAND 'W'
|
||||
|
|
@ -1747,7 +1748,7 @@
|
|||
#define uart_device_e_UART_DEVICE_4 4
|
||||
#define uart_device_e_UART_NONE 0
|
||||
#define UiMode_auto_enum 0="FULL",1="INSTALLATION",2="TUNING"
|
||||
#define UiMode_enum "Full", "Installation", "Tuning"
|
||||
#define UiMode_enum "Full", "INVALID", "Tuning"
|
||||
#define UiMode_FULL 0
|
||||
#define UiMode_INSTALLATION 1
|
||||
#define UiMode_TUNING 2
|
||||
|
|
|
|||
|
|
@ -2,5 +2,5 @@
|
|||
// was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer
|
||||
//
|
||||
|
||||
#define SIGNATURE_HASH 2635371453
|
||||
#define TS_SIGNATURE "rusEFI master.2024.07.25.paralela.2635371453"
|
||||
#define SIGNATURE_HASH 2490949806
|
||||
#define TS_SIGNATURE "rusEFI master.2024.07.26.paralela.2490949806"
|
||||
|
|
|
|||
|
|
@ -38,12 +38,12 @@ enable2ndByteCanID = false
|
|||
|
||||
[MegaTune]
|
||||
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
|
||||
signature = "rusEFI master.2024.07.25.paralela.2635371453"
|
||||
signature = "rusEFI master.2024.07.26.paralela.2490949806"
|
||||
|
||||
[TunerStudio]
|
||||
queryCommand = "S"
|
||||
versionInfo = "V" ; firmware version for title bar.
|
||||
signature= "rusEFI master.2024.07.25.paralela.2635371453" ; signature is expected to be 7 or more characters.
|
||||
signature= "rusEFI master.2024.07.26.paralela.2490949806" ; 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,9 +100,9 @@ enable2ndByteCanID = false
|
|||
#define adc_channel_e_list="NONE","TPS (A0)","MAP (A1)","CLT (A2)","INVALID","INVALID","TPS (A5)","INVALID","INVALID","O2-2 (B0)","INVALID","INVALID","BattV (C1)","IAT (C2)","O2-1 (C3)","PPS1 (C4)","PPS2 (C5)"
|
||||
|
||||
; CONFIG_DEFINITION_START
|
||||
; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Jul 25 21:12:09 UTC 2024
|
||||
; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Fri Jul 26 21:11:56 UTC 2024
|
||||
|
||||
pageSize = 24900
|
||||
pageSize = 24980
|
||||
page = 1
|
||||
engineType = bits, U16, 0, [0:6], 0="DEFAULT_FRANKENSO",22="BMW_M52",50="BMW_M73_MRE",51="BMW_M73_MRE_SLAVE",38="DISCOVERY_PDM",2="DODGE_NEON_1995",46="DODGE_NEON_2003_CRANK",64="DODGE_RAM",61="EEPROM_BENCH_ENGINE",58="ETB_BENCH_ENGINE",21="ET_BOSCH_QUICK_START",24="ET_TEST_WITH_BOSCH_QUICK_START",35="ET_UNUSED_35",55="ET_UNUSED_55",105="FERRARI_F136",3="FORD_ASPIRE_1996",11="FORD_COYOTE",14="FORD_ESCORT_GT",7="FORD_INLINE_6_1995",40="FRANKENSO_BMW_M73_F",41="FRANKENSO_MIATA_NA6_MAP",49="FRANKENSO_QA_ENGINE",59="FRANKENSO_TEST_33810",56="FRANKENSO_TEST_TLE9104",15="FUEL_BENCH",98="GM_SBC",8="GY6_139QMB",6="HARLEY",84="HELLEN_121_NISSAN_4_CYL",72="HELLEN_121_NISSAN_6_CYL",85="HELLEN_121_NISSAN_8_CYL",87="HELLEN_121_NISSAN_ALMERA_N16",71="HELLEN_121_VAG_4_CYL",77="HELLEN_121_VAG_5_CYL",81="HELLEN_121_VAG_8_CYL",78="HELLEN_121_VAG_V6_CYL",79="HELLEN_121_VAG_VR6_CYL",36="HELLEN_128_MERCEDES_4_CYL",88="HELLEN_128_MERCEDES_6_CYL",89="HELLEN_128_MERCEDES_8_CYL",82="HELLEN_154_HYUNDAI_COUPE_BK1",95="HELLEN_154_HYUNDAI_COUPE_BK2",76="HELLEN_154_VAG",75="HELLEN_2CHAN_STIM_QC",74="HELLEN_4CHAN_STIM_QC",57="HELLEN_HONDA_BCM",43="HONDA_600",90="HONDA_K",66="HONDA_OBD1",91="HONDA_OBD2A",104="HYUNDAI_PB",60="L9779_BENCH_ENGINE",54="MAVERICK_X3",34="MAZDA_MIATA_NA6",80="MAZDA_MIATA_NA94",10="MAZDA_MIATA_NA96",83="MAZDA_MIATA_NB1",69="MAZDA_MIATA_NB2",86="MAZDA_MIATA_NB2_36",20="MAZDA_MIATA_NC",33="ME17_9_MISC",68="MERCEDES_M111",1="MIATA_PROTEUS_TCU",99="MINIMAL_PINS",12="MITSUBISHI_3A92",16="MITSUBISHI_4G93",31="MRE_BOARD_NEW_TEST",23="MRE_BODY_CONTROL",4="MRE_SECONDARY_CAN",37="MRE_SUBARU_EJ18",62="MRE_VW_B6",5="NISSAN_PRIMERA",9="POLARIS_RZR",30="PROTEUS_ANALOG_PWM_TEST",63="PROTEUS_BMW_M73",27="PROTEUS_GM_LS_4",25="PROTEUS_LUA_DEMO",103="PROTEUS_NISSAN_VQ35",42="PROTEUS_QC_TEST_BOARD",73="PROTEUS_STIM_QC",39="PROTEUS_VW_B6",29="SACHS",92="SIMULATOR_CONFIG",70="SUBARU_EG33",17="TCU_4R70W",100="TEST_100",101="TEST_101",18="TEST_33816",28="TEST_CRANK_ENGINE",48="TEST_DC_WASTEGATE_DISCOVERY",26="TEST_ENGINE",45="TEST_ENGINE_VVT",52="TEST_ISSUE_366_BOTH",53="TEST_ISSUE_366_RISE",93="TEST_ISSUE_6451",19="TEST_ROTARY",13="TOYOTA_1NZ_FE",44="TOYOTA_2JZ_GTE_VVTi",102="UNUSED102",47="UNUSED47",67="UNUSED67",94="UNUSED94",65="UNUSED_65",97="UNUSED_97",32="VW_ABA",96="WASTEGATE_PROTEUS_TEST"
|
||||
startButtonSuppressOnStartUpMs = scalar, U16, 2, "", 1, 0, 0, 32000, 0
|
||||
|
|
@ -1244,7 +1244,7 @@ luaDigitalInputPinModes8 = bits, U08, 3563, [0:1], "DEFAULT", "PULLUP", "PULLDOW
|
|||
customSentTpsMax = scalar, U16, 3564, "", 1, 0, 0, 32000, 0
|
||||
kLineBaudRate = scalar, U16, 3566, "", 1, 0, 0, 32000, 0
|
||||
canGpioType = bits, S08, 3568, [0:1], "None", "DRT protocol", "MS protocol", "INVALID"
|
||||
uiMode = bits, S08, 3569, [0:1], "Full", "Installation", "Tuning", "INVALID"
|
||||
uiMode = bits, S08, 3569, [0:1], "Full", "INVALID", "Tuning", "INVALID"
|
||||
hpfpPeakPos = scalar, S16, 3570, "deg", 1, 0, -719, 719, 0
|
||||
kLinePeriodUs = scalar, S16, 3572, "us", 1, 0, 0, 30000, 0
|
||||
rpmSoftLimitWindowSize = scalar, U08, 3574, "RPM", 10.0, 0, 0, 2500, 0
|
||||
|
|
@ -1693,7 +1693,11 @@ tcu_shiftTime = scalar, F32, 24848, "ms", 1, 0, 0, 3000, 0
|
|||
alternatorVoltageTargetTable = array, S16, 24852, [4x4], "Volts", 0.1, 0, 0, 30, 1
|
||||
alternatorVoltageTargetLoadBins = array, U16, 24884, [4], "Load", 1, 0, 0, 1000, 0
|
||||
alternatorVoltageTargetRpmBins = array, U16, 24892, [4], "RPM", 1, 0, 0, 18000, 0
|
||||
; total TS size = 24900
|
||||
cltBoostCorrBins = array, F32, 24900, [5], "C", 1, 0, -100, 250, 2
|
||||
cltBoostCorr = array, F32, 24920, [5], "ratio", 1, 0, 0, 5, 2
|
||||
iatBoostCorrBins = array, F32, 24940, [5], "C", 1, 0, -100, 250, 2
|
||||
iatBoostCorr = array, F32, 24960, [5], "ratio", 1, 0, 0, 5, 2
|
||||
; total TS size = 24980
|
||||
[SettingContextHelp]
|
||||
engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X"
|
||||
sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm"
|
||||
|
|
@ -3760,6 +3764,22 @@ lambdaTimeSinceGood = scalar, U16, 1752, "sec", 0.01, 0
|
|||
yBins = cltFuelCorr
|
||||
gauge = CLTGauge
|
||||
|
||||
curve = cltBoostCorrCurve, "Coolant Temperature Boost Multiplier"
|
||||
columnLabel = "Coolant", "Multiplier"
|
||||
xAxis = -40, 120, 9
|
||||
yAxis = 0, 3, 10
|
||||
xBins = cltBoostCorrBins, coolant
|
||||
yBins = cltBoostCorr
|
||||
gauge = CLTGauge
|
||||
|
||||
curve = iatBoostCorrCurve, "Intake Air Temperature Boost Multiplier"
|
||||
columnLabel = "Air Temp", "Multiplier"
|
||||
xAxis = -40, 120, 9
|
||||
yAxis = 0, 2, 11
|
||||
xBins = iatBoostCorrBins, intake
|
||||
yBins = iatBoostCorr
|
||||
gauge = IATGauge
|
||||
|
||||
curve = crankingCltCurve, "Cranking Coolant Temperature Multiplier"
|
||||
columnLabel = "Coolant", "Multiplier"
|
||||
xAxis = -40, 120, 9
|
||||
|
|
@ -5903,9 +5923,9 @@ menuDialog = main
|
|||
menu = "Fuel"
|
||||
# basic
|
||||
subMenu = injectorConfig, "Injection configuration"
|
||||
subMenu = injectionSettings, "Injection hardware", 0, {isInjectionEnabled == 1}
|
||||
subMenu = cylinderBankSelect, "Cylinder bank selection", 0, {isInjectionEnabled == 1}
|
||||
subMenu = injectorNonlinear, "Injector small-pulse correction", 0, {isInjectionEnabled == 1}
|
||||
subMenu = injectionSettings, "Injection hardware", {isInjectionEnabled == 1}, { uiMode == 0 || uiMode == 1 }
|
||||
subMenu = cylinderBankSelect, "Cylinder bank selection", {isInjectionEnabled == 1}, { uiMode == 0 || uiMode == 1 }
|
||||
subMenu = injectorNonlinear, "Injector small-pulse correction", {isInjectionEnabled == 1}, { uiMode == 0 || uiMode == 1 }
|
||||
|
||||
subMenu = stagedInjection, "Staged injection", 0, {isInjectionEnabled}
|
||||
subMenu = stagedInjectionOutputs, "Staged injection outputs", 0, {isInjectionEnabled && enableStagedInjection}
|
||||
|
|
@ -6014,20 +6034,20 @@ menuDialog = main
|
|||
|
||||
menu = "&Cranking"
|
||||
subMenu = crankingDialog, "Cranking settings"
|
||||
subMenu = postCrankingEnrichmentTbl,"After-start enrichment"
|
||||
subMenu = primingFuelPulsePanel, "Priming pulse"
|
||||
subMenu = postCrankingEnrichmentTbl,"After-start enrichment", { 1 }, { uiMode == 0 || uiMode == 1 }
|
||||
subMenu = primingFuelPulsePanel, "Priming pulse", { 1 }, { uiMode == 0 || uiMode == 1 }
|
||||
subMenu = std_separator
|
||||
|
||||
subMenu = crankingCltCurve, "Fuel CLT multiplier"
|
||||
subMenu = crankingCltCurveE100, "Fuel CLT multiplier (Flex Fuel E85)", 0, { flexSensorPin != 0 && flexCranking }
|
||||
subMenu = crankingCltCurveE100, "Fuel CLT multiplier (Flex Fuel E85)", { flexSensorPin != 0 && flexCranking }, { uiMode == 0 || uiMode == 1 }
|
||||
subMenu = crankingCycleFuelMultTbl, "Fuel duration multiplier"
|
||||
subMenu = crankingTpsCurve, "Fuel TPS multiplier"
|
||||
subMenu = std_separator
|
||||
|
||||
subMenu = crankingAdvanceCurve, "Cranking ignition advance", 0, {useSeparateAdvanceForCranking == 1}
|
||||
subMenu = crankingAdvanceCurve, "Cranking ignition advance", {useSeparateAdvanceForCranking == 1}, { uiMode == 0 || uiMode == 1 }
|
||||
subMenu = std_separator
|
||||
|
||||
subMenu = cltCrankingCurve, "Cranking Idle Air CLT multiplier", 0, {overrideCrankingIacSetting == 1}
|
||||
subMenu = cltCrankingCurve, "Cranking Idle Air CLT multiplier", {overrideCrankingIacSetting == 1}, { uiMode == 0 || uiMode == 1 }
|
||||
|
||||
menu = "&Idle"
|
||||
subMenu = idleSettings, "Idle settings"
|
||||
|
|
@ -6053,6 +6073,8 @@ menuDialog = main
|
|||
subMenu = boostOpenLoopGearAdderDialog, "Boost control open loop gear adder", { isBoostControlEnabled }
|
||||
subMenu = boostPidDialog, "Boost control PID", { isBoostControlEnabled && boostType == 1 }
|
||||
subMenu = boostTargetDialog, "Boost control target", { isBoostControlEnabled && boostType == 1 }
|
||||
subMenu = cltBoostCorrCurve, "CLT boost multiplier"
|
||||
subMenu = iatBoostCorrCurve, "IAT boost multiplier"
|
||||
|
||||
groupMenu = "Boost blend tables"
|
||||
groupChildMenu = boostOpenBlend1Cfg, "Open loop 1 bias", { isBoostControlEnabled }
|
||||
|
|
@ -6084,11 +6106,11 @@ menuDialog = main
|
|||
subMenu = vvtTable2Tbl, "VVT exhaust target", { vvtMode2 != 0 && vvtPins2 != 0 }
|
||||
|
||||
subMenu = std_separator
|
||||
subMenu = auxInputsDialog, "Lua Analog Inputs"
|
||||
subMenu = luaDigitalInputsDialog, "Lua Digital Inputs"
|
||||
subMenu = luaOutputs, "Lua Script PWM Outputs"
|
||||
subMenu = auxInputsDialog, "Lua Analog Inputs", { 1 }, { uiMode == 0 || uiMode == 1 }
|
||||
subMenu = luaDigitalInputsDialog, "Lua Digital Inputs", { 1 }, { uiMode == 0 || uiMode == 1 }
|
||||
subMenu = luaOutputs, "Lua Script PWM Outputs", { 1 }, { uiMode == 0 || uiMode == 1 }
|
||||
|
||||
groupMenu = "Lua Calibrations"
|
||||
groupMenu = "Lua Calibrations", { 1 }, { uiMode == 0 || uiMode == 1 }
|
||||
groupChildMenu = scriptSetting, "Lua Script Settings"
|
||||
|
||||
groupChildMenu = scriptTable1TblSettings, "Script Table #1"
|
||||
|
|
@ -7127,7 +7149,7 @@ dialog = lambda_monitorDialog, "lambda_monitor"
|
|||
|
||||
dialog = ignitionSettings, "", xAxis
|
||||
panel = ignitionBasic
|
||||
panel = ignitionOutputs, { uiMode == 0 || uiMode == 1 }
|
||||
panel = ignitionOutputs, { 1 }, { uiMode == 0 || uiMode == 1 }
|
||||
|
||||
dialog = baseEngineConfig, "Engine Configuration"
|
||||
field = "Number of cylinders", cylindersCount
|
||||
|
|
@ -8899,6 +8921,7 @@ dialog = lambda_monitorDialog, "lambda_monitor"
|
|||
; Engine->Base Engine Settings
|
||||
dialog = engineChars, "Base Engine Settings"
|
||||
topicHelp = "baseHelp"
|
||||
field = "Layout", uiMode
|
||||
panel = baseEngineConfig
|
||||
panel = engineMetadata
|
||||
panel = fuelStrategyPanel
|
||||
|
|
@ -9553,7 +9576,7 @@ dialog = tcuControls, "Transmission Settings"
|
|||
field = kLinePeriodUs, kLinePeriodUs
|
||||
|
||||
dialog = parkingLot, "Experimental/Broken"
|
||||
; field = uiMode, uiMode
|
||||
field = uiMode, uiMode
|
||||
field = can1ListenMode, can1ListenMode
|
||||
field = can2ListenMode, can2ListenMode
|
||||
field = rethrowHardFault, rethrowHardFault
|
||||
|
|
|
|||
Loading…
Reference in New Issue