send more of Engine Sniffer data #4560

firmware/controllers/engine_cycle/rpm_calculator.h

@@ -178,11 +178,5 @@ operation_mode_e lookupOperationMode();
 
 #define getRevolutionCounter() (engine->rpmCalculator.getRevolutionCounterM())
 
-#if EFI_ENGINE_SNIFFER
-#define addEngineSnifferEvent(name, msg) { if (getTriggerCentral()->isEngineSnifferEnabled) { waveChart.addEvent3((name), (msg)); } }
- #else
-#define addEngineSnifferEvent(n, msg) {}
-#endif /* EFI_ENGINE_SNIFFER */
-
 efitick_t scheduleByAngle(scheduling_s *timer, efitick_t edgeTimestamp, angle_t angle, action_s action);
 

firmware/controllers/system/efi_gpio.cpp

@@ -7,7 +7,7 @@
  */
 
 #include "pch.h"
-
+#include "engine_sniffer.h"
 
 #include "drivers/gpio/gpio_ext.h"
 
@@ -19,11 +19,6 @@
 #include "electronic_throttle.h"
 #endif /* EFI_ELECTRONIC_THROTTLE_BODY */
 
-#if EFI_ENGINE_SNIFFER
-#include "engine_sniffer.h"
-extern WaveChart waveChart;
-#endif /* EFI_ENGINE_SNIFFER */
-
 // todo: clean this mess, this should become 'static'/private
 EnginePins enginePins;
 

firmware/controllers/trigger/trigger_emulator_algo.cpp

@@ -61,11 +61,6 @@ PwmConfig triggerSignal;
 
 static int atTriggerVersion = 0;
 
-#if EFI_ENGINE_SNIFFER
-#include "engine_sniffer.h"
-extern WaveChart waveChart;
-#endif /* EFI_ENGINE_SNIFFER */
-
 /**
  * todo: why is this method NOT reciprocal to getCrankDivider?!
  * todo: oh this method has only one usage? there must me another very similar method!

firmware/development/engine_sniffer.cpp

@@ -73,6 +73,12 @@ static void resetNow() {
 WaveChart::WaveChart() : logging("wave chart", WAVE_LOGGING_BUFFER, sizeof(WAVE_LOGGING_BUFFER)) {
 }
 
+#if EFI_ENGINE_SNIFFER
+#define addEngineSnifferEvent(name, msg) { if (getTriggerCentral()->isEngineSnifferEnabled) { waveChart.addEvent3((name), (msg)); } }
+ #else
+#define addEngineSnifferEvent(n, msg) {}
+#endif /* EFI_ENGINE_SNIFFER */
+
 void WaveChart::init() {
 	isInitialized = true;
 	reset();