From 8a5108d55db748ce6f1ec9c178854b8f77a3f958 Mon Sep 17 00:00:00 2001
From: rusEfi <russianefi@gmail.com>
Date: Sat, 23 Jul 2016 13:03:57 -0400
Subject: [PATCH] auto-sync

---
 firmware/controllers/PwmTester.cpp      |  2 +-
 firmware/controllers/error_handling.cpp | 20 ++++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/firmware/controllers/PwmTester.cpp b/firmware/controllers/PwmTester.cpp
index 94fab58da8..2d0498a4b9 100644
--- a/firmware/controllers/PwmTester.cpp
+++ b/firmware/controllers/PwmTester.cpp
@@ -8,7 +8,7 @@
 
 #include "main.h"
 
-#if EFI_PWM_TESTER
+#if EFI_PWM_TESTER || defined(__DOXYGEN__)
 
 #include "PwmTester.h"
 #include "EfiWave.h"
diff --git a/firmware/controllers/error_handling.cpp b/firmware/controllers/error_handling.cpp
index 760c58de5a..1b277a1261 100644
--- a/firmware/controllers/error_handling.cpp
+++ b/firmware/controllers/error_handling.cpp
@@ -11,8 +11,10 @@
 #include "memstreams.h"
 #include "efilib2.h"
 #include "engine.h"
+//todo: move into simulator global
+#include <chprintf.h>
 
-#if EFI_HD44780_LCD
+#if EFI_HD44780_LCD || defined(__DOXYGEN__)
 #include "lcd_HD44780.h"
 #endif /* EFI_HD44780_LCD */
 
@@ -33,12 +35,18 @@ void chDbgPanic3(const char *msg, const char * file, int line) {
 		return;
 	dbg_panic_file = file;
 	dbg_panic_line = line;
-#if CH_DBG_SYSTEM_STATE_CHECK
+#if CH_DBG_SYSTEM_STATE_CHECK || defined(__DOXYGEN__)
 	dbg_panic_msg = msg;
 #endif /* CH_DBG_SYSTEM_STATE_CHECK */
 
+#if EFI_PROD_CODE || defined(__DOXYGEN__)
 	ON_FATAL_ERROR();
-#if EFI_HD44780_LCD
+#else
+	printf("chDbgPanic3 %s %s%d", msg, file, line);
+	exit(-1);
+#endif
+
+#if EFI_HD44780_LCD || defined(__DOXYGEN__)
 	lcdShowFatalMessage((char *) msg);
 #endif /* EFI_HD44780_LCD */
 
@@ -64,7 +72,7 @@ bool isWarningNow(efitimesec_t now) {
  * @returns TRUE in case there are too many warnings
  */
 int warning(obd_code_e code, const char *fmt, ...) {
-	efiAssert(isWarningStreamInitialized, "warn stream", false);
+	efiAssert(isWarningStreamInitialized, "warn stream not initialized", false);
 	UNUSED(code);
   
 	efitimesec_t now = getTimeNowSeconds();
@@ -100,6 +108,7 @@ char *getWarninig(void) {
 uint32_t lastLockTime;
 uint32_t maxLockTime = 0;
 
+// todo: move this field to trigger_central?
 bool isInsideTriggerHandler = false;
 
 void onLockHook(void) {
@@ -122,6 +131,9 @@ void initErrorHandling(void) {
 	isWarningStreamInitialized = true;
 }
 
+//todo: move into simulator global
+typedef VTList virtual_timers_list_t;
+
 extern virtual_timers_list_t vtlist;
 extern bool main_loop_started;