From 120c2595734da164970df22dfa1e050996ce45f7 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Fri, 3 Apr 2015 23:04:37 -0500 Subject: [PATCH] auto-sync --- firmware/config/engines/dodge_neon.cpp | 3 +++ firmware/controllers/idle_thread.cpp | 3 ++- firmware/hw_layer/pin_repository.cpp | 24 +++++++++++++++++++----- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp index 282d25a213..2702cb11b7 100644 --- a/firmware/config/engines/dodge_neon.cpp +++ b/firmware/config/engines/dodge_neon.cpp @@ -401,6 +401,9 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { // engineConfiguration->canNbcType = CAN_BUS_MAZDA_RX8; + boardConfiguration->idle.stepperDirectionPin = GPIOE_10; + boardConfiguration->idle.stepperStepPin = GPIOE_12; + engineConfiguration->accelLength = 12; } diff --git a/firmware/controllers/idle_thread.cpp b/firmware/controllers/idle_thread.cpp index fd5a480974..26304bf213 100644 --- a/firmware/controllers/idle_thread.cpp +++ b/firmware/controllers/idle_thread.cpp @@ -64,7 +64,8 @@ static void showIdleInfo(void) { scheduleMsg(logger, "idleMode=%s position=%f isStepper=%s", getIdle_mode_e(engineConfiguration->idleMode), boardConfiguration->idlePosition, boolToString(boardConfiguration->useStepperIdle)); if (boardConfiguration->useStepperIdle) { - + scheduleMsg(logger, "direction=%s", hwPortname(boardConfiguration->idle.stepperDirectionPin)); + scheduleMsg(logger, "step=%s", hwPortname(boardConfiguration->idle.stepperStepPin)); } else { scheduleMsg(logger, "idle valve freq=%d on %s", boardConfiguration->idle.solenoidFrequency, hwPortname(boardConfiguration->idle.solenoidPin)); diff --git a/firmware/hw_layer/pin_repository.cpp b/firmware/hw_layer/pin_repository.cpp index cfb19e931c..2fd20d6ee7 100644 --- a/firmware/hw_layer/pin_repository.cpp +++ b/firmware/hw_layer/pin_repository.cpp @@ -23,6 +23,15 @@ static int initialized = FALSE; static LoggingWithStorage logger("pin repos"); static int totalPinsUsed = 0; +static GPIO_TypeDef* ports[7] = {GPIOA, + GPIOB, + GPIOC, + GPIOD, + GPIOE, + GPIOF, + GPIOH, +}; + /** * @deprecated - use hwPortname() instead */ @@ -58,11 +67,13 @@ static int getPortIndex(GPIO_TypeDef* port) { #if defined(STM32F4XX) if (port == GPIOE) return 4; - if (port == GPIOH) - return 6; -#endif +#endif /* defined(STM32F4XX) */ if (port == GPIOF) return 5; +#if defined(STM32F4XX) + if (port == GPIOH) + return 6; +#endif /* defined(STM32F4XX) */ firmwareError("portindex"); return -1; } @@ -70,12 +81,15 @@ static int getPortIndex(GPIO_TypeDef* port) { static void reportPins(void) { for (int i = 0; i < PIN_REPO_SIZE; i++) { const char *name = PIN_USED[i]; + int portIndex = i / PORT_SIZE; + int pin = i % PORT_SIZE; + GPIO_TypeDef* port = ports[portIndex]; if (name != NULL) { - print("pin %d: %s\r\n", i, name); + scheduleMsg(&logger, "pin %s%d: %s", portname(port), pin, name); } } - print("Total pins count: %d\r\n", totalPinsUsed); + scheduleMsg(&logger, "Total pins count: %d", totalPinsUsed); } static MemoryStream portNameStream;