diff --git a/firmware/controllers/system/efiGpio.cpp b/firmware/controllers/system/efiGpio.cpp index acba3fbd02..8dd16847a3 100644 --- a/firmware/controllers/system/efiGpio.cpp +++ b/firmware/controllers/system/efiGpio.cpp @@ -235,6 +235,27 @@ void initPrimaryPins(void) { outputPinRegisterExt2("led: ERROR status", &enginePins.errorLedPin, LED_ERROR_BRAIN_PIN, &DEFAULT_OUTPUT); } +/** + * @brief Initialize the hardware output pin while also assigning it a logical name + */ +static void initOutputPinExt(const char *msg, OutputPin *outputPin, ioportid_t port, uint32_t pinNumber, iomode_t mode) { + if (outputPin->port != NULL && (outputPin->port != port || outputPin->pin != pinNumber)) { + /** + * here we check if another physical pin is already assigned to this logical output + */ +// todo: need to clear '&outputs' in io_pins.c + warning(CUSTOM_OBD_PIN_CONFLICT, "outputPin [%s] already assigned to %x%d", msg, outputPin->port, outputPin->pin); + engine->withError = true; + return; + } + outputPin->currentLogicValue = INITIAL_PIN_STATE; + outputPin->port = port; + outputPin->pin = pinNumber; + + mySetPadMode(msg, port, pinNumber, mode); +} + + void outputPinRegisterExt2(const char *msg, OutputPin *output, brain_pin_e brainPin, pin_output_mode_e *outputMode) { if (brainPin == GPIO_UNASSIGNED) return; diff --git a/firmware/controllers/system/efiGpio.h b/firmware/controllers/system/efiGpio.h index 956f1668d9..b8f48b485c 100644 --- a/firmware/controllers/system/efiGpio.h +++ b/firmware/controllers/system/efiGpio.h @@ -143,7 +143,6 @@ void turnPinHigh(NamedOutputPin *output); void turnPinLow(NamedOutputPin *output); #if EFI_GPIO_HARDWARE || defined(__DOXYGEN__) -void initOutputPinExt(const char *msg, OutputPin *outputPin, ioportid_t port, uint32_t pinNumber, iomode_t mode); void outputPinRegisterExt2(const char *msg, OutputPin *output, brain_pin_e brainPin, pin_output_mode_e *outputMode); ioportmask_t getHwPin(brain_pin_e brainPin); diff --git a/firmware/hw_layer/io_pins.cpp b/firmware/hw_layer/io_pins.cpp index 904cd7cd80..02b1dbdc85 100644 --- a/firmware/hw_layer/io_pins.cpp +++ b/firmware/hw_layer/io_pins.cpp @@ -53,26 +53,6 @@ ioportmask_t getHwPin(brain_pin_e brainPin) { return brainPin % PORT_SIZE; } -/** - * @brief Initialize the hardware output pin while also assigning it a logical name - */ -void initOutputPinExt(const char *msg, OutputPin *outputPin, ioportid_t port, uint32_t pinNumber, iomode_t mode) { - if (outputPin->port != NULL && (outputPin->port != port || outputPin->pin != pinNumber)) { - /** - * here we check if another physical pin is already assigned to this logical output - */ -// todo: need to clear '&outputs' in io_pins.c - warning(CUSTOM_OBD_PIN_CONFLICT, "outputPin [%s] already assigned to %x%d", msg, outputPin->port, outputPin->pin); - engine->withError = true; - return; - } - outputPin->currentLogicValue = INITIAL_PIN_STATE; - outputPin->port = port; - outputPin->pin = pinNumber; - - mySetPadMode(msg, port, pinNumber, mode); -} - /** * This method would set an error condition if pin is already used */ diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 6748ce2ffc..40d89907b5 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -251,5 +251,5 @@ int getRusEfiVersion(void) { return 123; // this is here to make the compiler happy about the unused array if (UNUSED_CCM_SIZE[0] * 0 != 0) return 3211; // this is here to make the compiler happy about the unused array - return 20170418; + return 20170421; }