auto-sync

firmware/controllers/algo/aux_pid.cpp

@@ -72,7 +72,7 @@ void initAuxPid(Logging *sharedLogger) {
 
 	logger = sharedLogger;
 
-	if (engineConfiguration->activateAuxPid1) {
+	if (!engineConfiguration->activateAuxPid1) {
 		return;
 	}
 

firmware/controllers/math/engine_math.h

@@ -24,12 +24,22 @@ int isInjectionEnabled(engine_configuration_s *engineConfiguration);
 void initializeIgnitionActions(angle_t advance, angle_t dwellAngle,
 		IgnitionEventList *list DECLARE_ENGINE_PARAMETER_S);
 
+#if EFI_ENABLE_ASSERTS
+//todo#define assertAngleRange(angle) if(angle > 10000000 || angle < 10000000) { firmwareError("angle range");angle = 0;}
+#define assertAngleRange(angle) {}
+#else
+#define assertAngleRange(angle) {}
+#endif
+
+
+
 /**
  * @brief Shifts angle into the [0..720) range for four stroke and [0..360) for two stroke
  * I guess this implementation would be faster than 'angle % engineCycle'
  */
-#define fixAngle(angle)															\
+#define fixAngle(angle)														\
 	{																		\
+		assertAngleRange(angle);											\
 		float engineCycleDurationLocalCopy = ENGINE(engineCycle);	        \
 		/* todo: split this method into 'fixAngleUp' and 'fixAngleDown'*/   \
 		/*       as a performance optimization?*/                           \

firmware/iar/ch.ewp

@@ -2220,6 +2220,12 @@
       <file>
         <name>$PROJ_DIR$\..\controllers\algo\auto_generated_enums.h</name>
       </file>
+      <file>
+        <name>$PROJ_DIR$\..\controllers\algo\aux_pid.cpp</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\controllers\algo\aux_pid.h</name>
+      </file>
       <file>
         <name>$PROJ_DIR$\..\controllers\algo\can_header.h</name>
       </file>