From a6afe1b6d47dac94d477bd1b429281c7e548dad2 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Tue, 23 Dec 2014 23:03:35 -0600 Subject: [PATCH] auto-sync --- firmware/.cproject | 44 +++++++++---------- .../os/ports/IAR/ARMCMx/chcoreasm_v7m.s | 2 +- firmware/controllers/algo/enum_strings.cpp | 2 + firmware/controllers/engine_controller.cpp | 8 ++++ firmware/controllers/flash_main.cpp | 2 +- firmware/dump_debug.bat | 2 +- firmware/flash_debug.bat | 2 +- firmware/iar/ch.ewp | 26 ++++------- 8 files changed, 44 insertions(+), 44 deletions(-) diff --git a/firmware/.cproject b/firmware/.cproject index eb1a6e39e5..c504b7c713 100644 --- a/firmware/.cproject +++ b/firmware/.cproject @@ -2,7 +2,7 @@ - + @@ -15,7 +15,7 @@ - + - + - + @@ -187,7 +187,7 @@ - + - + - + @@ -352,7 +352,7 @@ - + - + diff --git a/firmware/chibios/os/ports/IAR/ARMCMx/chcoreasm_v7m.s b/firmware/chibios/os/ports/IAR/ARMCMx/chcoreasm_v7m.s index 5bfdd3e4d0..c7f0436563 100644 --- a/firmware/chibios/os/ports/IAR/ARMCMx/chcoreasm_v7m.s +++ b/firmware/chibios/os/ports/IAR/ARMCMx/chcoreasm_v7m.s @@ -34,7 +34,7 @@ * Imports the Cortex-Mx configuration headers. */ #define _FROM_ASM_ -#include "config\system\chconf.h" +#include "config\stm32f4ems\chconf.h" #include "chcore.h" CONTEXT_OFFSET SET 12 diff --git a/firmware/controllers/algo/enum_strings.cpp b/firmware/controllers/algo/enum_strings.cpp index 1b8f28773c..b34baf2479 100644 --- a/firmware/controllers/algo/enum_strings.cpp +++ b/firmware/controllers/algo/enum_strings.cpp @@ -16,6 +16,8 @@ */ const char* getConfigurationName(engine_type_e engineType) { switch (engineType) { + case DEFAULT_ENGINE: + return "DEFAULT"; #if EFI_SUPPORT_DODGE_NEON case DODGE_NEON_1995: return "Neon95"; diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index 80ce45a8ce..b94a461e4d 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -292,23 +292,31 @@ static void initPeriodicEvents(Engine *engine) { } char * getPinNameByAdcChannel(adc_channel_e hwChannel, char *buffer) { +#if HAL_USE_ADC || defined(__DOXYGEN__) strcpy((char*) buffer, portname(getAdcChannelPort(hwChannel))); itoa10(&buffer[2], getAdcChannelPin(hwChannel)); +#else + strcpy(buffer, "NONE"); +#endif return (char*) buffer; } static char pinNameBuffer[16]; static void printAnalogChannelInfoExt(const char *name, adc_channel_e hwChannel, float adcVoltage) { +#if HAL_USE_ADC || defined(__DOXYGEN__) float voltage = adcVoltage * engineConfiguration->analogInputDividerCoefficient; scheduleMsg(&logger, "%s ADC%d %s %s rawValue=%f/divided=%fv", name, hwChannel, getAdcMode(hwChannel), getPinNameByAdcChannel(hwChannel, pinNameBuffer), adcVoltage, voltage); +#endif } static void printAnalogChannelInfo(const char *name, adc_channel_e hwChannel) { +#if HAL_USE_ADC || defined(__DOXYGEN__) if (hwChannel != EFI_ADC_NONE) { printAnalogChannelInfoExt(name, hwChannel, getVoltage(hwChannel)); } +#endif } static void printAnalogInfo(void) { diff --git a/firmware/controllers/flash_main.cpp b/firmware/controllers/flash_main.cpp index ab5d18fd63..1ab6eb4cb6 100644 --- a/firmware/controllers/flash_main.cpp +++ b/firmware/controllers/flash_main.cpp @@ -21,7 +21,7 @@ #include "engine.h" -#define DEFAULT_ENGINE_TYPE FORD_ASPIRE_1996 +#define DEFAULT_ENGINE_TYPE DEFAULT_ENGINE static bool needToWriteConfiguration = false; diff --git a/firmware/dump_debug.bat b/firmware/dump_debug.bat index d19e8cd431..42de71921b 100644 --- a/firmware/dump_debug.bat +++ b/firmware/dump_debug.bat @@ -1 +1 @@ -arm-none-eabi-objdump -S debug/rusefi.elf > debug.dump \ No newline at end of file +arm-none-eabi-objdump -S debug_EMS/rusefi.elf > debug.dump \ No newline at end of file diff --git a/firmware/flash_debug.bat b/firmware/flash_debug.bat index db50c2f7b1..f8f982322c 100644 --- a/firmware/flash_debug.bat +++ b/firmware/flash_debug.bat @@ -1 +1 @@ -st-link_cli -c SWD ur -P Debug\rusefi.hex -Rst -Run +st-link_cli -c SWD ur -P Debug_EMS\rusefi.hex -Rst -Run diff --git a/firmware/iar/ch.ewp b/firmware/iar/ch.ewp index 37421bb3cf..4c88973eda 100644 --- a/firmware/iar/ch.ewp +++ b/firmware/iar/ch.ewp @@ -327,8 +327,7 @@ $PROJ_DIR$\..\console $PROJ_DIR$\..\config $PROJ_DIR$\..\config\engines - $PROJ_DIR$\..\config\boards - $PROJ_DIR$\..\config\system + $PROJ_DIR$\..\config\stm32f4ems $PROJ_DIR$\..\console\tunerstudio $PROJ_DIR$\..\console_util $PROJ_DIR$\..\emulation @@ -1903,15 +1902,6 @@ config - - boards - - $PROJ_DIR$\..\config\boards\arro_board.h - - - $PROJ_DIR$\..\config\boards\boards.h - - engines @@ -2039,20 +2029,20 @@ - system + stm32f4ems - $PROJ_DIR$\..\config\system\chconf.h + $PROJ_DIR$\..\config\stm32f4ems\chconf.h - $PROJ_DIR$\..\config\system\halconf.h + $PROJ_DIR$\..\config\stm32f4ems\halconf.h - $PROJ_DIR$\..\config\system\mcuconf.h + $PROJ_DIR$\..\config\stm32f4ems\mcuconf.h + + + $PROJ_DIR$\..\config\stm32f4ems\efifeatures.h - - $PROJ_DIR$\..\config\efifeatures.h - console