From 251710ecd857a812154f9e22873ddcea58e80d67 Mon Sep 17 00:00:00 2001 From: rusefi Date: Fri, 19 Apr 2019 13:01:06 -0400 Subject: [PATCH] USB and TLE8888 not working for F4 or F767 #764 --- firmware/hw_layer/lcd/lcd_HD44780.cpp | 12 ++++++------ firmware/hw_layer/sensors/joystick.cpp | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/firmware/hw_layer/lcd/lcd_HD44780.cpp b/firmware/hw_layer/lcd/lcd_HD44780.cpp index ff527aa5c1..2d4d4f2215 100644 --- a/firmware/hw_layer/lcd/lcd_HD44780.cpp +++ b/firmware/hw_layer/lcd/lcd_HD44780.cpp @@ -181,12 +181,12 @@ static void lcdInfo(DECLARE_ENGINE_PARAMETER_SIGNATURE) { } 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); + brain_pin_markUnused(activeConfiguration.bc.HD44780_rs); + brain_pin_markUnused(activeConfiguration.bc.HD44780_e); + brain_pin_markUnused(activeConfiguration.bc.HD44780_db4); + brain_pin_markUnused(activeConfiguration.bc.HD44780_db5); + brain_pin_markUnused(activeConfiguration.bc.HD44780_db6); + brain_pin_markUnused(activeConfiguration.bc.HD44780_db7); } void lcd_HD44780_init(Logging *sharedLogger) { diff --git a/firmware/hw_layer/sensors/joystick.cpp b/firmware/hw_layer/sensors/joystick.cpp index 89b07d718c..cc69f3c765 100644 --- a/firmware/hw_layer/sensors/joystick.cpp +++ b/firmware/hw_layer/sensors/joystick.cpp @@ -99,9 +99,9 @@ static bool isJoystickEnabled() { } void stopJoystickPins() { - brain_pin_markUnused(CONFIGB(joystickCenterPin)); - brain_pin_markUnused(CONFIGB(joystickAPin)); - brain_pin_markUnused(CONFIGB(joystickDPin)); + brain_pin_markUnused(activeConfiguration.bc.joystickCenterPin); + brain_pin_markUnused(activeConfiguration.bc.joystickAPin); + brain_pin_markUnused(activeConfiguration.bc.joystickDPin); } void startJoystickPins() {