From 22a9590f733fb5dbfd5710e70b786f13c45fde66 Mon Sep 17 00:00:00 2001
From: rusEfi <russianefi@gmail.com>
Date: Thu, 8 Jan 2015 14:03:45 -0600
Subject: [PATCH] auto-sync

---
 firmware/.cproject                    |  4 ++--
 firmware/config/stm32f1egt/mpu_util.h | 13 +++++++++++++
 firmware/egt2can.cpp                  | 28 ++++++++-------------------
 firmware/hw_layer/hardware.cpp        | 20 ++++++++++++-------
 4 files changed, 36 insertions(+), 29 deletions(-)
 create mode 100644 firmware/config/stm32f1egt/mpu_util.h

diff --git a/firmware/.cproject b/firmware/.cproject
index 659748441c..119404730f 100644
--- a/firmware/.cproject
+++ b/firmware/.cproject
@@ -319,7 +319,7 @@
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.format.1403205537" name="Debug format" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.format"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.name.1443668889" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.name" value="Sourcery CodeBench Lite for ARM EABI" valueType="string"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.1887488663" name="Architecture" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.architecture" value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.arm" valueType="enumerated"/>
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family.23097541" name="ARM family" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.mcpu.cortex-m1" valueType="enumerated"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family.23097541" name="ARM family" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.mcpu.cortex-m3" valueType="enumerated"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.instructionset.978474509" name="Instruction set" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.instructionset" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.instructionset.thumb" valueType="enumerated"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.prefix.177034630" name="Prefix" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.prefix" value="arm-none-eabi-" valueType="string"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.c.1504138624" name="C compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.c" value="gcc" valueType="string"/>
@@ -588,7 +588,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="chibios/os/ports/GCC/ARMCMx/chcore_v6m.c|chibios/os/ports/GCC/ARMCMx/STM32F0xx|console/status_loop.cpp|controllers/settings.cpp|controllers/flash_main.cpp|development|hw_layer/joystick.cpp|hw_layer/servo.cpp|hw_layer/pin_repository.c|hw_layer/microsecond_timer.c|hw_layer/io_pins.cpp|hw_layer/flash.c|hw_layer/adc_inputs.cpp|hw_layer/hardware.cpp|hw_layer/gpio_helper.cpp|hw_layer/board_test.cpp|chibios/os/hal/platforms/STM32/USARTv2|chibios/os/hal/platforms/STM32/SPIv2|chibios/os/hal/platforms/STM32/OTGv1|chibios/os/hal/platforms/STM32/GPIOv2|chibios/os/hal/platforms/STM32F0xx|chibios/os/various/fatfs_bindings|util/LocalVersionHolder.cpp|util/histogram.c|util/data_buffer.c|util/cyclic_buffer.cpp|controllers/algo|controllers/system/SingleTimerExecutor.cpp|controllers/system/signal_executor_sleep.c|controllers/system/pwm_generator_logic.cpp|controllers/system/event_queue.cpp|chibios/ext/fatfs|config/engines|hw_layer/rtc_helper.c|hw_layer/mmc_card.c|hw_layer/neo6m.c|hw_layer/lcd|controllers/core|controllers/math|controllers/sensors|controllers/trigger|controllers/sensors/tps.cpp|controllers/sensors/thermistors.cpp|controllers/sensors/map.cpp|controllers/sensors/maf.cpp|controllers/sensors/ego.cpp|hw_layer/wave_analyzer_hw.c|hw_layer/vehicle_speed.cpp|hw_layer/trigger_input.cpp|hw_layer/stepper.cpp|hw_layer/pwm_generator.cpp|hw_layer/HIP9011.cpp|controllers/map_multiplier_thread.cpp|controllers/map_averaging.cpp|controllers/malfunction_indicator.cpp|controllers/lcd_controller.cpp|controllers/injector_central.cpp|console/tunerstudio|controllers/idle_thread.cpp|controllers/electronic_throttle.cpp|controllers/alternatorController.cpp|controllers/engine_controller.cpp|rusefi.cpp|chibios/boards/ST_STM32F4_DISCOVERY|hw_layer/stm32f4|chibios/os/hal/platforms/STM32/USARTv1|chibios/os/hal/platforms/STM32/I2Cv1|chibios/os/ports/GCC/ARMCMx/STM32F4xx|chibios/os/hal/platforms/STM32F4xx|config/stm32f4ems|chibios/boards/simulator|chibios/boards/OLIMEX_STM32_E407|chibios/os/ports/IAR|chibios/os/hal/platforms/Win32|chibios/os/ports/GCC/SIMIA32|chibios/os/ports/IAR/ARMCMx/chcore_v6m.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="chibios/boards/ST_STM32F0_DISCOVERY|chibios/os/hal/platforms/STM32/OTGv1|chibios/os/hal/platforms/STM32/RTCv2|chibios/os/hal/platforms/STM32/I2Cv2|chibios/os/ports/GCC/ARMCMx/chcore_v6m.c|chibios/os/ports/GCC/ARMCMx/STM32F0xx|console/status_loop.cpp|controllers/settings.cpp|controllers/flash_main.cpp|development|hw_layer/joystick.cpp|hw_layer/servo.cpp|hw_layer/pin_repository.c|hw_layer/microsecond_timer.c|hw_layer/io_pins.cpp|hw_layer/flash.c|hw_layer/adc_inputs.cpp|hw_layer/gpio_helper.cpp|hw_layer/board_test.cpp|chibios/os/hal/platforms/STM32/USARTv2|chibios/os/hal/platforms/STM32/SPIv2|chibios/os/hal/platforms/STM32/GPIOv2|chibios/os/hal/platforms/STM32F0xx|chibios/os/various/fatfs_bindings|util/LocalVersionHolder.cpp|util/histogram.c|util/data_buffer.c|util/cyclic_buffer.cpp|controllers/algo|controllers/system/SingleTimerExecutor.cpp|controllers/system/signal_executor_sleep.c|controllers/system/pwm_generator_logic.cpp|controllers/system/event_queue.cpp|chibios/ext/fatfs|config/engines|hw_layer/rtc_helper.c|hw_layer/mmc_card.c|hw_layer/neo6m.c|hw_layer/lcd|controllers/core|controllers/math|controllers/sensors|controllers/trigger|controllers/sensors/tps.cpp|controllers/sensors/thermistors.cpp|controllers/sensors/map.cpp|controllers/sensors/maf.cpp|controllers/sensors/ego.cpp|hw_layer/wave_analyzer_hw.c|hw_layer/vehicle_speed.cpp|hw_layer/trigger_input.cpp|hw_layer/stepper.cpp|hw_layer/pwm_generator.cpp|hw_layer/HIP9011.cpp|controllers/map_multiplier_thread.cpp|controllers/map_averaging.cpp|controllers/malfunction_indicator.cpp|controllers/lcd_controller.cpp|controllers/injector_central.cpp|console/tunerstudio|controllers/idle_thread.cpp|controllers/electronic_throttle.cpp|controllers/alternatorController.cpp|controllers/engine_controller.cpp|rusefi.cpp|chibios/boards/ST_STM32F4_DISCOVERY|hw_layer/stm32f4|chibios/os/ports/GCC/ARMCMx/STM32F4xx|chibios/os/hal/platforms/STM32F4xx|config/stm32f4ems|chibios/boards/simulator|chibios/boards/OLIMEX_STM32_E407|chibios/os/ports/IAR|chibios/os/hal/platforms/Win32|chibios/os/ports/GCC/SIMIA32|chibios/os/ports/IAR/ARMCMx/chcore_v6m.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
diff --git a/firmware/config/stm32f1egt/mpu_util.h b/firmware/config/stm32f1egt/mpu_util.h
new file mode 100644
index 0000000000..9741c01397
--- /dev/null
+++ b/firmware/config/stm32f1egt/mpu_util.h
@@ -0,0 +1,13 @@
+/*
+ * mpu_util.h
+ *
+ *  Created on: Jan 8, 2015
+ *      Author: Andrey
+ */
+
+#ifndef CONFIG_STM32F1EGT_MPU_UTIL_H_
+#define CONFIG_STM32F1EGT_MPU_UTIL_H_
+
+#define baseHardwareInit() {}
+
+#endif /* CONFIG_STM32F1EGT_MPU_UTIL_H_ */
diff --git a/firmware/egt2can.cpp b/firmware/egt2can.cpp
index b5b2344df7..6a98bf8280 100644
--- a/firmware/egt2can.cpp
+++ b/firmware/egt2can.cpp
@@ -7,8 +7,12 @@ egt_cs_array_t max31855_cs;
 
 int main_loop_started;
 
