From 2a3a2d7191399c7396f2f5df8f9217c2856d8374 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Mon, 16 Nov 2020 19:43:00 -0500 Subject: [PATCH] DC not ETB refactoring --- firmware/controllers/actuators/dc_motors.cpp | 2 +- firmware/integration/rusefi_config.txt | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/firmware/controllers/actuators/dc_motors.cpp b/firmware/controllers/actuators/dc_motors.cpp index 2a39bcbfda..7c07f7831d 100644 --- a/firmware/controllers/actuators/dc_motors.cpp +++ b/firmware/controllers/actuators/dc_motors.cpp @@ -98,7 +98,7 @@ static DcHardware dcHardware[ETB_COUNT * 2]; // We needed more H-bridge configs - so the IO configs are split // across two arrays of settings to preserve config compatibility -const etb_io& getConfigForMotor(size_t index DECLARE_ENGINE_PARAMETER_SUFFIX) { +const dc_io& getConfigForMotor(size_t index DECLARE_ENGINE_PARAMETER_SUFFIX) { size_t firstSize = efi::size(engineConfiguration->etbIo); if (index < firstSize) { diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 274af6fc6b..0a492a92e2 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -120,6 +120,7 @@ struct_no_prefix engine_configuration_s #define TCU_GEAR_COUNT 10 #define ETB_COUNT 2 +#define DC_PER_STEPPER 2 #define AUX_DIGITAL_VALVE_COUNT 2 @@ -647,7 +648,7 @@ struct idle_hardware_s pin_output_mode_e solenoidPinMode; end_struct -struct etb_io +struct dc_io brain_pin_e directionPin1; brain_pin_e directionPin2; brain_pin_e controlPin1; @@ -917,7 +918,7 @@ custom maf_sensor_type_e 4 bits, S32, @OFFSET@, [0:1], @@maf_sensor_type_e_enum@ bit tcuEnabled bit unusedBit_251_29 - etb_io[ETB_COUNT iterate] etbIo + dc_io[ETB_COUNT iterate] etbIo output_pin_e boostControlPin;+Wastegate control Solenoid @@ -950,7 +951,7 @@ custom maf_sensor_type_e 4 bits, S32, @OFFSET@, [0:1], @@maf_sensor_type_e_enum@ stft_s stft - etb_io[ETB_COUNT iterate] etbIo2 + dc_io[DC_PER_STEPPER iterate] etbIo2 vehicle_info_t engineMake;+For example, BMW, GM or Chevrolet\nREQUIRED for rusEFI Online vehicle_info_t engineCode;+For example, LS1 or NB2\nREQUIRED for rusEFI Online