From a5169434cc1fb56546f586aeafa8425a3c1596d2 Mon Sep 17 00:00:00 2001 From: Hendrik Rauh <114620133+HendrikRauh@users.noreply.github.com> Date: Wed, 18 Dec 2024 21:35:17 +0100 Subject: [PATCH 1/4] roughly implemented a dmx endpoint for debug --- src/main.cpp | 4 ++++ src/routes/channels.cpp | 21 +++++++++++++++++++++ src/routes/channels.h | 8 ++++++++ 3 files changed, 33 insertions(+) create mode 100644 src/routes/channels.cpp create mode 100644 src/routes/channels.h diff --git a/src/main.cpp b/src/main.cpp index 40b1153..d307898 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -17,6 +17,7 @@ #include #include "routes/config.h" #include "routes/networks.h" +#include "routes/channels.h" DMXESPSerial dmx1; DMXESPSerial dmx2; @@ -309,6 +310,9 @@ void setup() server.on("/networks", HTTP_GET, [](AsyncWebServerRequest *request) { onGetNetworks(request); }); + server.on("/dmx", HTTP_GET, [](AsyncWebServerRequest *request) + { onGetChannels(request, dmx1, dmx2); }); + server.onRequestBody([](AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total) { if (request->url() == "/config" && request->method() == HTTP_PUT) { diff --git a/src/routes/channels.cpp b/src/routes/channels.cpp new file mode 100644 index 0000000..6f2849c --- /dev/null +++ b/src/routes/channels.cpp @@ -0,0 +1,21 @@ +#include "channels.h" + +void onGetChannels(AsyncWebServerRequest *request, DMXESPSerial dmx1, DMXESPSerial dmx2) +{ + JsonDocument doc; + + for (int channel = 1; channel <= DMXCHANNELS; channel++) + { + doc["dmx1"][channel] = dmx1.read(channel); + } + + for (int channel = 1; channel <= DMXCHANNELS; channel++) + { + doc["dmx2"][channel] = dmx2.read(channel); + } + + String jsonBuffer; + serializeJson(doc, jsonBuffer); + + request->send(200, "application/json", jsonBuffer); +} \ No newline at end of file diff --git a/src/routes/channels.h b/src/routes/channels.h new file mode 100644 index 0000000..bbdec2f --- /dev/null +++ b/src/routes/channels.h @@ -0,0 +1,8 @@ +#include +#include +#include +#include "ESPDMX.h" + +extern Preferences config; + +void onGetChannels(AsyncWebServerRequest *request, DMXESPSerial dmx1, DMXESPSerial dmx2); \ No newline at end of file From a3023faa8c8e7acbcc4a3b4106f64ea2f4298624 Mon Sep 17 00:00:00 2001 From: Hendrik Rauh <114620133+HendrikRauh@users.noreply.github.com> Date: Wed, 18 Dec 2024 21:42:12 +0100 Subject: [PATCH 2/4] removed channel 0 --- src/routes/channels.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/channels.cpp b/src/routes/channels.cpp index 6f2849c..f3bb74d 100644 --- a/src/routes/channels.cpp +++ b/src/routes/channels.cpp @@ -6,12 +6,12 @@ void onGetChannels(AsyncWebServerRequest *request, DMXESPSerial dmx1, DMXESPSeri for (int channel = 1; channel <= DMXCHANNELS; channel++) { - doc["dmx1"][channel] = dmx1.read(channel); + doc["dmx1"][String(channel)] = dmx1.read(channel); } for (int channel = 1; channel <= DMXCHANNELS; channel++) { - doc["dmx2"][channel] = dmx2.read(channel); + doc["dmx2"][String(channel)] = dmx2.read(channel); } String jsonBuffer; From 16c06fd3701e78a5fd55162994df1c145ce880af Mon Sep 17 00:00:00 2001 From: Hendrik Rauh <114620133+HendrikRauh@users.noreply.github.com> Date: Wed, 18 Dec 2024 21:59:56 +0100 Subject: [PATCH 3/4] only sending non 0 values --- src/routes/channels.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/routes/channels.cpp b/src/routes/channels.cpp index f3bb74d..a9b6f5d 100644 --- a/src/routes/channels.cpp +++ b/src/routes/channels.cpp @@ -6,12 +6,20 @@ void onGetChannels(AsyncWebServerRequest *request, DMXESPSerial dmx1, DMXESPSeri for (int channel = 1; channel <= DMXCHANNELS; channel++) { - doc["dmx1"][String(channel)] = dmx1.read(channel); + uint8_t value = dmx1.read(channel); + if (value != 0) + { + doc["dmx1"][String(channel)] = value; + } } for (int channel = 1; channel <= DMXCHANNELS; channel++) { - doc["dmx2"][String(channel)] = dmx2.read(channel); + uint8_t value = dmx2.read(channel); + if (value != 0) + { + doc["dmx2"][String(channel)] = value; + } } String jsonBuffer; From 1ccf214ddbc3183c7c1410d442547e6c735b58a2 Mon Sep 17 00:00:00 2001 From: RaffaelW Date: Sun, 16 Feb 2025 20:46:06 +0100 Subject: [PATCH 4/4] =?UTF-8?q?fixes=20"Slider=20f=C3=BCr=20Helligkeit=20z?= =?UTF-8?q?eigt=20beim=20ersten=20Laden=2050%=20ist=20aber=20bei=2010%"=20?= =?UTF-8?q?#68?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/index.html | 2 +- data/range-input.js | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/data/index.html b/data/index.html index c6f81ab..330dbee 100644 --- a/data/index.html +++ b/data/index.html @@ -7,11 +7,11 @@ + -
diff --git a/data/range-input.js b/data/range-input.js index 4b31c04..4bc9c62 100644 --- a/data/range-input.js +++ b/data/range-input.js @@ -1,14 +1,20 @@ -document.querySelector("form").addEventListener("input", (event) => { +const form = document.querySelector("form"); + +form.addEventListener("input", (event) => { if (event.target.classList.contains("range")) { updateValue(event.target); } }); +form.addEventListener("change", () => { + console.log("received change event"); + document.querySelectorAll("input[type='range']").forEach((input) => { + updateValue(input); + }); +}); + function updateValue(slider) { + console.log("update slide value"); const percentage = Math.round((slider.value / slider.max) * 100); slider.nextElementSibling.innerText = `${percentage}%`; } - -document.querySelectorAll("input[type='range'].range").forEach((element) => { - updateValue(element); -});