diff --git a/generated/controllers/generated/engine_configuration_generated_structures_XXX.h b/generated/controllers/generated/engine_configuration_generated_structures_XXX.h index 3aaa2b9..3ff201d 100644 --- a/generated/controllers/generated/engine_configuration_generated_structures_XXX.h +++ b/generated/controllers/generated/engine_configuration_generated_structures_XXX.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 Tue Feb 27 17:20:25 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Feb 29 17:16:52 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1111,10 +1111,9 @@ struct engine_configuration_s { */ uint8_t acrRevolutions; /** - * units: coef * offset 548 */ - float globalFuelCorrection; + float unused4bytesHere; /** * units: volts * offset 552 @@ -5625,4 +5624,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22236); // end -// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Feb 27 17:20:25 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Feb 29 17:16:52 UTC 2024 diff --git a/generated/controllers/generated/rusefi_generated_XXX.h b/generated/controllers/generated/rusefi_generated_XXX.h index b75aef3..8a89f7e 100644 --- a/generated/controllers/generated/rusefi_generated_XXX.h +++ b/generated/controllers/generated/rusefi_generated_XXX.h @@ -1158,7 +1158,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2305701416 +#define SIGNATURE_HASH 2976474273 #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" @@ -1485,7 +1485,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.02.28.XXX.2305701416" +#define TS_SIGNATURE "rusEFI default.2024.02.29.XXX.2976474273" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/generated/controllers/generated/signature_XXX.h b/generated/controllers/generated/signature_XXX.h index 69b8cca..7218798 100644 --- a/generated/controllers/generated/signature_XXX.h +++ b/generated/controllers/generated/signature_XXX.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 2305701416 -#define TS_SIGNATURE "rusEFI default.2024.02.28.XXX.2305701416" +#define SIGNATURE_HASH 2976474273 +#define TS_SIGNATURE "rusEFI default.2024.02.29.XXX.2976474273" diff --git a/generated/tunerstudio/generated/rusefi_XXX.ini b/generated/tunerstudio/generated/rusefi_XXX.ini index 669dd78..c34ba65 100644 --- a/generated/tunerstudio/generated/rusefi_XXX.ini +++ b/generated/tunerstudio/generated/rusefi_XXX.ini @@ -37,12 +37,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI default.2024.02.28.XXX.2305701416" + signature = "rusEFI default.2024.02.29.XXX.2976474273" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI default.2024.02.28.XXX.2305701416" ; signature is expected to be 7 or more characters. + signature= "rusEFI default.2024.02.29.XXX.2976474273" ; 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 @@ -98,7 +98,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 Wed Feb 28 17:16:42 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Thu Feb 29 17:16:52 UTC 2024 pageSize = 22236 page = 1 @@ -233,7 +233,7 @@ hip9011SpiDevice = bits, U08, 544, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", boostControlSafeDutyCycle = scalar, U08, 545, "%", 1, 0, 0, 100, 0 mafAdcChannel = bits, U08, 546, [0:5], $adc_channel_e_list acrRevolutions = scalar, U08, 547, "", 1, 0, 0, 100, 0 -globalFuelCorrection = scalar, F32, 548, "coef", 1, 0, 0, 1000, 2 +unused4bytesHere = scalar, F32, 548, "", 1, 0, 0, 100, 0 adcVcc = scalar, F32, 552, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 556, "Deg", 1, 0, 0, 360, 0 camInputs1 = bits, U16, 560, [0:7], $brain_input_pin_e_list @@ -2974,7 +2974,7 @@ injectorHwIssue = bits, U32, 844, [0:0] ; total TS size = 848 baseDwell = scalar, F32, 848, "ms", 1,0 sparkDwell = scalar, F32, 852, "ms", 1,0 -dwellAngle = scalar, F32, 856, "deg", 1,0 +dwellDurationAngle = scalar, F32, 856, "deg", 1,0 cltTimingCorrection = scalar, S16, 860, "deg", 0.01,0 timingIatCorrection = scalar, S16, 862, "deg", 0.01,0 timingPidCorrection = scalar, S16, 864, "deg", 0.01,0 @@ -3138,7 +3138,7 @@ egtValue1 = scalar, F32, 1116, "", 1, 0 egtValue2 = scalar, F32, 1120, "", 1, 0 desiredRpmLimit = scalar, S16, 1124, "rpm", 1, 0 fuelInjectionCounter = scalar, U32, 1128, "", 1, 0 -sparkCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1132, "", 1, 0 fuelingLoad = scalar, F32, 1136, "", 1, 0 ignitionLoad = scalar, F32, 1140, "", 1, 0 veTableYAxis = scalar, U16, 1144, "%", 0.01, 0 @@ -4416,7 +4416,7 @@ targetAFRGauge = targetAFR,"Fuel: target AFR", "ratio", 10.0,20.0, 10.0,20.0, 10 gaugeCategory = "Timing" baseDwellGauge = baseDwell,"Ignition: base dwell", "ms", 0.0,30.0, 0.0,30.0, 0.0,30.0, 1,1 sparkDwellGauge = sparkDwell,"Ignition: coil charge time", "ms", 0.0,30.0, 0.0,30.0, 0.0,30.0, 1,1 -dwellAngleGauge = dwellAngle,"Ignition: dwell duration", "deg", 0.0,120.0, 0.0,120.0, 0.0,120.0, 1,1 +dwellDurationAngleGauge = dwellDurationAngle,"Ignition: dwell duration", "deg", 0.0,120.0, 0.0,120.0, 0.0,120.0, 1,1 cltTimingCorrectionGauge = cltTimingCorrection,"Ign: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingIatCorrectionGauge = timingIatCorrection,"Ign: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 timingPidCorrectionGauge = timingPidCorrection,"Idle: Timing adjustment", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 @@ -5248,7 +5248,7 @@ entry = idealEngineTorque, "idealEngineTorque", int, "%d" entry = injectorHwIssue, "injectorHwIssue", int, "%d" entry = baseDwell, "Ignition: base dwell", float, "%.3f" entry = sparkDwell, "Ignition: coil charge time", float, "%.3f" -entry = dwellAngle, "Ignition: dwell duration", float, "%.3f" +entry = dwellDurationAngle, "Ignition: dwell duration", float, "%.3f" entry = cltTimingCorrection, "Ign: CLT correction", float, "%.3f" entry = timingIatCorrection, "Ign: IAT correction", float, "%.3f" entry = timingPidCorrection, "Idle: Timing adjustment", float, "%.3f" @@ -5407,7 +5407,7 @@ entry = egtValue1, "egtValue1", float, "%.3f" entry = egtValue2, "egtValue2", float, "%.3f" entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" -entry = sparkCounter, "Ign: Spark counter", int, "%d" +entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" entry = ignitionLoad, "Ignition: load", float, "%.3f" entry = veTableYAxis, "veTableYAxis", float, "%.3f" @@ -6159,7 +6159,7 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_1_Graph, "Graph", South graphLine = baseDwell graphLine = sparkDwell - graphLine = dwellAngle + graphLine = dwellDurationAngle graphLine = cltTimingCorrection liveGraph = ignition_state_2_Graph, "Graph", South graphLine = timingIatCorrection @@ -6391,7 +6391,7 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_6_Graph, "Graph", South graphLine = desiredRpmLimit graphLine = fuelInjectionCounter - graphLine = sparkCounter + graphLine = globalSparkCounter graphLine = fuelingLoad liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad @@ -7472,6 +7472,15 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "SPI3 MOSI", spi3mosiPin, {is_enabled_spi_3 == 1} field = "SPI3 MISO", spi3misoPin, {is_enabled_spi_3 == 1} field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} + field = "SPI4 MOSI", spi4mosiPin, {is_enabled_spi_4 == 1} + field = "SPI4 MISO", spi4misoPin, {is_enabled_spi_4 == 1} + field = "SPI4 SCK", spi4sckPin, {is_enabled_spi_4 == 1} + field = "SPI5 MOSI", spi5mosiPin, {is_enabled_spi_5 == 1} + field = "SPI5 MISO", spi5misoPin, {is_enabled_spi_5 == 1} + field = "SPI5 SCK", spi5sckPin, {is_enabled_spi_5 == 1} + field = "SPI6 MOSI", spi6mosiPin, {is_enabled_spi_6 == 1} + field = "SPI6 MISO", spi6misoPin, {is_enabled_spi_6 == 1} + field = "SPI6 SCK", spi6sckPin, {is_enabled_spi_6 == 1} field = "hip9011CsPin", hip9011CsPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs @@ -8074,6 +8083,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "SPI4 enable", is_enabled_spi_4 + field = "SPI5 enable", is_enabled_spi_5 + + field = "SPI6 enable", is_enabled_spi_6 + dialog = spiDevices, "SPI devices settings" field = "Use SPI accelerometer", useSpiImu