From 066ac7e2eaf23e13406a400ea552bb1be4407c11 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sat, 29 Oct 2022 21:27:49 -0400 Subject: [PATCH] send more of Engine Sniffer data #4560 --- firmware/controllers/system/efi_gpio.cpp | 6 ++---- firmware/development/engine_sniffer.cpp | 6 ++++++ firmware/development/engine_sniffer.h | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/firmware/controllers/system/efi_gpio.cpp b/firmware/controllers/system/efi_gpio.cpp index 6398a2fb77..be7f88e131 100644 --- a/firmware/controllers/system/efi_gpio.cpp +++ b/firmware/controllers/system/efi_gpio.cpp @@ -335,9 +335,7 @@ void NamedOutputPin::setHigh() { setValue(true); #if EFI_ENGINE_SNIFFER - if (!engineConfiguration->engineSnifferFocusOnInputs) { - addEngineSnifferEvent(getShortName(), PROTOCOL_ES_UP); - } + addEngineSnifferOutputPinEvent(this, FrontDirection::UP); #endif /* EFI_ENGINE_SNIFFER */ } @@ -352,7 +350,7 @@ void NamedOutputPin::setLow() { setValue(false); #if EFI_ENGINE_SNIFFER - addEngineSnifferEvent(getShortName(), PROTOCOL_ES_DOWN); + addEngineSnifferOutputPinEvent(this, FrontDirection::DOWN); #endif /* EFI_ENGINE_SNIFFER */ } diff --git a/firmware/development/engine_sniffer.cpp b/firmware/development/engine_sniffer.cpp index 66a821d3a3..30acffe2e7 100644 --- a/firmware/development/engine_sniffer.cpp +++ b/firmware/development/engine_sniffer.cpp @@ -242,6 +242,12 @@ void initWaveChart(WaveChart *chart) { #endif /* EFI_ENGINE_SNIFFER */ +void addEngineSnifferOutputPinEvent(NamedOutputPin *pin, FrontDirection frontDirection) { + if (!engineConfiguration->engineSnifferFocusOnInputs) { + addEngineSnifferEvent(pin->getShortName(), frontDirection == FrontDirection::UP ? PROTOCOL_ES_UP : PROTOCOL_ES_DOWN); + } +} + void addEngineSnifferTdcEvent(int rpm) { static char rpmBuffer[_MAX_FILLER]; itoa10(rpmBuffer, rpm); diff --git a/firmware/development/engine_sniffer.h b/firmware/development/engine_sniffer.h index c4ede832e7..a846a475d9 100644 --- a/firmware/development/engine_sniffer.h +++ b/firmware/development/engine_sniffer.h @@ -25,7 +25,7 @@ void addEngineSnifferLogicAnalyzerEvent(int laIndex, FrontDirection frontDirecti */ void addEngineSnifferCrankEvent(int wheelIndex, int triggerEventIndex, FrontDirection frontDirection); void addEngineSnifferVvtEvent(int vvtIndex, FrontDirection frontDirection); -void addEngineSnifferOutputPinEvent(int outputPinType, int isUp); +void addEngineSnifferOutputPinEvent(NamedOutputPin *pin, FrontDirection frontDirection); #if EFI_ENGINE_SNIFFER