diff --git a/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h b/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h index 65708df..5e5186b 100644 --- a/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h +++ b/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Aug 01 00:31:08 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Aug 06 16:41:18 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -930,12 +930,9 @@ struct engine_configuration_s { */ int hip9011PrescalerAndSDO; /** - * Use any online calculator and input your bore. - * Reminder that in some cases double frequency works better! - * units: kHz * offset 428 */ - float knockBandCustom; + float unusedFloatHere; /** * Engine displacement in litres * units: L @@ -965,7 +962,7 @@ struct engine_configuration_s { */ Gpio communityCommsLedPid; /** - * Cylinder diameter in mm. + * @@CYLINDER_BORE_TOOLTIP@@ * units: mm * offset 444 */ @@ -2305,8 +2302,9 @@ struct engine_configuration_s { offset 1304 bit 3 */ bool alwaysWriteSdCard : 1 {}; /** + * Second harmonic (aka double) is usually quieter background noise offset 1304 bit 4 */ - bool unusedFancy4 : 1 {}; + bool knockDetectionUseDoubleFrequency : 1 {}; /** offset 1304 bit 5 */ bool yesUnderstandLocking : 1 {}; @@ -5720,4 +5718,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22964); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Aug 01 00:31:08 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Aug 06 16:41:18 UTC 2024 diff --git a/generated/controllers/generated/rusefi_generated_XYZ.h b/generated/controllers/generated/rusefi_generated_XYZ.h index 5aa116f..c9703b8 100644 --- a/generated/controllers/generated/rusefi_generated_XYZ.h +++ b/generated/controllers/generated/rusefi_generated_XYZ.h @@ -264,6 +264,9 @@ #define cranking_parameters_s_size 8 #define CRITICAL_BUFFER_SIZE 120 #define CRITICAL_PREFIX "CRITICAL" +#define CYLINDER_BORE_MULTIPLIER 1 +#define CYLINDER_BORE_TOOLTIP "Cylinder diameter in mm" +#define CYLINDER_BORE_UNITS "mm" #define DAC_OUTPUT_COUNT 2 #define dc_function_e_auto_enum 0="DC_None",3="DC_IdleValve",1="DC_Throttle1",2="DC_Throttle2",4="DC_Wastegate" #define dc_function_e_DC_IdleValve 3 @@ -1292,7 +1295,7 @@ #define show_Proteus_presets false #define show_test_presets false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3481726007 +#define SIGNATURE_HASH 3104374315 #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" @@ -1734,7 +1737,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI main.2024.08.05.XYZ.3481726007" +#define TS_SIGNATURE "rusEFI main.2024.08.06.XYZ.3104374315" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/generated/controllers/generated/signature_XYZ.h b/generated/controllers/generated/signature_XYZ.h index 73b2f43..c3c5389 100644 --- a/generated/controllers/generated/signature_XYZ.h +++ b/generated/controllers/generated/signature_XYZ.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3481726007 -#define TS_SIGNATURE "rusEFI main.2024.08.05.XYZ.3481726007" +#define SIGNATURE_HASH 3104374315 +#define TS_SIGNATURE "rusEFI main.2024.08.06.XYZ.3104374315" diff --git a/generated/tunerstudio/generated/rusefi_XYZ.ini b/generated/tunerstudio/generated/rusefi_XYZ.ini index 183c009..c5a9594 100644 --- a/generated/tunerstudio/generated/rusefi_XYZ.ini +++ b/generated/tunerstudio/generated/rusefi_XYZ.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI main.2024.08.05.XYZ.3481726007" + signature = "rusEFI main.2024.08.06.XYZ.3104374315" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI main.2024.08.05.XYZ.3481726007" ; signature is expected to be 7 or more characters. + signature= "rusEFI main.2024.08.06.XYZ.3104374315" ; 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="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Aug 05 16:42:03 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Aug 06 16:42:14 UTC 2024 pageSize = 22964 page = 1 @@ -206,14 +206,14 @@ iat_bias_resistor = scalar, F32, 412, "Ohm", 1, 0, 0, 200000, 1 iat_adcChannel = bits, U08, 416, [0:5], $adc_channel_e_list launchTimingRetard = scalar, F32, 420, "deg", 1, 0, -180, 180, 2 hip9011PrescalerAndSDO = scalar, S32, 424, "integer", 1, 0, 0, 32, 0 -knockBandCustom = scalar, F32, 428, "kHz", 1, 0, 0, 20, 2 +unusedFloatHere = scalar, F32, 428, "", 1, 0, 0, 100, 0 displacement = scalar, U16, 432, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 434, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 436, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 440, [0:6], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8 Mustang", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8 HO", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "1-5-4-8-3-7-2-6 Voodoo", "1-6-5-10-2-7-3-8-4-9", "1-8-6-2-7-3-4-5 F136", "fo35", "fo36", "fo37", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" justATempTest = scalar, U08, 441, "", 1, 0, 0, 100, 0 communityCommsLedPid = bits, U16, 442, [0:8], $gpio_list -cylinderBore = scalar, F32, 444, "mm", 1, 0, 0, 20000, 2 +cylinderBore = scalar, F32, 444, "mm", 1, 0, 0, 2000, 2 fuelAlgorithm = bits, U08, 448, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua", "INVALID", "INVALID", "INVALID", "INVALID" ALSMaxTPS = scalar, U08, 449, "%", 1, 0, 0, 10, 0 crankingInjectionMode = bits, U08, 450, [0:1], "Simultaneous", "Sequential", "Batch", "Single Point" @@ -614,7 +614,7 @@ widebandOnSecondBus = bits, U32, 1304, [0:0], "1", "2" fuelClosedLoopCorrectionEnabled = bits, U32, 1304, [1:1], "false", "true" oddFireEngine = bits, U32, 1304, [2:2], "false", "true" alwaysWriteSdCard = bits, U32, 1304, [3:3], "false", "true" -unusedFancy4 = bits, U32, 1304, [4:4], "false", "true" +knockDetectionUseDoubleFrequency = bits, U32, 1304, [4:4], "first harmonic", "second harmonic" yesUnderstandLocking = bits, U32, 1304, [5:5], "no", "yes" silentTriggerError = bits, U32, 1304, [6:6], "false", "true" useLinearCltSensor = bits, U32, 1304, [7:7], "false", "true" @@ -1764,10 +1764,9 @@ boardSpecificCalibration1 = scalar, S32, 22960, "", 1, 0, 0, 100, 0 iat_tempC_1 = "these values are in Celcius" iat_bias_resistor = "Pull-up resistor value on your board" hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields" - knockBandCustom = "Use any online calculator and input your bore.\nReminder that in some cases double frequency works better!" displacement = "Engine displacement in litres" cylindersCount = "Number of cylinder the engine has." - cylinderBore = "Cylinder diameter in mm." + cylinderBore = "Cylinder diameter in mm" fuelAlgorithm = "This setting controls which fuel quantity control algorithm is used.\nAlpha-N means drive by TPS commonly only used for NA engines\nSpeed Density requires MAP sensor and is the default choice for may installs\nMAF air charge is a cylinder filling based method that uses a mass air flow sensor." crankingInjectionMode = "This is the injection strategy during engine start. See Fuel/Injection settings for more detail. It is suggested to use "Simultaneous"." injectionMode = "This is where the fuel injection type is defined: "Simultaneous" means all injectors will fire together at once. "Sequential" fires the injectors on a per cylinder basis, which requires individually wired injectors. "Batched" will fire the injectors in groups." @@ -1983,6 +1982,7 @@ boardSpecificCalibration1 = scalar, S32, 22960, "", 1, 0, 0, 100, 0 fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling." oddFireEngine = "On even fire engines with even number of cylinders we go wasted spark during cranking. Use this setting to disable wasted spark cranking on odd fire engines." alwaysWriteSdCard = "Write SD card log even when powered by USB" + knockDetectionUseDoubleFrequency = "Second harmonic (aka double) is usually quieter background noise" silentTriggerError = "Sometimes we have a performance issue while printing error" canReadEnabled = "enable can_read/disable can_read" canWriteEnabled = "enable can_write/disable can_write. See also can1ListenMode" @@ -8630,10 +8630,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock -; field = "Cylinder Bore", cylinderBore - field = "Knock filter frequency", knockBandCustom, {enableSoftwareKnock} - field = "knockDetectionWindowStart",knockDetectionWindowStart, {enableSoftwareKnock} - field = "knockSamplingDuration", knockSamplingDuration, {enableSoftwareKnock} + field = "Cylinder Bore", cylinderBore, {enableSoftwareKnock} + field = "Detection mode", knockDetectionUseDoubleFrequency + field = "Detection Window Start",knockDetectionWindowStart, {enableSoftwareKnock} + field = "Sampling Duration", knockSamplingDuration, {enableSoftwareKnock} field = "" field = "Select the nearest sensor for each cylinder"