diff --git a/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp b/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp index 6ed69e00d9..740fb33f73 100644 --- a/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp @@ -150,7 +150,7 @@ void setBoardDefaultConfiguration(void) { engineConfiguration->etbIo[0].directionPin1 = GPIOC_6; // out_pwm2 engineConfiguration->etbIo[0].directionPin2 = GPIOC_7; // out_pwm3 - engineConfiguration->etbIo[0].controlPin1 = GPIOA_8; // ETB_EN out_io12 + engineConfiguration->etbIo[0].controlPin = GPIOA_8; // ETB_EN out_io12 CONFIG(etb_use_two_wires) = true; engineConfiguration->isSdCardEnabled = true; diff --git a/firmware/config/boards/microrusefi/board_configuration.cpp b/firmware/config/boards/microrusefi/board_configuration.cpp index 4f6c6b5584..2e5f6694b6 100644 --- a/firmware/config/boards/microrusefi/board_configuration.cpp +++ b/firmware/config/boards/microrusefi/board_configuration.cpp @@ -111,7 +111,7 @@ static void setupEtb() { // DIS - disables motor (enable low) // PWM pin - engineConfiguration->etbIo[0].controlPin1 = GPIOC_7; + engineConfiguration->etbIo[0].controlPin = GPIOC_7; // DIR pin engineConfiguration->etbIo[0].directionPin1 = GPIOA_8; // Disable pin diff --git a/firmware/config/boards/proteus/board_configuration.cpp b/firmware/config/boards/proteus/board_configuration.cpp index b26501ba02..6ad0b8e9e6 100644 --- a/firmware/config/boards/proteus/board_configuration.cpp +++ b/firmware/config/boards/proteus/board_configuration.cpp @@ -85,7 +85,7 @@ static void setupEtb() { // Throttle #1 // PWM pin - engineConfiguration->etbIo[0].controlPin1 = GPIOD_12; + engineConfiguration->etbIo[0].controlPin = GPIOD_12; // DIR pin engineConfiguration->etbIo[0].directionPin1 = GPIOD_10; // Disable pin @@ -95,7 +95,7 @@ static void setupEtb() { // Throttle #2 // PWM pin - engineConfiguration->etbIo[1].controlPin1 = GPIOD_13; + engineConfiguration->etbIo[1].controlPin = GPIOD_13; // DIR pin engineConfiguration->etbIo[1].directionPin1 = GPIOD_9; // Disable pin diff --git a/firmware/config/boards/skeleton/board_configuration.cpp b/firmware/config/boards/skeleton/board_configuration.cpp index cfc7d6a8ac..6aed8866a0 100644 --- a/firmware/config/boards/skeleton/board_configuration.cpp +++ b/firmware/config/boards/skeleton/board_configuration.cpp @@ -66,7 +66,7 @@ static void setupTle9201Etb() { // This chip has PWM/DIR, not dira/dirb engineConfiguration->etb_use_two_wires = false; // PWM and DIR pins - engineConfiguration->etbIo[0].controlPin1 = GPIOC_7; + engineConfiguration->etbIo[0].controlPin = GPIOC_7; engineConfiguration->etbIo[0].directionPin1 = GPIOA_8; engineConfiguration->etbIo[0].directionPin2 = GPIO_UNASSIGNED; } diff --git a/firmware/config/engines/bmw_m73.cpp b/firmware/config/engines/bmw_m73.cpp index 93a2e5328a..28fab33ee8 100644 --- a/firmware/config/engines/bmw_m73.cpp +++ b/firmware/config/engines/bmw_m73.cpp @@ -202,14 +202,14 @@ GPIOA_6 engineConfiguration->tps2_1AdcChannel = EFI_ADC_4; // PA4 // PWM pin - engineConfiguration->etbIo[0].controlPin1 = GPIO_UNASSIGNED; + engineConfiguration->etbIo[0].controlPin = GPIO_UNASSIGNED; // DIR pin engineConfiguration->etbIo[0].directionPin1 = GPIOC_8; engineConfiguration->etbIo[0].directionPin2 = GPIOC_9; CONFIG(etb_use_two_wires) = true; // PWM pin - engineConfiguration->etbIo[1].controlPin1 = GPIO_UNASSIGNED; + engineConfiguration->etbIo[1].controlPin = GPIO_UNASSIGNED; // DIR pin engineConfiguration->etbIo[1].directionPin1 = GPIOB_9; engineConfiguration->etbIo[1].directionPin2 = GPIOB_8; diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index f2a6951a15..a1261d289e 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -268,7 +268,7 @@ void setEtbTestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { */ CONFIG(etbIo[0].directionPin1) = GPIOC_7; // Frankenso high-side in order to get 5v control CONFIG(etbIo[0].directionPin2) = GPIOC_9; - CONFIG(etbIo[0].controlPin1) = GPIOE_14; + CONFIG(etbIo[0].controlPin) = GPIOE_14; #if EFI_ELECTRONIC_THROTTLE_BODY setBoschVNH2SP30Curve(PASS_CONFIG_PARAMETER_SIGNATURE); diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda_miata_vvt.cpp index 46bcf8f459..93a2936178 100644 --- a/firmware/config/engines/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda_miata_vvt.cpp @@ -469,7 +469,7 @@ void setMazdaMiata2003EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { // PWM CONFIG(etb_use_two_wires) = true; - engineConfiguration->etbIo[0].controlPin1 = GPIO_UNASSIGNED; + engineConfiguration->etbIo[0].controlPin = GPIO_UNASSIGNED; // engineConfiguration->etbIo[0].directionPin1 = GPIOE_12; // orange diff --git a/firmware/controllers/actuators/dc_motors.cpp b/firmware/controllers/actuators/dc_motors.cpp index 3ab6588061..95dfd69804 100644 --- a/firmware/controllers/actuators/dc_motors.cpp +++ b/firmware/controllers/actuators/dc_motors.cpp @@ -93,7 +93,7 @@ DcMotor* initDcMotor(const dc_io& io, size_t index, bool useTwoWires DECLARE_ENG hw.start( useTwoWires, - io.controlPin1, + io.controlPin, io.directionPin1, io.directionPin2, io.disablePin, diff --git a/firmware/controllers/actuators/electronic_throttle.cpp b/firmware/controllers/actuators/electronic_throttle.cpp index 9ca6dfcd0d..f800b62c52 100644 --- a/firmware/controllers/actuators/electronic_throttle.cpp +++ b/firmware/controllers/actuators/electronic_throttle.cpp @@ -711,8 +711,8 @@ static void showEthInfo(void) { efiPrintf("TPS=%.2f", Sensor::get(SensorType::Tps1).value_or(0)); - efiPrintf("etbControlPin1=%s duty=%.2f freq=%d", - hwPortname(CONFIG(etbIo[0].controlPin1)), + efiPrintf("etbControlPin=%s duty=%.2f freq=%d", + hwPortname(CONFIG(etbIo[0].controlPin)), currentEtbDuty, engineConfiguration->etbFreq); @@ -720,7 +720,7 @@ static void showEthInfo(void) { efiPrintf("ETB%d", i); efiPrintf(" dir1=%s", hwPortname(CONFIG(etbIo[i].directionPin1))); efiPrintf(" dir2=%s", hwPortname(CONFIG(etbIo[i].directionPin2))); - efiPrintf(" control=%s", hwPortname(CONFIG(etbIo[i].controlPin1))); + efiPrintf(" control=%s", hwPortname(CONFIG(etbIo[i].controlPin))); efiPrintf(" disable=%s", hwPortname(CONFIG(etbIo[i].disablePin))); showDcMotorInfo(i); } diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 73f4ff6cfc..45d6ea508b 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -732,7 +732,7 @@ end_struct struct dc_io brain_pin_e directionPin1; brain_pin_e directionPin2; - brain_pin_e controlPin1;Acts as EN pin in two-wire mode + brain_pin_e controlPin;Acts as EN pin in two-wire mode brain_pin_e disablePin; end_struct diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 760b3059f6..84a2a90ad5 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -2233,11 +2233,11 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" field = "Fuel Pump Pin", fuelPumpPin field = "ETB#1 Dir #1", etbIo1_directionPin1 @@if_ts_show_etb_pins field = "ETB#1 Dir #2", etbIo1_directionPin2 @@if_ts_show_etb_pins - field = "ETB#1 Control #1", etbIo1_controlPin1 @@if_ts_show_etb_pins + field = "ETB#1 Control #1", etbIo1_controlPin @@if_ts_show_etb_pins field = "ETB#1 Disable", etbIo1_disablePin @@if_ts_show_etb_pins field = "ETB#2 Dir #1", etbIo2_directionPin1 @@if_ts_show_etb_pins field = "ETB#2 Dir #2", etbIo2_directionPin2 @@if_ts_show_etb_pins - field = "ETB#2 Control #1", etbIo2_controlPin1 @@if_ts_show_etb_pins + field = "ETB#2 Control #1", etbIo2_controlPin @@if_ts_show_etb_pins field = "ETB#2 Disable", etbIo2_disablePin @@if_ts_show_etb_pins field = "SD CS Pin", sdCardCsPin @@if_ts_show_sd_card field = "MIL / Check Engine Pin", malfunctionIndicatorPin @@ -2572,11 +2572,11 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" field = "Two-wire mode", etb_use_two_wires field = "No1 Direction #1", etbIo1_directionPin1 field = "No1 Direction #2", etbIo1_directionPin2 - field = "No1 Control #1", etbIo1_controlPin1, { etb_use_two_wires == 0 } + field = "No1 Control", etbIo1_controlPin, { etb_use_two_wires == 0 } field = "No1 Disable", etbIo1_disablePin field = "No2 Direction #1", etbIo2_directionPin1 field = "No2 Direction #2", etbIo2_directionPin2 - field = "No2 Control #1", etbIo2_controlPin1, { etb_use_two_wires == 0} + field = "No2 Control", etbIo2_controlPin, { etb_use_two_wires == 0} field = "No2 Disable", etbIo2_disablePin dialog = idleStepperHw, "Stepper Hardware"