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

USB and TLE8888 not working for F4 or F767 #764

This commit is contained in:
rusefi 2019-04-19 12:42:21 -04:00
parent f7ea6c8cbe
commit 54b2f311fe
4 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
firmware/hw_layer/lcd/lcd_HD44780.cpp
View File

@ -180,6 +180,15 @@ static void lcdInfo(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
scheduleMsg(logger, "HD44780 D7=%s", hwPortname(CONFIGB(HD44780_db7))); scheduleMsg(logger, "HD44780 D7=%s", hwPortname(CONFIGB(HD44780_db7)));
} }
void stopHD44780_pins() {
unregisterPin(engineConfiguration->bc.HD44780_rs, activeConfiguration.bc.HD44780_rs);
unregisterPin(engineConfiguration->bc.HD44780_e, activeConfiguration.bc.HD44780_e);
unregisterPin(engineConfiguration->bc.HD44780_db4, activeConfiguration.bc.HD44780_db4);
unregisterPin(engineConfiguration->bc.HD44780_db5, activeConfiguration.bc.HD44780_db5);
unregisterPin(engineConfiguration->bc.HD44780_db6, activeConfiguration.bc.HD44780_db6);
unregisterPin(engineConfiguration->bc.HD44780_db7, activeConfiguration.bc.HD44780_db7);
}
void lcd_HD44780_init(Logging *sharedLogger) { void lcd_HD44780_init(Logging *sharedLogger) {
logger = sharedLogger; logger = sharedLogger;

1
firmware/hw_layer/lcd/lcd_HD44780.h
View File

@ -13,6 +13,7 @@ extern "C"
{ {
#endif /* __cplusplus */ #endif /* __cplusplus */
void stopHD44780_pins();
void lcd_HD44780_init(Logging *sharedLogger); void lcd_HD44780_init(Logging *sharedLogger);
void lcd_HD44780_set_position(uint8_t row, uint8_t column); void lcd_HD44780_set_position(uint8_t row, uint8_t column);
void lcd_HD44780_print_char(char data); void lcd_HD44780_print_char(char data);

20
firmware/hw_layer/sensors/joystick.cpp
View File

@ -98,6 +98,20 @@ static bool isJoystickEnabled() {
CONFIGB(joystickDPin) != GPIO_UNASSIGNED; CONFIGB(joystickDPin) != GPIO_UNASSIGNED;
} }
void stopJoystickPins() {
brain_pin_markUnused(CONFIGB(joystickCenterPin));
brain_pin_markUnused(CONFIGB(joystickAPin));
brain_pin_markUnused(CONFIGB(joystickDPin));
}
void startJoystickPins() {
efiSetPadMode("joy center", CONFIGB(joystickCenterPin), PAL_MODE_INPUT_PULLUP);
efiSetPadMode("joy A", CONFIGB(joystickAPin), PAL_MODE_INPUT_PULLUP);
// not used so far efiSetPadMode("joy B", CONFIGB(joystickBPin), PAL_MODE_INPUT_PULLUP);
// not used so far efiSetPadMode("joy C", CONFIGB(joystickCPin), PAL_MODE_INPUT_PULLUP);
efiSetPadMode("joy D", CONFIGB(joystickDPin), PAL_MODE_INPUT_PULLUP);
}
void initJoystick(Logging *shared) { void initJoystick(Logging *shared) {
addConsoleAction("joystickinfo", joystickInfo); addConsoleAction("joystickinfo", joystickInfo);
if (!isJoystickEnabled()) if (!isJoystickEnabled())
@ -110,11 +124,7 @@ void initJoystick(Logging *shared) {
// not used so far applyPin(CONFIGB(joystickCPin)); // not used so far applyPin(CONFIGB(joystickCPin));
enableExti(CONFIGB(joystickDPin), PAL_EVENT_MODE_RISING_EDGE, (palcallback_t)(void *)extCallback); enableExti(CONFIGB(joystickDPin), PAL_EVENT_MODE_RISING_EDGE, (palcallback_t)(void *)extCallback);
efiSetPadMode("joy center", CONFIGB(joystickCenterPin), PAL_MODE_INPUT_PULLUP); startJoystickPins();
efiSetPadMode("joy A", CONFIGB(joystickAPin), PAL_MODE_INPUT_PULLUP);
// not used so far efiSetPadMode("joy B", CONFIGB(joystickBPin), PAL_MODE_INPUT_PULLUP);
// not used so far efiSetPadMode("joy C", CONFIGB(joystickCPin), PAL_MODE_INPUT_PULLUP);
efiSetPadMode("joy D", CONFIGB(joystickDPin), PAL_MODE_INPUT_PULLUP);
} }
#endif /* HAL_USE_PAL && EFI_JOYSTICK */ #endif /* HAL_USE_PAL && EFI_JOYSTICK */

2
firmware/hw_layer/sensors/joystick.h
View File

@ -19,5 +19,7 @@ typedef enum {
void onJoystick(joystick_button_e button); void onJoystick(joystick_button_e button);
void initJoystick(Logging *shared); void initJoystick(Logging *shared);
void startJoystickPins();
void stopJoystickPins();
#endif /* CONTROLLERS_JOYSTICK_H_ */ #endif /* CONTROLLERS_JOYSTICK_H_ */