From 2b473ccc9837236fa1f109576140b6f14e5ecdaf Mon Sep 17 00:00:00 2001 From: GitHub git update Action Date: Fri, 19 Apr 2024 17:18:06 +0000 Subject: [PATCH] Auto-generated Configs [no ci] --- ...e_configuration_generated_structures_XYZ.h | 33 ++++++++++++------- .../generated/rusefi_generated_XYZ.h | 10 +++--- .../controllers/generated/signature_XYZ.h | 4 +-- .../tunerstudio/generated/rusefi_XYZ.ini | 6 ++-- 4 files changed, 32 insertions(+), 21 deletions(-) diff --git a/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h b/generated/controllers/generated/engine_configuration_generated_structures_XYZ.h index f7547a7..e1eb718 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 Apr 18 15:50:22 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Fri Apr 19 17:16:00 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4540,14 +4540,23 @@ struct engine_configuration_s { }; static_assert(sizeof(engine_configuration_s) == 4220); -// start of cyl_trim_s -struct cyl_trim_s { +// start of ign_cyl_trim_s +struct ign_cyl_trim_s { /** * offset 0 */ - scaled_channel table[TRIM_SIZE][TRIM_SIZE]; + scaled_channel table[IGN_TRIM_SIZE][IGN_TRIM_SIZE]; }; -static_assert(sizeof(cyl_trim_s) == 16); +static_assert(sizeof(ign_cyl_trim_s) == 16); + +// start of fuel_cyl_trim_s +struct fuel_cyl_trim_s { + /** + * offset 0 + */ + scaled_channel table[FUEL_TRIM_SIZE][FUEL_TRIM_SIZE]; +}; +static_assert(sizeof(fuel_cyl_trim_s) == 16); // start of blend_table_s struct blend_table_s { @@ -5120,29 +5129,29 @@ struct persistent_config_s { /** * offset 18548 */ - uint16_t ignTrimLoadBins[TRIM_SIZE]; + uint16_t ignTrimLoadBins[IGN_TRIM_SIZE]; /** * units: rpm * offset 18556 */ - uint16_t ignTrimRpmBins[TRIM_SIZE]; + uint16_t ignTrimRpmBins[IGN_TRIM_SIZE]; /** * offset 18564 */ - cyl_trim_s ignTrims[12]; + ign_cyl_trim_s ignTrims[12]; /** * offset 18756 */ - uint16_t fuelTrimLoadBins[TRIM_SIZE]; + uint16_t fuelTrimLoadBins[FUEL_TRIM_SIZE]; /** * units: rpm * offset 18764 */ - uint16_t fuelTrimRpmBins[TRIM_SIZE]; + uint16_t fuelTrimRpmBins[FUEL_TRIM_SIZE]; /** * offset 18772 */ - cyl_trim_s fuelTrims[12]; + fuel_cyl_trim_s fuelTrims[12]; /** * units: ratio * offset 18964 @@ -5594,4 +5603,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 Thu Apr 18 15:50:22 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Fri Apr 19 17:16:00 UTC 2024 diff --git a/generated/controllers/generated/rusefi_generated_XYZ.h b/generated/controllers/generated/rusefi_generated_XYZ.h index d131ac3..6efe2b4 100644 --- a/generated/controllers/generated/rusefi_generated_XYZ.h +++ b/generated/controllers/generated/rusefi_generated_XYZ.h @@ -232,7 +232,6 @@ #define cranking_parameters_s_size 8 #define CRITICAL_BUFFER_SIZE 120 #define CRITICAL_PREFIX "CRITICAL" -#define cyl_trim_s_size 16 #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 @@ -445,6 +444,7 @@ #define ETB_HW_MAX_FREQUENCY 3000 #define FANCY_OPTIONS_COUNT 16 #define FLASH_DATA_VERSION 20016 +#define fuel_cyl_trim_s_size 16 #define FUEL_LEVEL_TABLE_COUNT 8 #define FUEL_LOAD_COUNT 16 #define fuel_pressure_sensor_mode_e_auto_enum 0="FPM_Absolute",2="FPM_Differential",1="FPM_Gauge" @@ -453,6 +453,7 @@ #define fuel_pressure_sensor_mode_e_FPM_Differential 2 #define fuel_pressure_sensor_mode_e_FPM_Gauge 1 #define FUEL_RPM_COUNT 16 +#define FUEL_TRIM_SIZE 4 #define GAP_TRACKING_LENGTH 18 #define GAUGE_CATEGORY_BOOST_CONTROL "Boost Control" #define GAUGE_CATEGORY_ETB "ETB more" @@ -993,8 +994,10 @@ #define idle_state_e_TPS_THRESHOLD 1 #define IDLE_VE_SIZE 4 #define IGN_BLEND_COUNT 4 +#define ign_cyl_trim_s_size 16 #define IGN_LOAD_COUNT 16 #define IGN_RPM_COUNT 16 +#define IGN_TRIM_SIZE 4 #define ignition_mode_e_auto_enum 0="IM_ONE_COIL",1="IM_INDIVIDUAL_COILS",3="IM_TWO_COILS",2="IM_WASTED_SPARK" #define ignition_mode_e_IM_INDIVIDUAL_COILS 1 #define ignition_mode_e_IM_ONE_COIL 0 @@ -1189,7 +1192,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3985269406 +#define SIGNATURE_HASH 3937496778 #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" @@ -1361,7 +1364,6 @@ #define TRIGGERS_FILE_NAME "triggers.txt" #define TriggerWheel_T_PRIMARY 0 #define TriggerWheel_T_SECONDARY 1 -#define TRIM_SIZE 4 #define ts_14_command_TS_14_0 0 #define ts_14_command_TS_14_1 1 #define ts_14_command_TS_14_4 4 @@ -1566,7 +1568,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.04.18.XYZ.3985269406" +#define TS_SIGNATURE "rusEFI default.2024.04.19.XYZ.3937496778" #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 83ec6d9..cdea263 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 3985269406 -#define TS_SIGNATURE "rusEFI default.2024.04.18.XYZ.3985269406" +#define SIGNATURE_HASH 3937496778 +#define TS_SIGNATURE "rusEFI default.2024.04.19.XYZ.3937496778" diff --git a/generated/tunerstudio/generated/rusefi_XYZ.ini b/generated/tunerstudio/generated/rusefi_XYZ.ini index 5cd6f9a..4a54eb9 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 default.2024.04.18.XYZ.3985269406" + signature = "rusEFI default.2024.04.19.XYZ.3937496778" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI default.2024.04.18.XYZ.3985269406" ; signature is expected to be 7 or more characters. + signature= "rusEFI default.2024.04.19.XYZ.3937496778" ; 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 Thu Apr 18 17:15:53 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Fri Apr 19 17:16:00 UTC 2024 pageSize = 22656 page = 1