From 9d3de521c32a53ad37228320c262852b85bee0f7 Mon Sep 17 00:00:00 2001
From: rusEfi <russianefi@gmail.com>
Date: Sat, 15 Nov 2014 11:03:07 -0600
Subject: [PATCH] auto-sync

---
 firmware/config/engines/test_engine.cpp             |  2 +-
 firmware/controllers/flash_main.h                   |  2 +-
 .../controllers/trigger/trigger_emulator_algo.cpp   |  2 +-
 firmware/rusefi.cpp                                 | 13 +++++++------
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/firmware/config/engines/test_engine.cpp b/firmware/config/engines/test_engine.cpp
index e68319e210..a275077cd6 100644
--- a/firmware/config/engines/test_engine.cpp
+++ b/firmware/config/engines/test_engine.cpp
@@ -11,7 +11,7 @@
 #include "test_engine.h"
 
 void setTestEngineConfiguration(engine_configuration_s *engineConfiguration) {
-//	engineConfiguration->triggerConfig.triggerType = TT_TOOTHED_WHEEL;
+	engineConfiguration->triggerConfig.triggerType = TT_TOOTHED_WHEEL;
 
 	trigger_config_s *triggerConfig = &engineConfiguration->triggerConfig;
 	triggerConfig->customIsSynchronizationNeeded = false;
diff --git a/firmware/controllers/flash_main.h b/firmware/controllers/flash_main.h
index a831dd124c..40751e4896 100644
--- a/firmware/controllers/flash_main.h
+++ b/firmware/controllers/flash_main.h
@@ -12,7 +12,7 @@
 #include "engine_configuration.h"
 #include "engine.h"
 
-#define FLASH_DATA_VERSION 5343
+#define FLASH_DATA_VERSION 5376
 
 void readFromFlash(void);
 void initFlash(Engine *engine);
diff --git a/firmware/controllers/trigger/trigger_emulator_algo.cpp b/firmware/controllers/trigger/trigger_emulator_algo.cpp
index 02217c3b6b..7bdc3245b9 100644
--- a/firmware/controllers/trigger/trigger_emulator_algo.cpp
+++ b/firmware/controllers/trigger/trigger_emulator_algo.cpp
@@ -113,7 +113,7 @@ static void emulatorApplyPinState(PwmConfig *state, int stateIndex) {
 	if (!isEmulating) {
 		return;
 	}
-#if EFI_PROD_CODE
+#if EFI_PROD_CODE || defined(__DOXYGEN__)
 	applyPinState(state, stateIndex);
 #endif /* EFI_PROD_CODE */
 	if (engineConfiguration->directSelfStimulation) {
diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp
index a1578bab75..ca7ce127f3 100644
--- a/firmware/rusefi.cpp
+++ b/firmware/rusefi.cpp
@@ -106,8 +106,8 @@ extern "C" {
 
 #include "rfi_perftest.h"
 #include "rusefi.h"
-#include "memstreams.h"
 }
+#include "memstreams.h"
 
 #include "eficonsole.h"
 #include "status_loop.h"
@@ -117,7 +117,7 @@ extern "C" {
 #include "lcd_HD44780.h"
 #endif /* EFI_HD44780_LCD */
 
-#if EFI_ENGINE_EMULATOR
+#if EFI_ENGINE_EMULATOR || defined(__DOXYGEN__)
 #include "engine_emulator.h"
 #endif /* EFI_ENGINE_EMULATOR */
 
@@ -175,11 +175,11 @@ void runRusEfi(void) {
 	 */
 	initEngineContoller(engine);
 
-#if EFI_PERF_METRICS
+#if EFI_PERF_METRICS || defined(__DOXYGEN__)
 	initTimePerfActions();
 #endif
 
-#if EFI_ENGINE_EMULATOR
+#if EFI_ENGINE_EMULATOR || defined(__DOXYGEN__)
 	initEngineEmulator(engine);
 #endif
 	startStatusThreads(engine);
@@ -193,7 +193,7 @@ void runRusEfi(void) {
 	while (TRUE) {
 		efiAssertVoid(getRemainingStack(chThdSelf()) > 128, "stack#1");
 
-#if EFI_CLI_SUPPORT && !EFI_UART_ECHO_TEST_MODE
+#if (EFI_CLI_SUPPORT && !EFI_UART_ECHO_TEST_MODE) || defined(__DOXYGEN__)
 		// sensor state + all pending messages for our own dev console
 		updateDevConsoleState(engine);
 #endif /* EFI_CLI_SUPPORT */
@@ -204,6 +204,7 @@ void runRusEfi(void) {
 
 static virtual_timer_t resetTimer;
 
+// todo: move this into a hw-specific file
 static void rebootNow(void) {
 	NVIC_SystemReset();
 }
@@ -252,5 +253,5 @@ void firmwareError(const char *fmt, ...) {
 }
 
 int getRusEfiVersion(void) {
-	return 20141114;
+	return 20141115;
 }