From 8bd97be4ace3dc19f4b1584b1a79786648aa6780 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sat, 31 Oct 2015 17:01:24 -0400 Subject: [PATCH] auto-sync --- firmware/config/stm32f4ems/efifeatures.h | 6 ------ firmware/console/status_loop.cpp | 10 ++++++---- firmware/controllers/flash_main.h | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/firmware/config/stm32f4ems/efifeatures.h b/firmware/config/stm32f4ems/efifeatures.h index c522b592a6..fadfec2729 100644 --- a/firmware/config/stm32f4ems/efifeatures.h +++ b/firmware/config/stm32f4ems/efifeatures.h @@ -284,15 +284,9 @@ #define LED_WARNING_PORT GPIOD #define LED_WARNING_PIN GPIOD_LED3 -#define LED_RUNNING_STATUS_PORT GPIOD -#define LED_RUNNING_STATUS_PIN GPIOD_LED4 - #define LED_ERROR_PORT GPIOD #define LED_ERROR_PIN GPIOD_LED5 -#define LED_COMMUNICATION_PORT GPIOD -#define LED_COMMUNICATION_PIN GPIOD_LED6 - #define EFI_WARNING_LED TRUE // USART1 -> check defined STM32_SERIAL_USE_USART1 diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index 5082cfa3e1..a95e2abacf 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -451,17 +451,19 @@ extern engine_pins_s enginePins; static OutputPin *leds[] = { &warningPin, &runningPin, &enginePins.errorLedPin, &communicationPin, &checkEnginePin }; +extern pin_output_mode_e DEFAULT_OUTPUT; + static void initStatisLeds() { #if EFI_PROD_CODE || defined(__DOXYGEN__) - outputPinRegister("communication status 1", &communicationPin, - LED_COMMUNICATION_PORT, LED_COMMUNICATION_PIN); + outputPinRegisterExt2("communication status 1", &communicationPin, + engineConfiguration->communicationPin, &DEFAULT_OUTPUT); #endif #if EFI_WARNING_LED || defined(__DOXYGEN__) outputPinRegister("warning", &warningPin, LED_WARNING_PORT, LED_WARNING_PIN); - outputPinRegister("is running status", &runningPin, LED_RUNNING_STATUS_PORT, - LED_RUNNING_STATUS_PIN); + outputPinRegisterExt2("is running status", &runningPin, engineConfiguration->runningPin, + &DEFAULT_OUTPUT); #endif /* EFI_WARNING_LED */ } diff --git a/firmware/controllers/flash_main.h b/firmware/controllers/flash_main.h index 98ae37ec05..7c67760d12 100644 --- a/firmware/controllers/flash_main.h +++ b/firmware/controllers/flash_main.h @@ -11,7 +11,7 @@ #include "engine.h" -#define FLASH_DATA_VERSION 8700 +#define FLASH_DATA_VERSION 8900 void readFromFlash(void); void initFlash(Logging *sharedLogger);