rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s/controlPin1/controlPin/

This commit is contained in:
Andrey 2021-06-05 16:19:01 -04:00
parent 3b2ed0e1a1
commit 24131cdc0e
11 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/boards/hellen/hellen121vag/board_configuration.cpp
View File

@ -150,7 +150,7 @@ void setBoardDefaultConfiguration(void) {
engineConfiguration->etbIo[0].directionPin1 = GPIOC_6; // out_pwm2 engineConfiguration->etbIo[0].directionPin1 = GPIOC_6; // out_pwm2
engineConfiguration->etbIo[0].directionPin2 = GPIOC_7; // out_pwm3 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; CONFIG(etb_use_two_wires) = true;
engineConfiguration->isSdCardEnabled = true; engineConfiguration->isSdCardEnabled = true;

2
firmware/config/boards/microrusefi/board_configuration.cpp
View File

@ -111,7 +111,7 @@ static void setupEtb() {
// DIS - disables motor (enable low) // DIS - disables motor (enable low)
// PWM pin // PWM pin
engineConfiguration->etbIo[0].controlPin1 = GPIOC_7; engineConfiguration->etbIo[0].controlPin = GPIOC_7;
// DIR pin // DIR pin
engineConfiguration->etbIo[0].directionPin1 = GPIOA_8; engineConfiguration->etbIo[0].directionPin1 = GPIOA_8;
// Disable pin // Disable pin

4
firmware/config/boards/proteus/board_configuration.cpp
View File

@ -85,7 +85,7 @@ static void setupEtb() {
// Throttle #1 // Throttle #1
// PWM pin // PWM pin
engineConfiguration->etbIo[0].controlPin1 = GPIOD_12; engineConfiguration->etbIo[0].controlPin = GPIOD_12;
// DIR pin // DIR pin
engineConfiguration->etbIo[0].directionPin1 = GPIOD_10; engineConfiguration->etbIo[0].directionPin1 = GPIOD_10;
// Disable pin // Disable pin
@ -95,7 +95,7 @@ static void setupEtb() {
// Throttle #2 // Throttle #2
// PWM pin // PWM pin
engineConfiguration->etbIo[1].controlPin1 = GPIOD_13; engineConfiguration->etbIo[1].controlPin = GPIOD_13;
// DIR pin // DIR pin
engineConfiguration->etbIo[1].directionPin1 = GPIOD_9; engineConfiguration->etbIo[1].directionPin1 = GPIOD_9;
// Disable pin // Disable pin

2
firmware/config/boards/skeleton/board_configuration.cpp
View File

@ -66,7 +66,7 @@ static void setupTle9201Etb() {
// This chip has PWM/DIR, not dira/dirb // This chip has PWM/DIR, not dira/dirb
engineConfiguration->etb_use_two_wires = false; engineConfiguration->etb_use_two_wires = false;
// PWM and DIR pins // 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].directionPin1 = GPIOA_8;
engineConfiguration->etbIo[0].directionPin2 = GPIO_UNASSIGNED; engineConfiguration->etbIo[0].directionPin2 = GPIO_UNASSIGNED;
} }

4
firmware/config/engines/bmw_m73.cpp
View File

@ -202,14 +202,14 @@ GPIOA_6
engineConfiguration->tps2_1AdcChannel = EFI_ADC_4; // PA4 engineConfiguration->tps2_1AdcChannel = EFI_ADC_4; // PA4
// PWM pin // PWM pin
engineConfiguration->etbIo[0].controlPin1 = GPIO_UNASSIGNED; engineConfiguration->etbIo[0].controlPin = GPIO_UNASSIGNED;
// DIR pin // DIR pin
engineConfiguration->etbIo[0].directionPin1 = GPIOC_8; engineConfiguration->etbIo[0].directionPin1 = GPIOC_8;
engineConfiguration->etbIo[0].directionPin2 = GPIOC_9; engineConfiguration->etbIo[0].directionPin2 = GPIOC_9;
CONFIG(etb_use_two_wires) = true; CONFIG(etb_use_two_wires) = true;
// PWM pin // PWM pin
engineConfiguration->etbIo[1].controlPin1 = GPIO_UNASSIGNED; engineConfiguration->etbIo[1].controlPin = GPIO_UNASSIGNED;
// DIR pin // DIR pin
engineConfiguration->etbIo[1].directionPin1 = GPIOB_9; engineConfiguration->etbIo[1].directionPin1 = GPIOB_9;
engineConfiguration->etbIo[1].directionPin2 = GPIOB_8; engineConfiguration->etbIo[1].directionPin2 = GPIOB_8;

2
firmware/config/engines/custom_engine.cpp
View File

@ -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].directionPin1) = GPIOC_7; // Frankenso high-side in order to get 5v control
CONFIG(etbIo[0].directionPin2) = GPIOC_9; CONFIG(etbIo[0].directionPin2) = GPIOC_9;
CONFIG(etbIo[0].controlPin1) = GPIOE_14; CONFIG(etbIo[0].controlPin) = GPIOE_14;
#if EFI_ELECTRONIC_THROTTLE_BODY #if EFI_ELECTRONIC_THROTTLE_BODY
setBoschVNH2SP30Curve(PASS_CONFIG_PARAMETER_SIGNATURE); setBoschVNH2SP30Curve(PASS_CONFIG_PARAMETER_SIGNATURE);

2
firmware/config/engines/mazda_miata_vvt.cpp
View File

@ -469,7 +469,7 @@ void setMazdaMiata2003EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
// PWM // PWM
CONFIG(etb_use_two_wires) = true; 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 engineConfiguration->etbIo[0].directionPin1 = GPIOE_12; // orange

2
firmware/controllers/actuators/dc_motors.cpp
View File

@ -93,7 +93,7 @@ DcMotor* initDcMotor(const dc_io& io, size_t index, bool useTwoWires DECLARE_ENG
hw.start( hw.start(
useTwoWires, useTwoWires,
io.controlPin1, io.controlPin,
io.directionPin1, io.directionPin1,
io.directionPin2, io.directionPin2,
io.disablePin, io.disablePin,

6
firmware/controllers/actuators/electronic_throttle.cpp
View File

@ -711,8 +711,8 @@ static void showEthInfo(void) {
efiPrintf("TPS=%.2f", Sensor::get(SensorType::Tps1).value_or(0)); efiPrintf("TPS=%.2f", Sensor::get(SensorType::Tps1).value_or(0));
efiPrintf("etbControlPin1=%s duty=%.2f freq=%d", efiPrintf("etbControlPin=%s duty=%.2f freq=%d",
hwPortname(CONFIG(etbIo[0].controlPin1)), hwPortname(CONFIG(etbIo[0].controlPin)),
currentEtbDuty, currentEtbDuty,
engineConfiguration->etbFreq); engineConfiguration->etbFreq);
@ -720,7 +720,7 @@ static void showEthInfo(void) {
efiPrintf("ETB%d", i); efiPrintf("ETB%d", i);
efiPrintf(" dir1=%s", hwPortname(CONFIG(etbIo[i].directionPin1))); efiPrintf(" dir1=%s", hwPortname(CONFIG(etbIo[i].directionPin1)));
efiPrintf(" dir2=%s", hwPortname(CONFIG(etbIo[i].directionPin2))); 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))); efiPrintf(" disable=%s", hwPortname(CONFIG(etbIo[i].disablePin)));
showDcMotorInfo(i); showDcMotorInfo(i);
} }

2
firmware/integration/rusefi_config.txt
View File

@ -732,7 +732,7 @@ end_struct
struct dc_io struct dc_io
brain_pin_e directionPin1; brain_pin_e directionPin1;
brain_pin_e directionPin2; 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; brain_pin_e disablePin;
end_struct end_struct

8
firmware/tunerstudio/rusefi.input
View File

@ -2233,11 +2233,11 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
field = "Fuel Pump Pin", fuelPumpPin field = "Fuel Pump Pin", fuelPumpPin
field = "ETB#1 Dir #1", etbIo1_directionPin1 @@if_ts_show_etb_pins 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 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#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 #1", etbIo2_directionPin1 @@if_ts_show_etb_pins
field = "ETB#2 Dir #2", etbIo2_directionPin2 @@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 = "ETB#2 Disable", etbIo2_disablePin @@if_ts_show_etb_pins
field = "SD CS Pin", sdCardCsPin @@if_ts_show_sd_card field = "SD CS Pin", sdCardCsPin @@if_ts_show_sd_card
field = "MIL / Check Engine Pin", malfunctionIndicatorPin 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 = "Two-wire mode", etb_use_two_wires
field = "No1 Direction #1", etbIo1_directionPin1 field = "No1 Direction #1", etbIo1_directionPin1
field = "No1 Direction #2", etbIo1_directionPin2 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 = "No1 Disable", etbIo1_disablePin
field = "No2 Direction #1", etbIo2_directionPin1 field = "No2 Direction #1", etbIo2_directionPin1
field = "No2 Direction #2", etbIo2_directionPin2 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 field = "No2 Disable", etbIo2_disablePin
dialog = idleStepperHw, "Stepper Hardware" dialog = idleStepperHw, "Stepper Hardware"