auto-sync

firmware/controllers/algo/engine_configuration.cpp

@@ -666,7 +666,9 @@ void applyNonPersistentConfiguration(Logging * logger, Engine *engine) {
 		return;
 	}
 	engine->engineCycleEventCount = engine->triggerShape.getLength();
+#if EFI_FSIO || defined(__DOXYGEN__)
 	applyFsioConfiguration(PASS_ENGINE_PARAMETER_F);
+#endif
 }
 
 #if EFI_ENGINE_CONTROL || defined(__DOXYGEN__)

firmware/controllers/trigger/rpm_calculator.cpp

@@ -11,10 +11,10 @@
  */
 
 #include "main.h"
+#include "rpm_calculator.h"
 
 #if EFI_SHAFT_POSITION_INPUT || defined(__DOXYGEN__)
 
-#include "rpm_calculator.h"
 #include "trigger_central.h"
 #include "engine_configuration.h"
 #include "engine_math.h"

firmware/rusefi.cpp

@@ -262,5 +262,5 @@ int getRusEfiVersion(void) {
 		return 1; // this is here to make the compiler happy about the unused array
 	if (UNUSED_CCM_SIZE == 0)
 		return 1; // this is here to make the compiler happy about the unused array
-	return 20150119;
+	return 20150120;
 }