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

progress - pin management

This commit is contained in:
rusefi 2017-03-19 21:44:52 -04:00
parent 826e6ffbe2
commit 664b50ac73
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
firmware/controllers/electronic_throttle.cpp
View File

@ -149,15 +149,14 @@ void setDefaultEtbParameters(void) {
boardConfiguration->etbDT = 100; boardConfiguration->etbDT = 100;
} }
void initElectronicThrottle(void) { void stopETBPins(void) {
// these two lines are controlling direction unmarkPin(boardConfiguration->etbControlPin1);
// outputPinRegister("etb1", ELECTRONIC_THROTTLE_CONTROL_1, ETB_CONTROL_LINE_1_PORT, ETB_CONTROL_LINE_1_PIN); unmarkPin(boardConfiguration->etbControlPin2);
// outputPinRegister("etb2", ELECTRONIC_THROTTLE_CONTROL_2, ETB_CONTROL_LINE_2_PORT, ETB_CONTROL_LINE_2_PIN); unmarkPin(boardConfiguration->etbDirectionPin1);
unmarkPin(boardConfiguration->etbDirectionPin2);
if (!hasPedalPositionSensor()) { }
return;
}
void startETBPins(void) {
// this line used for PWM // this line used for PWM
startSimplePwmExt(&etbPwmUp, "etb1", startSimplePwmExt(&etbPwmUp, "etb1",
boardConfiguration->etbControlPin1, boardConfiguration->etbControlPin1,
@ -174,6 +173,18 @@ void initElectronicThrottle(void) {
outputPinRegisterExt2("etb dir open", &outputDirectionOpen, boardConfiguration->etbDirectionPin1, &DEFAULT_OUTPUT); outputPinRegisterExt2("etb dir open", &outputDirectionOpen, boardConfiguration->etbDirectionPin1, &DEFAULT_OUTPUT);
outputPinRegisterExt2("etb dir close", &outputDirectionClose, boardConfiguration->etbDirectionPin2, &DEFAULT_OUTPUT); outputPinRegisterExt2("etb dir close", &outputDirectionClose, boardConfiguration->etbDirectionPin2, &DEFAULT_OUTPUT);
}
void initElectronicThrottle(void) {
// these two lines are controlling direction
// outputPinRegister("etb1", ELECTRONIC_THROTTLE_CONTROL_1, ETB_CONTROL_LINE_1_PORT, ETB_CONTROL_LINE_1_PIN);
// outputPinRegister("etb2", ELECTRONIC_THROTTLE_CONTROL_2, ETB_CONTROL_LINE_2_PORT, ETB_CONTROL_LINE_2_PIN);
if (!hasPedalPositionSensor()) {
return;
}
startETBPins();
addConsoleActionI("e", setThrottleConsole); addConsoleActionI("e", setThrottleConsole);

2
firmware/controllers/electronic_throttle.h
View File

@ -12,5 +12,7 @@ void initElectronicThrottle(void);
void setDefaultEtbParameters(void); void setDefaultEtbParameters(void);
void setEtbPFactor(float value); void setEtbPFactor(float value);
void setEtbIFactor(float value); void setEtbIFactor(float value);
void stopETBPins(void);
void startETBPins(void);
#endif /* ELECTRONIC_THROTTLE_H_ */ #endif /* ELECTRONIC_THROTTLE_H_ */

3
firmware/hw_layer/hardware.cpp
View File

@ -25,6 +25,7 @@
#if EFI_PROD_CODE #if EFI_PROD_CODE
#include "AdcConfiguration.h" #include "AdcConfiguration.h"
#include "electronic_throttle.h"
#include "board_test.h" #include "board_test.h"
#include "mcp3208.h" #include "mcp3208.h"
#include "HIP9011.h" #include "HIP9011.h"
@ -229,6 +230,7 @@ void applyNewHardwareSettings(void) {
stopInjectionPins(); stopInjectionPins();
stopIgnitionPins(); stopIgnitionPins();
stopCanPins(); stopCanPins();
stopETBPins();
if (engineConfiguration->bc.is_enabled_spi_1 != activeConfiguration.bc.is_enabled_spi_1) if (engineConfiguration->bc.is_enabled_spi_1 != activeConfiguration.bc.is_enabled_spi_1)
stopSpi(SPI_DEVICE_1); stopSpi(SPI_DEVICE_1);
@ -285,6 +287,7 @@ void applyNewHardwareSettings(void) {
startInjectionPins(); startInjectionPins();
startIgnitionPins(); startIgnitionPins();
startCanPins(); startCanPins();
startETBPins();
adcConfigListener(engine); adcConfigListener(engine);
} }