+int maxNesting = 0;
+
 void firmwareError(const char *fmt, ...) {
 
+}
+
 /*
  * Blue LED blinker thread, times are in milliseconds.
  */
@@ -18,31 +22,14 @@ static msg_t Thread1(void *arg) {
   (void)arg;
   chRegSetThreadName("blinker1");
   while (TRUE) {
-    palClearPad(GPIOC, GPIOC_LED4);
+    palClearPad(GPIOC, 13);
     chThdSleepMilliseconds(500);
-    palSetPad(GPIOC, GPIOC_LED4);
+    palSetPad(GPIOC, 13);
     chThdSleepMilliseconds(500);
   }
   return 0;
 }
 
-/*
- * Green LED blinker thread, times are in milliseconds.
- */
-static WORKING_AREA(waThread2, 128);
-static msg_t Thread2(void *arg) {
-
-  (void)arg;
-  chRegSetThreadName("blinker2");
-  while (TRUE) {
-    palClearPad(GPIOC, GPIOC_LED3);
-    chThdSleepMilliseconds(250);
-    palSetPad(GPIOC, GPIOC_LED3);
-    chThdSleepMilliseconds(250);
-  }
-  return 0;
-}
-
 
 void initSpiCs(SPIConfig *spiConfig, brain_pin_e csPin) {
 	spiConfig->end_cb = NULL;
@@ -57,6 +44,7 @@ void initSpiCs(SPIConfig *spiConfig, brain_pin_e csPin) {
 
 void runRusEfi(void) {
 
+#if EFI_USE_UART_FOR_CONSOLE
   /*
    * Activates the serial driver 1 using the driver default configuration.
    * PA9 and PA10 are routed to USART1.
@@ -64,12 +52,12 @@ void runRusEfi(void) {
   sdStart(&SD1, NULL);
   palSetPadMode(GPIOA, 9, PAL_MODE_ALTERNATE(1));       /* USART1 TX.       */
   palSetPadMode(GPIOA, 10, PAL_MODE_ALTERNATE(1));      /* USART1 RX.       */
+#endif
 
   /*
    * Creates the blinker threads.
    */
   chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);
-  chThdCreateStatic(waThread2, sizeof(waThread2), NORMALPRIO, Thread2, NULL);
 
   initMax31855(NULL, max31855_cs);
 
diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp
index 6e8c982cac..9d6f2a85ea 100644
--- a/firmware/hw_layer/hardware.cpp
+++ b/firmware/hw_layer/hardware.cpp
@@ -20,11 +20,13 @@
 
 #include "trigger_input.h"
 #include "eficonsole.h"
+#include "max31855.h"
+#include "can_hw.h"
+
+#if EFI_PROD_CODE
 #include "board_test.h"
 #include "mcp3208.h"
 #include "HIP9011.h"
-#include "max31855.h"
-#include "can_hw.h"
 #include "histogram.h"
 #include "mmc_card.h"
 #include "neo6m.h"
@@ -32,15 +34,15 @@
 #include "settings.h"
 #include "algo.h"
 #include "joystick.h"
-
-#if EFI_INTERNAL_FLASH
-#include "flash_main.h"
-#endif /* EFI_INTERNAL_FLASH */
-
 #include "trigger_central.h"
 #include "svnversion.h"
 #include "engine_configuration.h"
 #include "ec2.h"
+#endif
+
+#if EFI_INTERNAL_FLASH
+#include "flash_main.h"
+#endif /* EFI_INTERNAL_FLASH */
 
 EXTERN_ENGINE
 ;
@@ -178,6 +180,8 @@ static void sendI2Cbyte(int addr, int data) {
 
 static Logging *sharedLogger;
 
+#if EFI_PROD_CODE
+
 void initHardware(Logging *l, Engine *engine) {
 	sharedLogger = l;
 	engine_configuration_s *engineConfiguration = engine->engineConfiguration;
@@ -336,3 +340,5 @@ void initHardware(Logging *l, Engine *engine) {
 
 	printMsg(sharedLogger, "initHardware() OK!");
 }
+
+#endif /* EFI_PROD_CODE */