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

refactoring - reducing GPIO complexity

This commit is contained in:
rusefi 2017-04-21 16:33:51 -04:00
parent 7a0ebb3693
commit b89425a048
2 changed files with 27 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
firmware/controllers/system/efiGpio.cpp
View File

@ -260,9 +260,36 @@ void turnAllPinsOff(void) {
enginePins.coils[i].setValue(false);
}
}
/**
* @deprecated - use hwPortname() instead
*/
const char *portname(ioportid_t GPIOx) {
if (GPIOx == GPIOA)
return "PA";
if (GPIOx == GPIOB)
return "PB";
if (GPIOx == GPIOC)
return "PC";
if (GPIOx == GPIOD)
return "PD";
#if defined(STM32F4XX)
if (GPIOx == GPIOE)
return "PE";
if (GPIOx == GPIOH)
return "PH";
#endif
if (GPIOx == GPIOF)
return "PF";
return "unknown";
}
#else /* EFI_GPIO_HARDWARE */
const char *hwPortname(brain_pin_e brainPin) {
(void)brainPin;
return "N/A";
}
#endif /* EFI_GPIO_HARDWARE */

36
firmware/hw_layer/pin_repository.cpp
View File

@ -36,29 +36,6 @@ static ioportid_t ports[7] = {GPIOA,
PinRepository::PinRepository() {
}
/**
* @deprecated - use hwPortname() instead
*/
const char *portname(ioportid_t GPIOx) {
if (GPIOx == GPIOA)
return "PA";
if (GPIOx == GPIOB)
return "PB";
if (GPIOx == GPIOC)
return "PC";
if (GPIOx == GPIOD)
return "PD";
#if defined(STM32F4XX)
if (GPIOx == GPIOE)
return "PE";
if (GPIOx == GPIOH)
return "PH";
#endif
if (GPIOx == GPIOF)
return "PF";
return "unknown";
}
static int getPortIndex(ioportid_t port) {
efiAssert(port != NULL, "null port", -1);
if (port == GPIOA)
@ -208,16 +185,3 @@ void unmarkPin(brain_pin_e brainPin) {
}
}
/**
* This method would crash the program if pin is already in use
*/
void registedFundamentralIoPin(char *msg, ioportid_t port, ioportmask_t pin, iomode_t mode) {
efiAssertVoid(initialized, "repo not initialized");
bool wasUsed = markUsed(port, pin, msg);
if (wasUsed) {
return;
}
palSetPadMode(port, pin, mode);
}