From 1f07d65fb19a1b6c4afe7c7f2f1fa7b38ea71a04 Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 15 May 2017 05:03:40 -0400 Subject: [PATCH] refactoring: extracting method --- firmware/hw_layer/hardware.cpp | 2 +- firmware/hw_layer/io_pins.cpp | 4 ++++ firmware/hw_layer/io_pins.h | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp index 85ed26ca09..8e2584cb9e 100644 --- a/firmware/hw_layer/hardware.cpp +++ b/firmware/hw_layer/hardware.cpp @@ -383,7 +383,7 @@ void initHardware(Logging *l) { if (boardConfiguration->boardTestModeJumperPin != GPIO_UNASSIGNED) { mySetPadMode2("board test", boardConfiguration->boardTestModeJumperPin, PAL_MODE_INPUT_PULLUP); - isBoardTestMode_b = (!palReadPad(getHwPort(boardConfiguration->boardTestModeJumperPin), getHwPin(boardConfiguration->boardTestModeJumperPin))); + isBoardTestMode_b = (!efiReadPin(boardConfiguration->boardTestModeJumperPin)); // we can now relese this pin, it is actually used as output sometimes unmarkPin(boardConfiguration->boardTestModeJumperPin); diff --git a/firmware/hw_layer/io_pins.cpp b/firmware/hw_layer/io_pins.cpp index a47102b0c1..c6c3c7f054 100644 --- a/firmware/hw_layer/io_pins.cpp +++ b/firmware/hw_layer/io_pins.cpp @@ -53,6 +53,10 @@ ioportmask_t getHwPin(brain_pin_e brainPin) { return brainPin % PORT_SIZE; } +bool efiReadPin(brain_pin_e pin) { + return palReadPad(getHwPort(pin), getHwPin(pin)); +} + /** * This method would set an error condition if pin is already used */ diff --git a/firmware/hw_layer/io_pins.h b/firmware/hw_layer/io_pins.h index 63ee5d1f19..dfb3ba7937 100644 --- a/firmware/hw_layer/io_pins.h +++ b/firmware/hw_layer/io_pins.h @@ -55,6 +55,8 @@ #if EFI_GPIO_HARDWARE || defined(__DOXYGEN__) void mySetPadMode2(const char *msg, brain_pin_e pin, iomode_t mode); +bool efiReadPin(brain_pin_e pin); + iomode_t getInputMode(pin_input_mode_e mode); void efiIcuStart(ICUDriver *icup, const ICUConfig *config); #endif /* EFI_GPIO_HARDWARE */