From 52972cec999150d21a40bbc446d133ccdc72b922 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 19 Jul 2020 21:27:28 -0400 Subject: [PATCH] OMG it works! --- unit_tests/Makefile | 1 + unit_tests/logicdata.cpp | 3 +-- unit_tests/logicdata_sandbox.cpp | 11 ++++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/unit_tests/Makefile b/unit_tests/Makefile index 7d7e5f88f6..3c68262b20 100644 --- a/unit_tests/Makefile +++ b/unit_tests/Makefile @@ -142,6 +142,7 @@ CPPSRC = $(UTILSRC_CPP) \ $(HW_SENSORS_SRC) \ $(TRIGGER_SRC_CPP) \ $(INIT_SRC_CPP) \ + $(PROJECT_DIR)/../unit_tests/logicdata.cpp \ $(PROJECT_DIR)/../unit_tests/main.cpp \ $(PROJECT_DIR)/console/binary_log/log_field.cpp \ diff --git a/unit_tests/logicdata.cpp b/unit_tests/logicdata.cpp index e278c2575b..c76299a119 100644 --- a/unit_tests/logicdata.cpp +++ b/unit_tests/logicdata.cpp @@ -212,7 +212,6 @@ static void writeChannelData(int ch, int64_t *chDeltas, int chLastState, write(ch + 1); write(0); write(realDurationInSamples); - printf("realDurationInSamples=%d\n", realDurationInSamples); write(1); write(lastRecord); @@ -403,12 +402,12 @@ static void writeEvents(CompositeEvent *events, int count) { writeChannelDataHeader(); int64_t *chDeltas = (int64_t*) malloc(sizeof(int64_t) * count); - int deltaCount = 0; bool useLongDeltas = false; for (int ch = 0; ch < numChannels; ch++) { int chPrevState = -1; int prevTs = 0; + int deltaCount = 0; for (int i = 0; i < count; i++) { CompositeEvent *event = &events[i]; diff --git a/unit_tests/logicdata_sandbox.cpp b/unit_tests/logicdata_sandbox.cpp index 091e924f25..e56c98b713 100644 --- a/unit_tests/logicdata_sandbox.cpp +++ b/unit_tests/logicdata_sandbox.cpp @@ -9,9 +9,14 @@ void setEvent(CompositeEvent *events, int index, int timestamp, bool primaryTrigger, bool secondaryTrigger, bool trg, bool sync, bool coil, bool injector) { events[index].timestamp = timestamp; events[index].primaryTrigger = primaryTrigger; + events[index].secondaryTrigger = secondaryTrigger; + events[index].trg = trg; + events[index].sync = sync; + events[index].coil = coil; + events[index].injector = injector; } -int main(int argc, char **argv) { +void runLogicdataSandbox() { printf(".logicdata Sandbox 20200719\n"); @@ -26,3 +31,7 @@ int main(int argc, char **argv) { printf("Done!\n"); } + +int main(int argc, char **argv) { + runLogicdataSandbox(); +}