ctbk/dmx-interface
1
0
Fork 0
mirror of https://github.com/HendrikRauh/dmx-interface.git synced 2025-05-19 10:32:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Merge branch 'main' into 30-add-dmx-in-capability"

Browse source 
This reverts commit b93ae3d682, reversing
changes made to f3ef3aa9b9.
This commit is contained in:
Hendrik Rauh 2025-03-06 21:44:55 +01:00
parent b93ae3d682
commit 176a12a9b3
5 changed files with 6 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/index.html
View file

@ -7,11 +7,11 @@
<link rel="stylesheet" href="/style.css" /> <link rel="stylesheet" href="/style.css" />
<script type="module" src="/input-visibility.js" defer></script> <script type="module" src="/input-visibility.js" defer></script>
<script type="module" src="/loading-screen.js" defer></script> <script type="module" src="/loading-screen.js" defer></script>
<script type="module" src="/range-input.js" defer></script>
<script type="module" src="/load-data.js" defer></script> <script type="module" src="/load-data.js" defer></script>
<script type="module" src="/networks.js" defer></script> <script type="module" src="/networks.js" defer></script>
<script type="module" src="/submit.js" defer></script> <script type="module" src="/submit.js" defer></script>
<script type="module" src="/reset.js" defer></script> <script type="module" src="/reset.js" defer></script>
<script type="module" src="/range-input.js" defer></script>
</head> </head>
<body> <body>
<main> <main>

16
data/range-input.js
View file

@ -1,20 +1,14 @@
const form = document.querySelector("form"); document.querySelector("form").addEventListener("input", (event) => {
form.addEventListener("input", (event) => {
if (event.target.classList.contains("range")) { if (event.target.classList.contains("range")) {
updateValue(event.target); updateValue(event.target);
} }
}); });
form.addEventListener("change", () => {
console.log("received change event");
document.querySelectorAll("input[type='range']").forEach((input) => {
updateValue(input);
});
});
function updateValue(slider) { function updateValue(slider) {
console.log("update slide value");
const percentage = Math.round((slider.value / slider.max) * 100); const percentage = Math.round((slider.value / slider.max) * 100);
slider.nextElementSibling.innerText = `${percentage}%`; slider.nextElementSibling.innerText = `${percentage}%`;
} }
document.querySelectorAll("input[type='range'].range").forEach((element) => {
updateValue(element);
});

4
src/main.cpp
View file

@ -23,7 +23,6 @@
#include <LittleFS.h> #include <LittleFS.h>
#include "routes/config.h" #include "routes/config.h"
#include "routes/networks.h" #include "routes/networks.h"
#include "routes/channels.h"
//DMXESPSerial dmx1; //DMXESPSerial dmx1;
//DMXESPSerial dmx2; //DMXESPSerial dmx2;
@ -396,9 +395,6 @@ void setup()
server.on("/networks", HTTP_GET, [](AsyncWebServerRequest *request) server.on("/networks", HTTP_GET, [](AsyncWebServerRequest *request)
{ onGetNetworks(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) server.onRequestBody([](AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total)
{ {
if (request->url() == "/config" && request->method() == HTTP_PUT) { if (request->url() == "/config" && request->method() == HTTP_PUT) {

29
src/routes/channels.cpp
View file

@ -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);
}

8
src/routes/channels.h
View file

@ -1,8 +0,0 @@
#include <Preferences.h>
#include <ArduinoJson.h>
#include <AsyncWebServer_ESP32_W5500.h>
#include "ESPDMX.h"
extern Preferences config;
void onGetChannels(AsyncWebServerRequest *request, DMXESPSerial dmx1, DMXESPSerial dmx2);