rusefi
/
rusefi-full
mirror of https://github.com/rusefi/rusefi-full.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2016-07-23 13:03:57 -04:00
parent f3e47a35c0
commit e0d647384a
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/PwmTester.cpp
View File

@ -8,7 +8,7 @@
#include "main.h" #include "main.h"
#if EFI_PWM_TESTER #if EFI_PWM_TESTER || defined(__DOXYGEN__)
#include "PwmTester.h" #include "PwmTester.h"
#include "EfiWave.h" #include "EfiWave.h"

20
firmware/controllers/error_handling.cpp
View File

@ -11,8 +11,10 @@
#include "memstreams.h" #include "memstreams.h"
#include "efilib2.h" #include "efilib2.h"
#include "engine.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" #include "lcd_HD44780.h"
#endif /* EFI_HD44780_LCD */ #endif /* EFI_HD44780_LCD */
@ -33,12 +35,18 @@ void chDbgPanic3(const char *msg, const char * file, int line) {
return; return;
dbg_panic_file = file; dbg_panic_file = file;
dbg_panic_line = line; dbg_panic_line = line;
#if CH_DBG_SYSTEM_STATE_CHECK #if CH_DBG_SYSTEM_STATE_CHECK || defined(__DOXYGEN__)
dbg_panic_msg = msg; dbg_panic_msg = msg;
#endif /* CH_DBG_SYSTEM_STATE_CHECK */ #endif /* CH_DBG_SYSTEM_STATE_CHECK */
#if EFI_PROD_CODE || defined(__DOXYGEN__)
ON_FATAL_ERROR(); 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); lcdShowFatalMessage((char *) msg);
#endif /* EFI_HD44780_LCD */ #endif /* EFI_HD44780_LCD */
@ -64,7 +72,7 @@ bool isWarningNow(efitimesec_t now) {
* @returns TRUE in case there are too many warnings * @returns TRUE in case there are too many warnings
*/ */
int warning(obd_code_e code, const char *fmt, ...) { int warning(obd_code_e code, const char *fmt, ...) {
efiAssert(isWarningStreamInitialized, "warn stream", false); efiAssert(isWarningStreamInitialized, "warn stream not initialized", false);
UNUSED(code); UNUSED(code);
efitimesec_t now = getTimeNowSeconds(); efitimesec_t now = getTimeNowSeconds();
@ -100,6 +108,7 @@ char *getWarninig(void) {
uint32_t lastLockTime; uint32_t lastLockTime;
uint32_t maxLockTime = 0; uint32_t maxLockTime = 0;
// todo: move this field to trigger_central?
bool isInsideTriggerHandler = false; bool isInsideTriggerHandler = false;
void onLockHook(void) { void onLockHook(void) {
@ -122,6 +131,9 @@ void initErrorHandling(void) {
isWarningStreamInitialized = true; isWarningStreamInitialized = true;
} }
//todo: move into simulator global
typedef VTList virtual_timers_list_t;
extern virtual_timers_list_t vtlist; extern virtual_timers_list_t vtlist;
extern bool main_loop_started; extern bool main_loop_started;