From 4f0fc9ffd59979a2e209b8353c29f9d2edd4cbcc Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sat, 23 Jul 2016 19:03:19 -0400 Subject: [PATCH] auto-sync --- firmware/controllers/system/efiGpio.cpp | 2 +- firmware/controllers/system/efiGpio.h | 2 ++ firmware/hw_layer/gpio_helper.h | 2 -- firmware/rusefi.cpp | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/firmware/controllers/system/efiGpio.cpp b/firmware/controllers/system/efiGpio.cpp index 5d6360d882..10cf51a8f6 100644 --- a/firmware/controllers/system/efiGpio.cpp +++ b/firmware/controllers/system/efiGpio.cpp @@ -31,8 +31,8 @@ OutputPin::OutputPin() { #if EFI_PROD_CODE || defined(__DOXYGEN__) port = NULL; pin = 0; - currentLogicValue = INITIAL_PIN_STATE; #endif + currentLogicValue = INITIAL_PIN_STATE; } bool OutputPin::isInitialized() { diff --git a/firmware/controllers/system/efiGpio.h b/firmware/controllers/system/efiGpio.h index cc84fba7de..bf84938f7a 100644 --- a/firmware/controllers/system/efiGpio.h +++ b/firmware/controllers/system/efiGpio.h @@ -10,6 +10,8 @@ #include "main.h" #include "io_pins.h" +#define INITIAL_PIN_STATE -1 + // mode >= 0 is always true since that's an unsigned #define assertOMode(mode) { \ efiAssertVoid(mode <= OM_OPENDRAIN_INVERTED, "invalid pin_output_mode_e"); \ diff --git a/firmware/hw_layer/gpio_helper.h b/firmware/hw_layer/gpio_helper.h index 2d32ab6ff9..1ba2361524 100644 --- a/firmware/hw_layer/gpio_helper.h +++ b/firmware/hw_layer/gpio_helper.h @@ -11,8 +11,6 @@ #include "efiGpio.h" -#define INITIAL_PIN_STATE -1 - 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); diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 631bf1d9ca..e5c99f3dda 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -262,8 +262,6 @@ void chDbgStackOverflowPanic(Thread *otp) { chDbgPanic3(panicMessage, __FILE__, __LINE__); } -extern engine_pins_s enginePins; - // todo: why is this method here and not in error_handling.cpp ? void firmwareError(const char *errorMsg, ...) { if (hasFirmwareErrorFlag)