From 6f7687ac1d7ba2adb73b9799dfa2831c9dfbdbf3 Mon Sep 17 00:00:00 2001
From: rusEfi <russianefi@gmail.com>
Date: Wed, 31 Dec 2014 18:03:30 -0600
Subject: [PATCH] auto-sync

---
 firmware/.cproject                       |  3 +-
 firmware/config/stm32f0egt/efifeatures.h |  8 +++-
 firmware/console_util/datalogging.c      |  2 +
 firmware/controllers/settings.cpp        |  2 +-
 firmware/global.h                        |  8 ++++
 firmware/hw_layer/adc_inputs.cpp         |  1 +
 firmware/hw_layer/hardware.cpp           |  2 +
 firmware/hw_layer/max31855.cpp           |  1 +
 firmware/hw_layer/stm32f4/mpu_util.h     | 38 +++++++++++++++++-
 firmware/hw_layer/stm32f4xx_specific.h   | 51 ------------------------
 firmware/hw_layer/wave_analyzer_hw.c     |  1 +
 firmware/main.h                          |  2 -
 firmware/util/cli_registry.c             |  4 +-
 unit_tests/efifeatures.h                 |  2 +
 unit_tests/main.h                        |  1 +
 15 files changed, 67 insertions(+), 59 deletions(-)
 delete mode 100644 firmware/hw_layer/stm32f4xx_specific.h

diff --git a/firmware/.cproject b/firmware/.cproject
index 6e73426ff2..cc0f34c8fa 100644
--- a/firmware/.cproject
+++ b/firmware/.cproject
@@ -51,6 +51,7 @@
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.1375389811" name="Cross ARM C Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths.950368886" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;..&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;../hw_layer/stm32f4&quot;"/>
 									<listOptionValue builtIn="false" value="../chibios/os/kernel/include"/>
 									<listOptionValue builtIn="false" value="&quot;../ext&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../ext_algo&quot;"/>
@@ -111,7 +112,7 @@
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.816044947" name="Cross ARM C++ Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.include.paths.2033499713" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;..&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/hw_layer/stm32f4}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;../hw_layer/stm32f4&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../chibios/os/kernel/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../ext&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../ext_algo&quot;"/>
diff --git a/firmware/config/stm32f0egt/efifeatures.h b/firmware/config/stm32f0egt/efifeatures.h
index 0666abf013..44936d9398 100644
--- a/firmware/config/stm32f0egt/efifeatures.h
+++ b/firmware/config/stm32f0egt/efifeatures.h
@@ -36,7 +36,13 @@
  * This macros is used to hide pieces of the code from unit tests, so it only makes sense in folders exposed to the tests project.
  * This macros is NOT about taking out logging in general.
  */
-#define EFI_PROD_CODE TRUE
+#define EFI_PROD_CODE FALSE
+
+#define CCM_OPTIONAL
+
+#define EFI_EGT TRUE
+
+#define EFI_UNIT_TEST FALSE
 
 #define CONSOLE_MODE_SWITCH_PORT GPIOB
 #define CONSOLE_MODE_SWITCH_PIN 1
diff --git a/firmware/console_util/datalogging.c b/firmware/console_util/datalogging.c
index 61df46e8ba..7b4b97c10f 100644
--- a/firmware/console_util/datalogging.c
+++ b/firmware/console_util/datalogging.c
@@ -82,7 +82,9 @@ static INLINE bool validateBuffer(Logging *logging, uint32_t extraLen) {
 	}
 
 	if (remainingSize(logging) < extraLen + 1) {
+#if EFI_PROD_CODE
 		warning(OBD_PCM_Processor_Fault, "buffer overflow %s", logging->name);
+#endif
 		return true;
 	}
 	return false;
diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp
index 844ed776be..7eed509b26 100644
--- a/firmware/controllers/settings.cpp
+++ b/firmware/controllers/settings.cpp
@@ -37,7 +37,7 @@ static Logging logger;
 
 static char LOGGING_BUFFER[1000];
 
