From bd8f9d72543987ef17c89724ae5eef22b72a4ba6 Mon Sep 17 00:00:00 2001 From: GitHub git update Action Date: Mon, 15 Apr 2024 17:17:33 +0000 Subject: [PATCH] Auto-generated Configs [no ci] --- ...e_configuration_generated_structures_XXX.h | 23 +++++++--- .../generated/rusefi_generated_XXX.h | 4 +- .../controllers/generated/signature_XXX.h | 4 +- .../tunerstudio/generated/rusefi_XXX.ini | 46 +++++++++++++------ 4 files changed, 53 insertions(+), 24 deletions(-) diff --git a/generated/controllers/generated/engine_configuration_generated_structures_XXX.h b/generated/controllers/generated/engine_configuration_generated_structures_XXX.h index 012a73c..d066ee8 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 Fri Apr 12 17:16:15 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Apr 15 17:15:28 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2822,7 +2822,7 @@ struct engine_configuration_s { bool startRequestPinInverted : 1 {}; /** offset 1496 bit 17 */ - bool unusedBit_503_17 : 1 {}; + bool tcu_rangeSensorPulldown : 1 {}; /** offset 1496 bit 18 */ bool skipBoardCanDash : 1 {}; @@ -4518,16 +4518,25 @@ struct engine_configuration_s { */ uint32_t device_uid[3]; /** - * units: units * offset 4004 */ - uint8_t unusedOftenChangesDuringFirmwareUpdate[214]; + adc_channel_e tcu_rangeAnalogInput[RANGE_INPUT_COUNT]; /** * need 4 byte alignment * units: units - * offset 4218 + * offset 4010 */ - uint8_t alignmentFill_at_4218[2]; + uint8_t alignmentFill_at_4010[2]; + /** + * units: Ohm + * offset 4012 + */ + float tcu_rangeSensorBiasResistor; + /** + * units: units + * offset 4016 + */ + uint8_t unusedOftenChangesDuringFirmwareUpdate[204]; }; static_assert(sizeof(engine_configuration_s) == 4220); @@ -5585,4 +5594,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 Fri Apr 12 17:16:15 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Apr 15 17:15:28 UTC 2024 diff --git a/generated/controllers/generated/rusefi_generated_XXX.h b/generated/controllers/generated/rusefi_generated_XXX.h index f44a6ec..32b5390 100644 --- a/generated/controllers/generated/rusefi_generated_XXX.h +++ b/generated/controllers/generated/rusefi_generated_XXX.h @@ -1188,7 +1188,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3808040584 +#define SIGNATURE_HASH 3230512722 #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" @@ -1565,7 +1565,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.14.XXX.3808040584" +#define TS_SIGNATURE "rusEFI default.2024.04.15.XXX.3230512722" #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 16cfdde..9d4442e 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 3808040584 -#define TS_SIGNATURE "rusEFI default.2024.04.14.XXX.3808040584" +#define SIGNATURE_HASH 3230512722 +#define TS_SIGNATURE "rusEFI default.2024.04.15.XXX.3230512722" diff --git a/generated/tunerstudio/generated/rusefi_XXX.ini b/generated/tunerstudio/generated/rusefi_XXX.ini index dcafc30..b6dd29d 100644 --- a/generated/tunerstudio/generated/rusefi_XXX.ini +++ b/generated/tunerstudio/generated/rusefi_XXX.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI default.2024.04.14.XXX.3808040584" + signature = "rusEFI default.2024.04.15.XXX.3230512722" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI default.2024.04.14.XXX.3808040584" ; signature is expected to be 7 or more characters. + signature= "rusEFI default.2024.04.15.XXX.3230512722" ; 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 Sun Apr 14 19:24:28 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Apr 15 17:15:28 UTC 2024 pageSize = 22656 page = 1 @@ -757,6 +757,7 @@ is_enabled_spi_5 = bits, U32, 1496, [13:13], "false", "true" is_enabled_spi_6 = bits, U32, 1496, [14:14], "false", "true" enableAemXSeriesEgt = bits, U32, 1496, [15:15], "false", "true" startRequestPinInverted = bits, U32, 1496, [16:16], "Normal", "Inverted" +tcu_rangeSensorPulldown = bits, U32, 1496, [17:17], "false", "true" skipBoardCanDash = bits, U32, 1496, [18:18], "false", "true" devBit0 = bits, U32, 1496, [20:20], "false", "true" devBit1 = bits, U32, 1496, [21:21], "false", "true" @@ -1359,7 +1360,14 @@ anotherCiTest = scalar, S32, 3988, "", 1, 0, 0, 100, 0 device_uid1 = scalar, U32, 3992, "", 1, 0, 0, 100, 0 device_uid2 = scalar, U32, 3996, "", 1, 0, 0, 100, 0 device_uid3 = scalar, U32, 4000, "", 1, 0, 0, 100, 0 -unusedOftenChangesDuringFirmwareUpdate = array, U08, 4004, [214], "units", 1, 0, 0, 1, 0 +tcu_rangeAnalogInput1 = bits, U08, 4004, [0:5], $adc_channel_e_list +tcu_rangeAnalogInput2 = bits, U08, 4005, [0:5], $adc_channel_e_list +tcu_rangeAnalogInput3 = bits, U08, 4006, [0:5], $adc_channel_e_list +tcu_rangeAnalogInput4 = bits, U08, 4007, [0:5], $adc_channel_e_list +tcu_rangeAnalogInput5 = bits, U08, 4008, [0:5], $adc_channel_e_list +tcu_rangeAnalogInput6 = bits, U08, 4009, [0:5], $adc_channel_e_list +tcu_rangeSensorBiasResistor = scalar, F32, 4012, "Ohm", 1, 0, 0, 200000, 1 +unusedOftenChangesDuringFirmwareUpdate = array, U08, 4016, [204], "units", 1, 0, 0, 1, 0 etbBiasBins = array, F32, 4220, [8], "target TPS position", 1, 0, 0, 100, 0 etbBiasValues = array, F32, 4252, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2 iacPidMultTable = array, U08, 4284, [8x8], "%", 0.05, 0, 0, 10, 2 @@ -2401,6 +2409,12 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 device_uid1 = "device_uid 1" device_uid2 = "device_uid 2" device_uid3 = "device_uid 3" + tcu_rangeAnalogInput1 = "tcu_rangeAnalogInput 1" + tcu_rangeAnalogInput2 = "tcu_rangeAnalogInput 2" + tcu_rangeAnalogInput3 = "tcu_rangeAnalogInput 3" + tcu_rangeAnalogInput4 = "tcu_rangeAnalogInput 4" + tcu_rangeAnalogInput5 = "tcu_rangeAnalogInput 5" + tcu_rangeAnalogInput6 = "tcu_rangeAnalogInput 6" etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method" etbBiasValues = "PWM bias, 0 to 100%" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -8917,14 +8931,20 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Tooth Count", tcuInputSpeedSensorTeeth dialog = rangeMatrixInputPanel, "Range Selector Inputs" - field = "Input 1 Pin", tcu_rangeInput1, { tcuEnabled } - field = "Input 1 Pin Mode", tcu_rangeInputMode1, { tcuEnabled } - field = "Input 2 Pin", tcu_rangeInput2, { tcuEnabled } - field = "Input 2 Pin Mode", tcu_rangeInputMode2, { tcuEnabled } - field = "Input 3 Pin", tcu_rangeInput3, { tcuEnabled } - field = "Input 3 Pin Mode", tcu_rangeInputMode3, { tcuEnabled } - field = "Input 4 Pin", tcu_rangeInput4, { tcuEnabled } - field = "Input 4 Pin Mode", tcu_rangeInputMode4, { tcuEnabled } + field = "Analog Bias Resistor", tcu_rangeSensorBiasResistor, { tcuEnabled } + field = "Pulldown?", tcu_rangeSensorPulldown, { tcuEnabled } + field = "Analog Pin 1", tcu_rangeAnalogInput1, { tcuEnabled && tcu_rangeInput1 == 0 } + field = "Digital Pin 1", tcu_rangeInput1, { tcuEnabled && tcu_rangeAnalogInput1 == 0 } + field = "Digital Pin 1 Mode", tcu_rangeInputMode1, { tcuEnabled && tcu_rangeInput1 != 0 && tcu_rangeAnalogInput1 == 0 } + field = "Analog Pin 2", tcu_rangeAnalogInput2, { tcuEnabled && tcu_rangeInput2 == 0 } + field = "Digital Pin 2", tcu_rangeInput2, { tcuEnabled && tcu_rangeAnalogInput2 == 0 } + field = "Digital Pin 2 Mode", tcu_rangeInputMode2, { tcuEnabled && tcu_rangeInput2 != 0 && tcu_rangeAnalogInput2 == 0 } + field = "Analog Pin 3", tcu_rangeAnalogInput3, { tcuEnabled && tcu_rangeInput3 == 0 } + field = "Digital Pin 3", tcu_rangeInput3, { tcuEnabled && tcu_rangeAnalogInput3 == 0 } + field = "Digital Pin 3 Mode", tcu_rangeInputMode3, { tcuEnabled && tcu_rangeInput3 != 0 && tcu_rangeAnalogInput3 == 0 } + field = "Analog Pin 4", tcu_rangeAnalogInput4, { tcuEnabled && tcu_rangeInput4 == 0 } + field = "Digital Pin 4", tcu_rangeInput4, { tcuEnabled && tcu_rangeAnalogInput4 == 0 } + field = "Digital Pin 4 Mode", tcu_rangeInputMode4, { tcuEnabled && tcu_rangeInput4 != 0 && tcu_rangeAnalogInput4 == 0 } dialog = tcuControls, "Transmission Settings" panel = transmissionPanel @@ -8954,7 +8974,7 @@ dialog = tcuControls, "Transmission Settings" dialog = 32Dialog, "3-2 Shift Solenoid Percent by Speed" panel = 32Curve - dialog = rangeMatrixDocumentation, "Cell Values" + dialog = rangeMatrixDocumentation, "Digital Cell Values" field = "0 = this pin must be low to reach this state" field = "1 = this pin must be high to reach this state" field = "2 = this pin is ignored for reaching this state"