From 176a12a9b3201f948914ac216e50cb3ff8ad2131 Mon Sep 17 00:00:00 2001
From: Hendrik Rauh <114620133+HendrikRauh@users.noreply.github.com>
Date: Thu, 6 Mar 2025 21:44:55 +0100
Subject: [PATCH] Revert "Merge branch 'main' into 30-add-dmx-in-capability"
This reverts commit b93ae3d68228db008b5a46f8932ceede613a0ae7, reversing
changes made to f3ef3aa9b927bc5b06998795f4a23abb9f09a88f.
---
data/index.html | 2 +-
data/range-input.js | 16 +++++-----------
src/main.cpp | 4 ----
src/routes/channels.cpp | 29 -----------------------------
src/routes/channels.h | 8 --------
5 files changed, 6 insertions(+), 53 deletions(-)
delete mode 100644 src/routes/channels.cpp
delete mode 100644 src/routes/channels.h
diff --git a/data/index.html b/data/index.html
index 330dbee..c6f81ab 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 4bc9c62..4b31c04 100644
--- a/data/range-input.js
+++ b/data/range-input.js
@@ -1,20 +1,14 @@
-const form = document.querySelector("form");
-
-form.addEventListener("input", (event) => {
+document.querySelector("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);
+});
diff --git a/src/main.cpp b/src/main.cpp
index 5a9c443..ce64fd4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -23,7 +23,6 @@
#include
#include "routes/config.h"
#include "routes/networks.h"
-#include "routes/channels.h"
//DMXESPSerial dmx1;
//DMXESPSerial dmx2;
@@ -396,9 +395,6 @@ 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
deleted file mode 100644
index a9b6f5d..0000000
--- a/src/routes/channels.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "channels.h"
-
-void onGetChannels(AsyncWebServerRequest *request, DMXESPSerial dmx1, DMXESPSerial dmx2)
-{
- JsonDocument doc;
-
- for (int channel = 1; channel <= DMXCHANNELS; channel++)
- {
- uint8_t value = dmx1.read(channel);
- if (value != 0)
- {
- doc["dmx1"][String(channel)] = value;
- }
- }
-
- for (int channel = 1; channel <= DMXCHANNELS; channel++)
- {
- uint8_t value = dmx2.read(channel);
- if (value != 0)
- {
- doc["dmx2"][String(channel)] = value;
- }
- }
-
- 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
deleted file mode 100644
index bbdec2f..0000000
--- a/src/routes/channels.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#include
-#include
-#include
-#include "ESPDMX.h"
-
-extern Preferences config;
-
-void onGetChannels(AsyncWebServerRequest *request, DMXESPSerial dmx1, DMXESPSerial dmx2);
\ No newline at end of file