ctbk/dmx-interface
1
0
Fork 0
mirror of https://github.com/HendrikRauh/dmx-interface.git synced 2025-07-12 00:15:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into DMX-3-configuration-WebUI

Browse source
This commit is contained in:
RaffaelW 2024-12-15 19:11:50 +01:00
commit 24876b6f63
20 changed files with 45816 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/main.cpp
View file

@ -14,9 +14,7 @@
#include <ArduinoJson.h>
#include "ESPDMX.h"
#include "SPI.h"
#include <SPIFFS.h>
#include <LittleFS.h>
#include "routes/config.h"
DMXESPSerial dmx1;
@ -120,15 +118,14 @@ void setup()
config.end();
}
// Serial console
Serial.print("Start DMX-Interface");
delay(1000);
Serial.println("...");
// wait for serial monitor
delay(5000);
Serial.println("Starting DMX-Interface...");
config.begin("dmx", true);
universe1 = config.getUChar("universe-1", DEFAULT_UNIVERSE1);
universe2 = config.getUChar("universe-2", DEFAULT_UNIVERSE2);
universe1 = config.getUInt("universe-1", DEFAULT_UNIVERSE1);
universe2 = config.getUInt("universe-2", DEFAULT_UNIVERSE2);
direction1 = static_cast<Direction>(config.getUInt("direction-1", DEFAULT_DIRECTION1));
direction2 = static_cast<Direction>(config.getUInt("direction-2", DEFAULT_DIRECTION2));
@ -162,9 +159,6 @@ void setup()
config.end();
// wait for serial monitor
delay(5000);
switch (connection)
{
case WiFiSta:
@ -281,20 +275,19 @@ void setup()
{
dmx2.write((i + 1), data[i]);
}
dmx2.update(); });
}
// if Artnet packet comes, this function is called to every universe
// artnet.subscribeArtDmx([&](const uint8_t *data, uint16_t size, const ArtDmxMetadata &metadata, const ArtNetRemoteInfo &remote) {});
if (!SPIFFS.begin(true))
if (!LittleFS.begin(true))
{
Serial.println("An Error has occurred while mounting SPIFFS");
Serial.println("An Error has occurred while mounting LittleFS");
return;
}
server.serveStatic("/", SPIFFS, "/").setDefaultFile("index.html");
server.serveStatic("/", LittleFS, "/").setDefaultFile("index.html");
server.on("/config", HTTP_GET, [](AsyncWebServerRequest *request)
{ onGetConfig(request); });