From 158296f990150164a441ec47f3efc93835de6b71 Mon Sep 17 00:00:00 2001 From: Andrey Date: Sat, 12 Jun 2021 13:52:18 -0400 Subject: [PATCH] reverting TCU cherry pick --- firmware/console/binary/tunerstudio_outputs.h | 5 +---- firmware/controllers/algo/rusefi_enums.h | 15 --------------- firmware/controllers/algo/rusefi_types.h | 1 - firmware/controllers/gear_controller.h | 7 ------- firmware/integration/rusefi_config.txt | 8 ++------ 5 files changed, 3 insertions(+), 33 deletions(-) diff --git a/firmware/console/binary/tunerstudio_outputs.h b/firmware/console/binary/tunerstudio_outputs.h index fc54fd199d..975f4d4e4e 100644 --- a/firmware/console/binary/tunerstudio_outputs.h +++ b/firmware/console/binary/tunerstudio_outputs.h @@ -275,10 +275,7 @@ typedef struct { scaled_percent fuelTrim[2]; // 296 & 298 - uint8_t tcuCurrentState; // 299 - uint8_t one; // 300 - - uint8_t unusedAtTheEnd[36]; // we have some unused bytes to allow compatible TS changes + uint8_t unusedAtTheEnd[38]; // we have some unused bytes to allow compatible TS changes // Temporary - will remove soon TsDebugChannels* getDebugChannels() { diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index ab74a25d68..0926effaa5 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -990,21 +990,6 @@ typedef enum { Force_4bytes_size_antiLagActivationMode_e = ENUM_32_BITS, } antiLagActivationMode_e; -typedef enum __attribute__ ((__packed__)) { - ROLE_PARK = 0, - ROLE_NEUTRAL = 1, - ROLE_PARK_NEUTRAL = 2, - ROLE_REVERSE = 3, - ROLE_DRIVE = 4, - ROLE_MANUAL = 5, - ROLE_LOW = 6, - ROLE_UPSHIFT = 7, - ROLE_DOWNSHIFT = 8, - ROLE_GEAR_3 = 9, - ROLE_GEAR_2 = 10, - ROLE_GEAR_1 = 11, -} tcu_role_e; - typedef enum __attribute__ ((__packed__)) { GPPWM_Tps = 0, GPPWM_Map = 1, diff --git a/firmware/controllers/algo/rusefi_types.h b/firmware/controllers/algo/rusefi_types.h index ee493378d2..0092390365 100644 --- a/firmware/controllers/algo/rusefi_types.h +++ b/firmware/controllers/algo/rusefi_types.h @@ -107,7 +107,6 @@ typedef uint8_t iac_pid_mult_t[IAC_PID_MULT_SIZE][IAC_PID_MULT_SIZE]; typedef float baro_corr_table_t[BARO_CORR_SIZE][BARO_CORR_SIZE]; typedef bool tcubinary_table_t[TCU_GEAR_COUNT][TCU_SOLENOID_COUNT]; -typedef float tcuinput_table_t[TCU_INPUT_COUNT][TCU_STATE_COUNT]; typedef float fsio_table_8x8_f32t[FSIO_TABLE_8][FSIO_TABLE_8]; typedef float tps_tps_table_t[TPS_TPS_ACCEL_TABLE][TPS_TPS_ACCEL_TABLE]; diff --git a/firmware/controllers/gear_controller.h b/firmware/controllers/gear_controller.h index 9eae403eef..15c02fdf02 100644 --- a/firmware/controllers/gear_controller.h +++ b/firmware/controllers/gear_controller.h @@ -17,14 +17,7 @@ public: private: gear_e desiredGear = NEUTRAL; protected: - adc_channel_e getAnalogInputPin(int); - brain_pin_e* getDigitalInputPin(int); - pin_input_mode_e* getDigitalInputPinMode(int); - int getInputRoleD(); - int getInputRoleA(); - adc_channel_e tcuAnalogInputs[TCU_INPUT_COUNT]; gear_e setDesiredGear(gear_e); - int getInputRole(); private: void postState(); diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index fdf1889372..05633e991e 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -126,9 +126,6 @@ struct_no_prefix engine_configuration_s #define TCU_SOLENOID_COUNT 6 #define TCU_GEAR_COUNT 10 -#define TCU_INPUT_COUNT 6 -#define TCU_STATE_COUNT 8 - ! Matt says: The problem is the driver chip. Tle9201 can't do 20k. The drivers are too slow. On purpose to reduce EMI #define ETB_HW_MAX_FREQUENCY 10000 #define ETB_COUNT 2 @@ -229,8 +226,6 @@ custom ve_table_t 4*@@FUEL_RPM_COUNT@@x@@FUEL_LOAD_COUNT@@ array, F32, @OFFS custom lambda_table_t @@FUEL_RPM_COUNT@@x@@FUEL_LOAD_COUNT@@ array, U08, @OFFSET@, [@@FUEL_RPM_COUNT@@x@@FUEL_LOAD_COUNT@@],"deg", {1/@@PACK_MULT_LAMBDA_CFG@@}, 0, 0.6, 1.5, 2 custom afr_table_t @@FUEL_RPM_COUNT@@x@@FUEL_LOAD_COUNT@@ array, U08, @OFFSET@, [@@FUEL_RPM_COUNT@@x@@FUEL_LOAD_COUNT@@],"deg", {1/@@PACK_MULT_AFR_CFG@@}, 0, 0, 25.0, 1 -custom tcuinput_table_t @@TCU_INPUT_COUNT@@x@@TCU_STATE_COUNT@@ array, F32, @OFFSET@, [@@TCU_INPUT_COUNT@@x@@TCU_STATE_COUNT@@],"state", 1, 0, -1, 5.0, 2 - custom tcubinary_table_t @@TCU_SOLENOID_COUNT@@x@@TCU_GEAR_COUNT@@ array, U08, @OFFSET@, [@@TCU_SOLENOID_COUNT@@x@@TCU_GEAR_COUNT@@],"onoff", 1, 0, 0, 1, 0 custom fsio_table_8x8_u8t @@FSIO_TABLE_8@@x@@FSIO_TABLE_8@@ array, U08, @OFFSET@, [@@FSIO_TABLE_8@@x@@FSIO_TABLE_8@@],"value", 1, 0, 0.0, 255.0, 0 @@ -1002,7 +997,7 @@ custom maf_sensor_type_e 4 bits, S32, @OFFSET@, [0:1], @@maf_sensor_type_e_enum@ bit knockBankCyl11,"Channel 2","Channel 1" bit knockBankCyl12,"Channel 2","Channel 1" bit tcuEnabled - bit tcuInputMode,"Digital","Analog"; + bit unusedBit_251_29 dc_io[ETB_COUNT iterate] etbIo @@ -1217,6 +1212,7 @@ int16_t tps2Max;Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!\ switch_input_pin_e tcuUpshiftButtonPin switch_input_pin_e tcuDownshiftButtonPin + float[ENGINE_NOISE_CURVE_SIZE] knockNoise;Knock sensor output knock detection threshold depending on current RPM;"v", 1, 0, 0.0, 10, 2 float[ENGINE_NOISE_CURVE_SIZE] knockNoiseRpmBins;;"RPM", 1, 0, 0.0, 18000, 2