unit_tests: mapAveragingTriggerCallback causes segmentation fault #2858

firmware/controllers/engine_cycle/rpm_calculator.h

@@ -181,7 +181,7 @@ float getCrankshaftAngleNt(efitick_t timeNt DECLARE_ENGINE_PARAMETER_SUFFIX);
 #define getRevolutionCounter() ENGINE(rpmCalculator.getRevolutionCounterM())
 
 #if EFI_ENGINE_SNIFFER
-#define addEngineSnifferEvent(name, msg) if (ENGINE(isEngineChartEnabled)) { waveChart.addEvent3((name), (msg)); }
+#define addEngineSnifferEvent(name, msg) { efiAssertVoid(OBD_PCM_Processor_Fault, engine!=NULL, "engine ptr missing");  if (ENGINE(isEngineChartEnabled)) { waveChart.addEvent3((name), (msg)); } }
  #else
 #define addEngineSnifferEvent(n, msg) {}
 #endif /* EFI_ENGINE_SNIFFER */

firmware/controllers/system/timer/scheduler.h

@@ -46,6 +46,8 @@ struct scheduling_s {
 	virtual_timer_t timer;
 #endif /* EFI_SIGNAL_EXECUTOR_SLEEP */
 
+	DECLARE_ENGINE_PTR;
+
 	/**
 	 * timestamp represented as 64-bit value of ticks since MCU start
 	 */