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

auto-sync

This commit is contained in:
rusEfi 2014-11-13 18:03:06 -06:00
parent cac7d97683
commit aff55c3a6f
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/chibios/os/kernel/src/chdebug.c
View File

@ -156,18 +156,20 @@ void dbg_check_unlock_from_isr(void) {
void firmwareError(const char *fmt, ...);
extern int maxNesting;
/**
* @brief Guard code for @p CH_IRQ_PROLOGUE().
*
* @notapi
*/
void dbg_check_enter_isr(void) {
if (dbg_isr_cnt >= 2)
firmwareError("nesting3");
port_lock_from_isr();
if ((dbg_isr_cnt < 0) || (dbg_lock_cnt != 0))
chDbgPanic("SV#8");
dbg_isr_cnt++;
if (dbg_isr_cnt > maxNesting)
maxNesting = dbg_isr_cnt;
port_unlock_from_isr();
}

5
firmware/controllers/settings.cpp
View File

@ -36,6 +36,8 @@ static Logging logger;
static char LOGGING_BUFFER[1000];
int maxNesting = 0;
/*
static void printIntArray(int array[], int size) {
for (int j = 0; j < size; j++) {
@ -160,7 +162,8 @@ void printConfiguration(engine_configuration_s *engineConfiguration, engine_conf
printOutputs(engineConfiguration, engineConfiguration2);
scheduleMsg(&logger, "boardTestModeJumperPin: %s", hwPortname(boardConfiguration->boardTestModeJumperPin));
scheduleMsg(&logger, "boardTestModeJumperPin: %s/nesting=%d", hwPortname(boardConfiguration->boardTestModeJumperPin),
maxNesting);
scheduleMsg(&logger, "digitalPotentiometerSpiDevice %d", boardConfiguration->digitalPotentiometerSpiDevice);

2
firmware/controllers/trigger/trigger_central.cpp
View File

@ -216,7 +216,7 @@ static void triggerInfo(Engine *engine) {
scheduleMsg(&logger, "expected duty #0=%f/#1=%f", engineConfiguration2->triggerShape.dutyCycle[0],
engineConfiguration2->triggerShape.dutyCycle[1]);
scheduleMsg(&logger, "isError %d, total errors=%d/total revolutions=%d", isTriggerDecoderError(),
scheduleMsg(&logger, "isError %d/total errors=%d/total revolutions=%d", isTriggerDecoderError(),
triggerCentral.triggerState.totalTriggerErrorCounter,
triggerCentral.triggerState.getTotalRevolutionCounter());

4
firmware/svnversion.h
View File

@ -1,5 +1,5 @@
// This file was generated by Version2Header
// Tue Nov 11 16:09:04 EST 2014
// Thu Nov 13 18:00:01 EST 2014
#ifndef VCS_VERSION
#define VCS_VERSION "5296"
#define VCS_VERSION "5333"
#endif