-int maxNesting = 0;
+extern int maxNesting;
 
 /*
  static void printIntArray(int array[], int size) {
diff --git a/firmware/global.h b/firmware/global.h
index b7ddbdcc7d..6acd457786 100644
--- a/firmware/global.h
+++ b/firmware/global.h
@@ -26,8 +26,10 @@ typedef unsigned int time_t;
 
 #include "efifeatures.h"
 #include "rusefi_enums.h"
+#if EFI_PROD_CODE
 #include "io_pins.h"
 #include "auto_generated_enums.h"
+#endif
 #include "obd_error_codes.h"
 #include "error_handling.h"
 
@@ -57,6 +59,8 @@ typedef Thread thread_t;
 
 #define THD_WORKING_AREA WORKING_AREA
 
+#if EFI_PROD_CODE
+
 /**
  * The following obscurantism is a hack to reduce stack usage, maybe even a questionable performance
  * optimization.
@@ -91,4 +95,8 @@ typedef Thread thread_t;
 #define ENGINE(x) _engine.x
 #define TRIGGER_SHAPE(x) _engine.triggerShape.x
 
+#else
+#define EXTERN_ENGINE
+#endif
+
 #endif /* GLOBAL_H_ */
diff --git a/firmware/hw_layer/adc_inputs.cpp b/firmware/hw_layer/adc_inputs.cpp
index aed1853cc5..413b6c57fb 100644
--- a/firmware/hw_layer/adc_inputs.cpp
+++ b/firmware/hw_layer/adc_inputs.cpp
@@ -13,6 +13,7 @@
 #include "engine_configuration.h"
 #include "adc_inputs.h"
 #include "AdcConfiguration.h"
+#include "mpu_util.h"
 
 #include "pin_repository.h"
 #include "engine_math.h"
diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp
index 36b3ed8101..001dba22d7 100644
--- a/firmware/hw_layer/hardware.cpp
+++ b/firmware/hw_layer/hardware.cpp
@@ -48,6 +48,8 @@ static StepperMotor iacMotor;
 
 static Mutex spiMtx;
 
+int maxNesting = 0;
+
 #if HAL_USE_SPI || defined(__DOXYGEN__)
 static bool isSpiInitialized[5] = { false, false, false, false, false };
 
diff --git a/firmware/hw_layer/max31855.cpp b/firmware/hw_layer/max31855.cpp
index ffd9ec717a..37be5cf1be 100644
--- a/firmware/hw_layer/max31855.cpp
+++ b/firmware/hw_layer/max31855.cpp
@@ -12,6 +12,7 @@
  * @author Andrey Belomutskiy, (c) 2012-2014
  */
 
+#include "main.h"
 #include "max31855.h"
 
 #include "hardware.h"
diff --git a/firmware/hw_layer/stm32f4/mpu_util.h b/firmware/hw_layer/stm32f4/mpu_util.h
index 4228b6fd2f..c8d31e4c33 100644
--- a/firmware/hw_layer/stm32f4/mpu_util.h
+++ b/firmware/hw_layer/stm32f4/mpu_util.h
@@ -7,6 +7,43 @@
 #ifndef MPU_UTIL_H_
 #define MPU_UTIL_H_
 
+#ifndef GPIO_AF_TIM1
+#define GPIO_AF_TIM1 1
+#endif
+
+#ifndef GPIO_AF_TIM2
+#define GPIO_AF_TIM2 1
+#endif
+
+#ifndef GPIO_AF_TIM3
+#define GPIO_AF_TIM3 2
+#endif
+
+#ifndef GPIO_AF_TIM4
+#define GPIO_AF_TIM4 2
+#endif
+
+#ifndef GPIO_AF_TIM5
+#define GPIO_AF_TIM5 2
+#endif
+
+#ifndef GPIO_AF_TIM9
+#define GPIO_AF_TIM9 3
+#endif
+
+#ifndef ADC_TwoSamplingDelay_5Cycles
+#define ADC_TwoSamplingDelay_5Cycles ((uint32_t)0x00000000)
+#endif
+
+#ifndef ADC_TwoSamplingDelay_20Cycles
+#define ADC_TwoSamplingDelay_20Cycles ((uint32_t)0x00000F00)
+#endif
+
+#ifndef ADC_CR2_SWSTART
+#define ADC_CR2_SWSTART ((uint32_t)0x40000000)
+#endif
+
+
 void baseHardwareInit(void);
 
 #ifdef __cplusplus
@@ -25,5 +62,4 @@ void HardFaultVector(void);
 }
 #endif /* __cplusplus */
 
-
 #endif /* MPU_UTIL_H_ */
