rusefi
/
rusefi-full
mirror of https://github.com/rusefi/rusefi-full.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

send more of Engine Sniffer data #4560 

hello Kinetis it has been a while!
This commit is contained in:
rusefillc 2022-09-11 00:18:08 -04:00
parent 6bcd29c727
commit cfb843b315
4 changed files with 51 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
firmware/controllers/engine_cycle/rpm_calculator.cpp
View File

@ -26,12 +26,7 @@
#include "sensor_chart.h"
#endif
#if EFI_ENGINE_SNIFFER
#include "engine_sniffer.h"
extern WaveChart waveChart;
#endif /* EFI_ENGINE_SNIFFER */
// See RpmCalculator::checkIfSpinning()
#ifndef NO_RPM_EVENTS_TIMEOUT_SECS

36
firmware/controllers/trigger/trigger_central.cpp
View File

@ -8,7 +8,6 @@
#include "pch.h"
#include "trigger_central.h"
#include "trigger_decoder.h"
#include "main_trigger_callback.h"
@ -25,13 +24,13 @@
#include "map_averaging.h"
#include "main_trigger_callback.h"
#include "status_loop.h"
#include "engine_sniffer.h"
#if EFI_TUNER_STUDIO
#include "tunerstudio.h"
#endif /* EFI_TUNER_STUDIO */
#if EFI_ENGINE_SNIFFER
#include "engine_sniffer.h"
WaveChart waveChart;
#endif /* EFI_ENGINE_SNIFFER */
@ -206,9 +205,6 @@ static angle_t wrapVvt(angle_t vvtPosition, int period) {
}
static void logFront(bool isImportantFront, efitick_t nowNt, int index) {
extern const char *vvtNames[];
const char *vvtName = vvtNames[index];
if (isImportantFront && engineConfiguration->camInputsDebug[index] != Gpio::Unassigned) {
#if EFI_PROD_CODE
writePad("cam debug", engineConfiguration->camInputsDebug[index], 1);
@ -224,16 +220,16 @@ static void logFront(bool isImportantFront, efitick_t nowNt, int index) {
LogTriggerTooth(SHAFT_SECONDARY_RISING, nowNt);
LogTriggerTooth(SHAFT_SECONDARY_FALLING, nowNt);
#endif /* EFI_TOOTH_LOGGER */
addEngineSnifferEvent(vvtName, PROTOCOL_ES_UP);
addEngineSnifferEvent(vvtName, PROTOCOL_ES_DOWN);
addEngineSnifferVvtEvent(index, FrontDirection::UP);
addEngineSnifferVvtEvent(index, FrontDirection::DOWN);
} else {
#if EFI_TOOTH_LOGGER
LogTriggerTooth(SHAFT_SECONDARY_FALLING, nowNt);
LogTriggerTooth(SHAFT_SECONDARY_RISING, nowNt);
#endif /* EFI_TOOTH_LOGGER */
addEngineSnifferEvent(vvtName, PROTOCOL_ES_DOWN);
addEngineSnifferEvent(vvtName, PROTOCOL_ES_UP);
addEngineSnifferVvtEvent(index, FrontDirection::DOWN);
addEngineSnifferVvtEvent(index, FrontDirection::UP);
}
}
}
@ -252,8 +248,6 @@ void hwHandleVvtCamSignal(trigger_value_e front, efitick_t nowNt, int index) {
} else {
tc->vvtEventFallCounter[index]++;
}
extern const char *vvtNames[];
const char *vvtName = vvtNames[index];
if (engineConfiguration->vvtMode[camIndex] == VVT_INACTIVE) {
warning(CUSTOM_VVT_MODE_NOT_SELECTED, "VVT: event on %d but no mode", camIndex);
}
@ -274,7 +268,8 @@ void hwHandleVvtCamSignal(trigger_value_e front, efitick_t nowNt, int index) {
#endif // VR_HW_CHECK_MODE
if (!engineConfiguration->displayLogicLevelsInEngineSniffer) {
addEngineSnifferEvent(vvtName, front == TV_RISE ? PROTOCOL_ES_UP : PROTOCOL_ES_DOWN);
// todo: migrate injector_pressure_type_e to class enum, maybe merge with FrontDirection?
addEngineSnifferVvtEvent(index, front == TV_RISE ? FrontDirection::UP : FrontDirection::DOWN);
#if EFI_TOOTH_LOGGER
// todo: we need to start logging different VVT channels differently!!!
@ -520,26 +515,22 @@ void TriggerCentral::resetCounters() {
memset(hwEventCounters, 0, sizeof(hwEventCounters));
}
static char shaft_signal_msg_index[15];
static const bool isUpEvent[4] = { false, true, false, true };
static const int wheelIndeces[4] = { 0, 0, 1, 1};
static const bool isUpEvent[6] = { false, true, false, true, false, true };
static const char *eventId[6] = { PROTOCOL_CRANK1, PROTOCOL_CRANK1, PROTOCOL_CRANK2, PROTOCOL_CRANK2, PROTOCOL_CRANK3, PROTOCOL_CRANK3 };
static void reportEventToWaveChart(trigger_event_e ckpSignalType, int index) {
static void reportEventToWaveChart(trigger_event_e ckpSignalType, int triggerEventIndex) {
if (!engine->isEngineSnifferEnabled) { // this is here just as a shortcut so that we avoid engine sniffer as soon as possible
return; // engineSnifferRpmThreshold is accounted for inside engine->isEngineSnifferEnabled
}
int wheelIndex = wheelIndeces[(int )ckpSignalType];
itoa10(&shaft_signal_msg_index[2], index);
bool isUp = isUpEvent[(int) ckpSignalType];
shaft_signal_msg_index[0] = isUp ? 'u' : 'd';
addEngineSnifferEvent(eventId[(int )ckpSignalType], (char* ) shaft_signal_msg_index);
addEngineSnifferCrankEvent(wheelIndex, triggerEventIndex, isUp ? FrontDirection::UP : FrontDirection::DOWN);
if (engineConfiguration->useOnlyRisingEdgeForTrigger) {
// let's add the opposite event right away
shaft_signal_msg_index[0] = isUp ? 'd' : 'u';
addEngineSnifferEvent(eventId[(int )ckpSignalType], (char* ) shaft_signal_msg_index);
addEngineSnifferCrankEvent(wheelIndex, triggerEventIndex, isUp ? FrontDirection::DOWN : FrontDirection::UP);
}
}
@ -972,7 +963,6 @@ void validateTriggerInputs() {
}
void initTriggerCentral() {
strcpy((char*) shaft_signal_msg_index, "x_");
#if EFI_ENGINE_SNIFFER
initWaveChart(&waveChart);

70
firmware/development/engine_sniffer.cpp
View File

@ -28,6 +28,9 @@
#include "engine_sniffer.h"
// a bit weird because of conditional compilation
static char shaft_signal_msg_index[15];
#if EFI_ENGINE_SNIFFER
#include "eficonsole.h"
@ -143,40 +146,6 @@ void WaveChart::publish() {
}
}
void addEngineSnifferTdcEvent(int rpm) {
static char rpmBuffer[_MAX_FILLER];
itoa10(rpmBuffer, rpm);
#if EFI_ENGINE_SNIFFER
waveChart.startDataCollection();
#endif
addEngineSnifferEvent(TOP_DEAD_CENTER_MESSAGE, (char* ) rpmBuffer);
}
void addEngineSnifferLogicAnalyzerEvent(int laIndex, FrontDirection frontDirection) {
extern const char *laNames[];
const char *name = laNames[laIndex];
addEngineSnifferEvent(name, frontDirection == FrontDirection::UP ? PROTOCOL_ES_UP : PROTOCOL_ES_DOWN);
}
static char shaft_signal_msg_index[15];
void addEngineSnifferCrankEvent(int wheelIndex, int triggerEventIndex, FrontDirection frontDirection) {
static const char *crankName[2] = { PROTOCOL_CRANK1, PROTOCOL_CRANK2 };
shaft_signal_msg_index[0] = frontDirection == FrontDirection::UP ? 'u' : 'd';
// shaft_signal_msg_index[1] is assigned once and forever in the init method below
itoa10(&shaft_signal_msg_index[2], triggerEventIndex);
addEngineSnifferEvent(crankName[wheelIndex], (char* ) shaft_signal_msg_index);
}
void addEngineSnifferVvtEvent(int vvtIndex, FrontDirection frontDirection) {
extern const char *vvtNames[];
const char *vvtName = vvtNames[vvtIndex];
addEngineSnifferEvent(vvtName, frontDirection == FrontDirection::UP ? PROTOCOL_ES_UP : PROTOCOL_ES_DOWN);
}
/**
* @brief Register an event for digital sniffer
*/
@ -272,3 +241,36 @@ void initWaveChart(WaveChart *chart) {
}
#endif /* EFI_ENGINE_SNIFFER */
void addEngineSnifferTdcEvent(int rpm) {
static char rpmBuffer[_MAX_FILLER];
itoa10(rpmBuffer, rpm);
#if EFI_ENGINE_SNIFFER
waveChart.startDataCollection();
#endif
addEngineSnifferEvent(TOP_DEAD_CENTER_MESSAGE, (char* ) rpmBuffer);
}
void addEngineSnifferLogicAnalyzerEvent(int laIndex, FrontDirection frontDirection) {
extern const char *laNames[];
const char *name = laNames[laIndex];
addEngineSnifferEvent(name, frontDirection == FrontDirection::UP ? PROTOCOL_ES_UP : PROTOCOL_ES_DOWN);
}
void addEngineSnifferCrankEvent(int wheelIndex, int triggerEventIndex, FrontDirection frontDirection) {
static const char *crankName[2] = { PROTOCOL_CRANK1, PROTOCOL_CRANK2 };
shaft_signal_msg_index[0] = frontDirection == FrontDirection::UP ? 'u' : 'd';
// shaft_signal_msg_index[1] is assigned once and forever in the init method below
itoa10(&shaft_signal_msg_index[2], triggerEventIndex);
addEngineSnifferEvent(crankName[wheelIndex], (char* ) shaft_signal_msg_index);
}
void addEngineSnifferVvtEvent(int vvtIndex, FrontDirection frontDirection) {
extern const char *vvtNames[];
const char *vvtName = vvtNames[vvtIndex];
addEngineSnifferEvent(vvtName, frontDirection == FrontDirection::UP ? PROTOCOL_ES_UP : PROTOCOL_ES_DOWN);
}

3
firmware/development/engine_sniffer.h
View File

@ -10,7 +10,6 @@
#include "rusefi_enums.h"
#if EFI_ENGINE_SNIFFER
#include "datalogging.h"
enum class FrontDirection : uint8_t {
@ -28,6 +27,8 @@ void addEngineSnifferCrankEvent(int wheelIndex, int triggerEventIndex, FrontDire
void addEngineSnifferVvtEvent(int vvtIndex, FrontDirection frontDirection);
void addEngineSnifferOutputPinEvent(int outputPinType, int isUp);
#if EFI_ENGINE_SNIFFER
/**
* @brief rusEfi console sniffer data buffer
*/