andreika-git
/
rusefi
mirror of https://github.com/andreika-git/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:20:06 -04:00
parent 65aa80c379
commit e7e7458729
6 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,4 +260,9 @@ void turnAllPinsOff(void) {
enginePins.coils[i].setValue(false); enginePins.coils[i].setValue(false);
} }
} }
#else /* EFI_GPIO_HARDWARE */
const char *hwPortname(brain_pin_e brainPin) {
(void)brainPin;
return "N/A";
}
#endif /* EFI_GPIO_HARDWARE */ #endif /* EFI_GPIO_HARDWARE */

15
firmware/controllers/system/efiGpio.h
View File

@ -185,12 +185,19 @@ public:
void turnPinHigh(NamedOutputPin *output); void turnPinHigh(NamedOutputPin *output);
void turnPinLow(NamedOutputPin *output); void turnPinLow(NamedOutputPin *output);
#if EFI_PROD_CODE || defined(__DOXYGEN__) #if EFI_GPIO_HARDWARE || defined(__DOXYGEN__)
void initOutputPin(const char *msg, OutputPin *outputPin, ioportid_t port, uint32_t pinNumber); void initOutputPin(const char *msg, OutputPin *outputPin, ioportid_t port, uint32_t pinNumber);
void initOutputPinExt(const char *msg, OutputPin *outputPin, ioportid_t port, uint32_t pinNumber, iomode_t mode); void initOutputPinExt(const char *msg, OutputPin *outputPin, ioportid_t port, uint32_t pinNumber, iomode_t mode);
void outputPinRegister(const char *msg, OutputPin *output, ioportid_t port, uint32_t pin);
#endif /* EFI_PROD_CODE */
void outputPinRegisterExt2(const char *msg, OutputPin *output, brain_pin_e brainPin, pin_output_mode_e *outputMode); void outputPinRegisterExt2(const char *msg, OutputPin *output, brain_pin_e brainPin, pin_output_mode_e *outputMode);
ioportmask_t getHwPin(brain_pin_e brainPin);
ioportid_t getHwPort(brain_pin_e brainPin);
const char *portname(ioportid_t GPIOx);
#endif /* EFI_GPIO_HARDWARE */
brain_pin_e parseBrainPin(const char *str);
const char *hwPortname(brain_pin_e brainPin);
#endif /* EFIGPIO_H_ */ #endif /* EFIGPIO_H_ */

4
firmware/controllers/trigger/trigger_decoder.cpp
View File

@ -726,10 +726,10 @@ void initTriggerDecoderLogger(Logging *sharedLogger) {
} }
void initTriggerDecoder(void) { void initTriggerDecoder(void) {
#if (EFI_PROD_CODE || EFI_SIMULATOR) || defined(__DOXYGEN__) #if EFI_GPIO_HARDWARE || defined(__DOXYGEN__)
outputPinRegisterExt2("trg_err", &enginePins.triggerDecoderErrorPin, boardConfiguration->triggerErrorPin, outputPinRegisterExt2("trg_err", &enginePins.triggerDecoderErrorPin, boardConfiguration->triggerErrorPin,
&boardConfiguration->triggerErrorPinMode); &boardConfiguration->triggerErrorPinMode);
#endif #endif /* EFI_GPIO_HARDWARE */
} }
#endif /* EFI_SHAFT_POSITION_INPUT */ #endif /* EFI_SHAFT_POSITION_INPUT */

9
firmware/hw_layer/io_pins.h
View File

@ -52,4 +52,13 @@
// LED_HUGE_19, // LED_HUGE_19,
// LED_HUGE_20, // LED_HUGE_20,
#if EFI_GPIO_HARDWARE || defined(__DOXYGEN__)
void mySetPadMode(const char *msg, ioportid_t port, ioportmask_t pin, iomode_t mode);
void mySetPadMode2(const char *msg, brain_pin_e pin, iomode_t mode);
iomode_t getInputMode(pin_input_mode_e mode);
void efiIcuStart(ICUDriver *icup, const ICUConfig *config);
#endif /* EFI_GPIO_HARDWARE */
#endif /* IO_PINS_H_ */ #endif /* IO_PINS_H_ */

13
firmware/hw_layer/pin_repository.h
View File

@ -17,8 +17,6 @@
#ifdef __cplusplus #ifdef __cplusplus
#include "efiGpio.h" #include "efiGpio.h"
// does not exactly belong here, but that works better for tests
void outputPinRegister(const char *msg, OutputPin *output, ioportid_t port, uint32_t pin);
class PinRepository { class PinRepository {
public: public:
@ -31,17 +29,8 @@ class PinRepository {
#define PORT_SIZE 16 #define PORT_SIZE 16
void initPinRepository(void); void initPinRepository(void);
brain_pin_e parseBrainPin(const char *str); void markUsed(int index, const char *msg);
void mySetPadMode(const char *msg, ioportid_t port, ioportmask_t pin, iomode_t mode);
const char *hwPortname(brain_pin_e brainPin);
const char * getPinFunction(brain_input_pin_e brainPin); const char * getPinFunction(brain_input_pin_e brainPin);
void mySetPadMode2(const char *msg, brain_pin_e pin, iomode_t mode);
const char *portname(ioportid_t GPIOx);
void unmarkPin(brain_pin_e brainPin); void unmarkPin(brain_pin_e brainPin);
iomode_t getInputMode(pin_input_mode_e mode);
void efiIcuStart(ICUDriver *icup, const ICUConfig *config);
ioportmask_t getHwPin(brain_pin_e brainPin);
ioportid_t getHwPort(brain_pin_e brainPin);
#endif /* PIN_REPOSITORY_H_ */ #endif /* PIN_REPOSITORY_H_ */

2
simulator/main.h
View File

@ -1,8 +1,6 @@
#include "global.h" #include "global.h"
#define hwPortname(x) "N/A"
#ifdef __cplusplus #ifdef __cplusplus
#include "datalogging.h" #include "datalogging.h"
#include "eficonsole.h" #include "eficonsole.h"