diff --git a/firmware/hw_layer/stm32f4xx_specific.h b/firmware/hw_layer/stm32f4xx_specific.h
deleted file mode 100644
index 91e6bbf12e..0000000000
--- a/firmware/hw_layer/stm32f4xx_specific.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * stm32f4xx_specific.h
- *
- * @date Jun 16, 2013
- * @author Andrey Belomutskiy, (c) 2012-2014
- */
-
-#ifndef STM32F4XX_SPECIFIC_H_
-#define STM32F4XX_SPECIFIC_H_
-
-#ifndef GPIO_AF_TIM1
-#define GPIO_AF_TIM1 1
-#endif
-
-#ifndef GPIO_AF_TIM2
-#define GPIO_AF_TIM2 1
-#endif
-
-#ifndef GPIO_AF_TIM3
-#define GPIO_AF_TIM3 2
-#endif
-
-#ifndef GPIO_AF_TIM4
-#define GPIO_AF_TIM4 2
-#endif
-
-#ifndef GPIO_AF_TIM5
-#define GPIO_AF_TIM5 2
-#endif
-
-#ifndef GPIO_AF_TIM9
-#define GPIO_AF_TIM9 3
-#endif
-
-#ifndef ADC_TwoSamplingDelay_5Cycles
-#define ADC_TwoSamplingDelay_5Cycles ((uint32_t)0x00000000)
-#endif
-
-#ifndef ADC_TwoSamplingDelay_20Cycles
-#define ADC_TwoSamplingDelay_20Cycles ((uint32_t)0x00000F00)
-#endif
-
-
-
-
-
-#ifndef ADC_CR2_SWSTART
-#define ADC_CR2_SWSTART ((uint32_t)0x40000000)
-#endif
-
-#endif /* STM32F4XX_SPECIFIC_H_ */
diff --git a/firmware/hw_layer/wave_analyzer_hw.c b/firmware/hw_layer/wave_analyzer_hw.c
index 0007d48754..e2c0b2d50e 100644
--- a/firmware/hw_layer/wave_analyzer_hw.c
+++ b/firmware/hw_layer/wave_analyzer_hw.c
@@ -7,6 +7,7 @@
  */
 
 #include "wave_analyzer_hw.h"
+#include "mpu_util.h"
 
 #if EFI_WAVE_ANALYZER || defined(__DOXYGEN__)
 
diff --git a/firmware/main.h b/firmware/main.h
index d67abcd0c8..ceb06a15ee 100644
--- a/firmware/main.h
+++ b/firmware/main.h
@@ -30,8 +30,6 @@ extern "C"
 #include "datalogging.h"
 #include "chprintf.h"
 
-#include "stm32f4xx_specific.h"
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/firmware/util/cli_registry.c b/firmware/util/cli_registry.c
index 4455707c39..0e422a97cb 100644
--- a/firmware/util/cli_registry.c
+++ b/firmware/util/cli_registry.c
@@ -25,10 +25,10 @@
 #include "board_test.h"
 #endif
 
-#if EFI_PROD_CODE || EFI_SIMULATOR
+#if ! EFI_UNIT_TEST
 #include "eficonsole.h"
 static Logging logging;
-#endif /* EFI_PROD_CODE */
+#endif /* ! EFI_UNIT_TEST */
 
 static int consoleActionCount = 0;
 static TokenCallback consoleActions[CONSOLE_MAX_ACTIONS];
diff --git a/unit_tests/efifeatures.h b/unit_tests/efifeatures.h
index 2b4a644655..a4b67edbc0 100644
--- a/unit_tests/efifeatures.h
+++ b/unit_tests/efifeatures.h
@@ -12,6 +12,8 @@
 
 #define EFI_GPIO TRUE
 
+#define EFI_UNIT_TEST TRUE
+
 #define EFI_FSIO TRUE
 
 #define EFI_HISTOGRAMS TRUE
diff --git a/unit_tests/main.h b/unit_tests/main.h
index c7d19a864a..b9da0cec6b 100644
--- a/unit_tests/main.h
+++ b/unit_tests/main.h
@@ -21,6 +21,7 @@ extern "C"
 
 #include "global.h"
 #include "error_handling.h"
+#include "efifeatures.h"
 
 #include "efilib.h"
 #include "efitime.h"