From bdffec4ce5c02fb0c39fa24ce8ab6495522094b2 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 3 Jan 2023 08:38:23 -0500 Subject: [PATCH] let's try again --- firmware/controllers/trigger/trigger_central.cpp | 4 ++-- unit_tests/tests/trigger/test_trigger_decoder.cpp | 5 ++++- unit_tests/tests/trigger/test_trigger_input_adc.cpp | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp index 3e4a0eecb2..c7c85290a8 100644 --- a/firmware/controllers/trigger/trigger_central.cpp +++ b/firmware/controllers/trigger/trigger_central.cpp @@ -985,9 +985,9 @@ static void calculateTriggerSynchPoint( } } -void TriggerCentral::updateWaveform() { - static TriggerDecoderBase initState("init"); +TriggerDecoderBase initState("init"); +void TriggerCentral::updateWaveform() { // Re-read config in case it's changed primaryTriggerConfiguration.update(); for (int camIndex = 0;camIndex < CAMS_PER_BANK;camIndex++) { diff --git a/unit_tests/tests/trigger/test_trigger_decoder.cpp b/unit_tests/tests/trigger/test_trigger_decoder.cpp index 39725c6cff..cf46724481 100644 --- a/unit_tests/tests/trigger/test_trigger_decoder.cpp +++ b/unit_tests/tests/trigger/test_trigger_decoder.cpp @@ -24,6 +24,7 @@ using ::testing::_; extern WarningCodeState unitTestWarningCodeState; extern bool printTriggerDebug; +extern float actualSynchGap; extern "C" { void sendOutConfirmation(char *value, int i); @@ -155,6 +156,8 @@ TEST(misc, testFordAspire) { } +extern TriggerDecoderBase initState; + static void testTriggerDecoder2(const char *msg, engine_type_e type, int synchPointIndex, float channel1duty, float channel2duty, float expectedGapRatio = NAN) { printf("====================================================================================== testTriggerDecoder2 msg=%s\r\n", msg); @@ -168,7 +171,7 @@ static void testTriggerDecoder2(const char *msg, engine_type_e type, int synchPo assertEqualsM("synchPointIndex", synchPointIndex, t->getTriggerWaveformSynchPointIndex()); if (!cisnan(expectedGapRatio)) { - assertEqualsM2("actual gap ratio", expectedGapRatio, engine->triggerCentral.triggerState.triggerSyncGapRatio, 0.001); + assertEqualsM2("actual gap ratio", expectedGapRatio, initState.triggerSyncGapRatio, 0.001); } } diff --git a/unit_tests/tests/trigger/test_trigger_input_adc.cpp b/unit_tests/tests/trigger/test_trigger_input_adc.cpp index 9c21e1c673..89ef0d77c3 100644 --- a/unit_tests/tests/trigger/test_trigger_input_adc.cpp +++ b/unit_tests/tests/trigger/test_trigger_input_adc.cpp @@ -43,7 +43,7 @@ static void simulateTrigger(TriggerAdcDetector &trigAdcState, CsvReader &reader, double value = 0; double stamp = reader.readTimestampAndValues(&value); efitick_t stampUs = (efitick_t)(stamp * 1'000'000); - printf("-- %lld %f\r\n", stamp, (float)value); +// printf("--simulateTrigger %lld %f\r\n", stamp, (float)value); // convert into mcu-adc voltage value = minF(maxF(value / voltageDiv, 0), adcMaxVoltage); if (trigAdcState.curAdcMode == TRIGGER_ADC_EXTI) { @@ -53,7 +53,7 @@ static void simulateTrigger(TriggerAdcDetector &trigAdcState, CsvReader &reader, logicValue = value > Vih; // we need at least two values to detect an edge if (prevLogicValue != -1) { - printf("--> DIGITAL %d %d\r\n", logicValue, prevLogicValue); +// printf("--> DIGITAL %d %d\r\n", logicValue, prevLogicValue); trigAdcState.digitalCallback(stampUs, true, logicValue > prevLogicValue ? true : false); } @@ -62,7 +62,7 @@ static void simulateTrigger(TriggerAdcDetector &trigAdcState, CsvReader &reader, } else if (trigAdcState.curAdcMode == TRIGGER_ADC_ADC) { triggerAdcSample_t sampleValue = value * ADC_MAX_VALUE / adcMaxVoltage; - printf("--> ANALOG %d\r\n", sampleValue); +// printf("--> ANALOG %d\r\n", sampleValue); trigAdcState.analogCallback(stampUs, sampleValue); }