From cb1f9b4b610fd8558bf529f06ed02803cb47a093 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sun, 4 Apr 2021 22:01:04 -0400 Subject: [PATCH] engine sniffer into unit tests --- firmware/development/engine_sniffer.cpp | 11 ++++++----- firmware/development/engine_sniffer.h | 2 ++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/firmware/development/engine_sniffer.cpp b/firmware/development/engine_sniffer.cpp index bae88cebda..191ae08dc3 100644 --- a/firmware/development/engine_sniffer.cpp +++ b/firmware/development/engine_sniffer.cpp @@ -75,7 +75,7 @@ static void resetNow(void) { skipUntilEngineCycle = getRevolutionCounter() + 3; waveChart.reset(); } -#endif +#endif // EFI_UNIT_TEST WaveChart::WaveChart() : logging("wave chart", WAVE_LOGGING_BUFFER, sizeof(WAVE_LOGGING_BUFFER)) { } @@ -115,6 +115,7 @@ bool WaveChart::isFull() const { return counter >= CONFIG(engineChartSize); } +#if ! EFI_UNIT_TEST static void printStatus(void) { scheduleMsg(&logger, "engine chart: %s", boolToString(engineConfiguration->isEngineChartEnabled)); scheduleMsg(&logger, "engine chart size=%d", engineConfiguration->engineChartSize); @@ -135,6 +136,7 @@ void setChartSize(int newSize) { engineConfiguration->engineChartSize = newSize; printStatus(); } +#endif // EFI_UNIT_TEST void WaveChart::publishIfFull() { if (isFull() || isStartedTooLongAgo()) { @@ -236,17 +238,16 @@ void initWaveChart(WaveChart *chart) { */ chart->init(); - printStatus(); - #if EFI_HISTOGRAMS initHistogram(&engineSnifferHisto, "wave chart"); #endif /* EFI_HISTOGRAMS */ +#if ! EFI_UNIT_TEST + printStatus(); addConsoleActionI("chartsize", setChartSize); addConsoleActionI("chart", setChartActive); -#if ! EFI_UNIT_TEST addConsoleAction(CMD_RESET_ENGINE_SNIFFER, resetNow); -#endif +#endif // EFI_UNIT_TEST } #endif /* EFI_ENGINE_SNIFFER */ diff --git a/firmware/development/engine_sniffer.h b/firmware/development/engine_sniffer.h index 64ac3d633f..17e8cfd6c2 100644 --- a/firmware/development/engine_sniffer.h +++ b/firmware/development/engine_sniffer.h @@ -18,6 +18,8 @@ */ class WaveChart { public: + DECLARE_ENGINE_PTR; + WaveChart(); void init(); void addEvent3(const char *name, const char *msg);