From 785121714020b244056a86ed5ad1fc0d9a584c9b Mon Sep 17 00:00:00 2001 From: thek4n Date: Sat, 13 Jun 2026 00:21:49 +0300 Subject: [PATCH] prototype --- assets/root.html | 90 +++++++++++++++++++--- firmware/logic_analyzer/logic_analyzer.ino | 4 +- 2 files changed, 83 insertions(+), 11 deletions(-) diff --git a/assets/root.html b/assets/root.html index 432de7d..02f9ede 100644 --- a/assets/root.html +++ b/assets/root.html @@ -1,19 +1,88 @@ - "; - + + Logic Analyzer
- +
- - + + + diff --git a/firmware/logic_analyzer/logic_analyzer.ino b/firmware/logic_analyzer/logic_analyzer.ino index 471732b..611d391 100644 --- a/firmware/logic_analyzer/logic_analyzer.ino +++ b/firmware/logic_analyzer/logic_analyzer.ino @@ -146,8 +146,8 @@ void websocketSendSamples() { lastTime = now; - // конвертировать SAMPLES в json - String output = "{\"type\":\"data\",\"len\":" + String(SAMPLES_BUFFER_CAP) + ",\"data\":["; + int channels_total = sizeof(PINS) / sizeof(PINS[0]); + String output = "{\"type\":\"data\",\"samples_total\":" + String(SAMPLES_BUFFER_CAP) + ", \"channels_total\":" + String(channels_total) + ", \"samples\":["; for (int i = 0; i < SAMPLES_BUFFER_CAP; ++i) { output += String(SAMPLES[i].mask); if (i < SAMPLES_BUFFER_CAP - 1) output += ",";