diff --git a/firmware/.cproject b/firmware/.cproject
index ed8b9f4834..a0ae5e0152 100644
--- a/firmware/.cproject
+++ b/firmware/.cproject
@@ -190,7 +190,7 @@
-
+
@@ -273,7 +273,7 @@
-
+
@@ -559,7 +559,7 @@
-
+
@@ -753,7 +753,7 @@
-
+
diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp
index 2c3203932c..ac5970786f 100644
--- a/firmware/controllers/engine_controller.cpp
+++ b/firmware/controllers/engine_controller.cpp
@@ -567,9 +567,6 @@ void initEngineContoller(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S) {
addConsoleAction("analoginfo", printAnalogInfo);
commonInitEngineController(sharedLogger);
- if (hasFirmwareError()) {
- return;
- }
#if EFI_PROD_CODE || defined(__DOXYGEN__)
@@ -595,6 +592,10 @@ void initEngineContoller(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S) {
// multiple issues with this initMapAdjusterThread();
initPeriodicEvents(PASS_ENGINE_PARAMETER_F);
+ if (hasFirmwareError()) {
+ return;
+ }
+
chThdCreateStatic(csThreadStack, sizeof(csThreadStack), LOWPRIO, (tfunc_t) csThread, NULL);
#if (EFI_PROD_CODE && EFI_ENGINE_CONTROL) || defined(__DOXYGEN__)
diff --git a/firmware/controllers/trigger/rpm_calculator.cpp b/firmware/controllers/trigger/rpm_calculator.cpp
index 1b49d78a33..1402505162 100644
--- a/firmware/controllers/trigger/rpm_calculator.cpp
+++ b/firmware/controllers/trigger/rpm_calculator.cpp
@@ -40,6 +40,7 @@ EXTERN_ENGINE
efitime_t notRunnintNow;
efitime_t notRunningPrev;
+extern bool hasFirmwareErrorFlag;
static Logging * logger;
@@ -284,6 +285,9 @@ float getCrankshaftAngleNt(efitime_t timeNt DECLARE_ENGINE_PARAMETER_S) {
void initRpmCalculator(Logging *sharedLogger, Engine *engine) {
logger = sharedLogger;
+ if (hasFirmwareError()) {
+ return;
+ }
#if (EFI_PROD_CODE || EFI_SIMULATOR) || defined(__DOXYGEN__)
// tdcScheduler[0].name = "tdc0";
diff --git a/firmware/development/wave_analyzer.cpp b/firmware/development/wave_analyzer.cpp
index 5bdb79e2e1..d02e91865b 100644
--- a/firmware/development/wave_analyzer.cpp
+++ b/firmware/development/wave_analyzer.cpp
@@ -245,6 +245,9 @@ void printWave(Logging *logging) {
void initWaveAnalyzer(Logging *sharedLogger) {
logger = sharedLogger;
+ if (hasFirmwareError()) {
+ return;
+ }
#if EFI_WAVE_ANALYZER || defined(__DOXYGEN__)
initWave(WA_CHANNEL_1, 0);
initWave(WA_CHANNEL_2, 1);
diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp
index e94ac69b5d..b2634e0b04 100644
--- a/firmware/rusefi.cpp
+++ b/firmware/rusefi.cpp
@@ -298,5 +298,5 @@ int getRusEfiVersion(void) {
return 123; // this is here to make the compiler happy about the unused array
if (UNUSED_CCM_SIZE[0] * 0 != 0)
return 3211; // this is here to make the compiler happy about the unused array
- return 20160528;
+ return 20160601;
}
diff --git a/firmware/svnversion.h b/firmware/svnversion.h
index 054905bb78..7c4943ccf4 100644
--- a/firmware/svnversion.h
+++ b/firmware/svnversion.h
@@ -1,5 +1,5 @@
// This file was generated by Version2Header
-// Fri May 27 21:52:26 EDT 2016
+// Wed Jun 01 19:04:48 EDT 2016
#ifndef VCS_VERSION
-#define VCS_VERSION "9945"
+#define VCS_VERSION "9961"
#endif