diff --git a/data/index.html b/data/index.html
index b9d3877..96ef84c 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/platformio.ini b/platformio.ini
index 38d1108..606d8f3 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -18,6 +18,16 @@ board_build.filesystem = littlefs
[env:lolin_s2_mini]
platform = espressif32
board = lolin_s2_mini
-lib_deps =
+lib_deps =
bblanchon/ArduinoJson @ ^7.2.0
+ someweisguy/esp_dmx
extra_scripts = pre:pre_extra_script.py
+;build_type = debug
+;build_flags = -DCORE_DEBUG_LEVEL=5
+;upload_port = COM4
+monitor_port = COM4
+
+[env:esp32_wroom_32]
+platform = espressif32
+board = nodemcu-32s
+lib_deps = bblanchon/ArduinoJson @ ^7.2.0
diff --git a/src/ESPDMX.cpp b/src/ESPDMX.cpp
deleted file mode 100644
index d2e8985..0000000
--- a/src/ESPDMX.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ----- LIBRARIES ----- */
-#include
-#include "ESPDMX.h"
-
-// DMX value array and size. Entry 0 will hold startbyte, so we need 512+1 elements
-// std::vector dmxDataStores(MAX_IDS);
-// uint8_t dmxDataStores[MAX_IDS][DMXCHANNELS + 1];
-
-// Set up the DMX-Protocol
-void DMXESPSerial::init(int pinSend = DMX_DEFAULT_TX, int pinRecv = DMX_DEFAULT_RX, HardwareSerial& port = DMX_DEFAULT_PORT)
-{
- sendPin = pinSend;
- recvPin = pinRecv;
- _Serial = &port;
- _Serial->begin(DMXSPEED, DMXFORMAT, recvPin, sendPin);
- Serial.print("Init DMX with pins (TX/RX): ");
- Serial.print(sendPin);
- Serial.print("/");
- Serial.println(recvPin);
- pinMode(sendPin, OUTPUT);
- dmxStarted = true;
-}
-
-// Function to read DMX data
-uint8_t DMXESPSerial::read(int channel)
-{
- if (dmxStarted == false)
- init();
-
- if (channel < 1)
- channel = 1;
- if (channel > DMXCHANNELS)
- channel = DMXCHANNELS;
- return (dmxDataStore[channel]);
-}
-uint8_t* DMXESPSerial::readAll()
-{
- if (dmxStarted == false)
- init();
-
- return (&dmxDataStore[1]);
-}
-
-
-// Function to send DMX data
-void DMXESPSerial::write(int channel, uint8_t value)
-{
-
- if (dmxStarted == false)
- init();
-
- if (channel < 1)
- channel = 1;
- if (channel > DMXCHANNELS)
- channel = DMXCHANNELS;
-
- dmxDataStore[channel] = value;
-}
-
-void DMXESPSerial::end()
-{
- _Serial->end();
-}
-
-// Function to update the DMX bus
-void DMXESPSerial::update()
-{
- // Send break
- digitalWrite(sendPin, HIGH);
- _Serial->begin(BREAKSPEED, BREAKFORMAT, recvPin, sendPin);
- _Serial->write(0);
- _Serial->flush();
- delay(1);
- _Serial->end();
-
- // send data
- _Serial->begin(DMXSPEED, DMXFORMAT, recvPin, sendPin);
- digitalWrite(sendPin, LOW);
- _Serial->write(dmxDataStore, DMXCHANNELS);
- _Serial->flush();
- delay(1);
- _Serial->end();
-}
\ No newline at end of file
diff --git a/src/ESPDMX.h b/src/ESPDMX.h
deleted file mode 100644
index 4c8e2a2..0000000
--- a/src/ESPDMX.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#include
-#include
-
-#ifndef ESPDMX_h
-#define ESPDMX_h
-
-#define DMXSPEED 250000
-#define DMXFORMAT SERIAL_8N2
-#define BREAKSPEED 83333
-#define BREAKFORMAT SERIAL_8N1
-#define DMX_DEFAULT_PORT Serial0
-#define DMX_DEFAULT_TX 21
-#define DMX_DEFAULT_RX 33
-#define DMXCHANNELS 512
-
-class DMXESPSerial
-{
-public:
- int sendPin;
- int recvPin;
- HardwareSerial *port;
- bool dmxStarted;
- uint8_t dmxDataStore[DMXCHANNELS + 1];
-
- void init(int pinSend, int pinRecv, HardwareSerial& port);
- uint8_t read(int channel);
- uint8_t* readAll();
- void write(int channel, uint8_t value);
- void update();
- void end();
-
-private:
- // Member variables
- HardwareSerial* _Serial;
-};
-
-#endif
diff --git a/src/main.cpp b/src/main.cpp
index 516d94d..5d63bb7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,9 @@
#ifdef ESP32
#include
#include
+// #include
+// #include "USBCDC.h"
+#include "driver/temp_sensor.h"
#elif defined(ESP8266)
#include
#include
@@ -13,14 +16,24 @@
#include
#include
-#include "ESPDMX.h"
+// #include "ESPDMX.h"
+#include
+#include
+
#include
#include "routes/config.h"
#include "routes/networks.h"
-#include "routes/channels.h"
-DMXESPSerial dmx1;
-DMXESPSerial dmx2;
+// DMXESPSerial dmx1;
+// DMXESPSerial dmx2;
+dmx_port_t dmx1 = DMX_NUM_0; // for esp32s2
+dmx_port_t dmx2 = DMX_NUM_1;
+byte dmx1_data[DMX_PACKET_SIZE];
+byte dmx2_data[DMX_PACKET_SIZE];
+unsigned long dmx1_lastUpdate = millis();
+unsigned long dmx2_lastUpdate = millis();
+bool dmx1_IsConnected = false;
+bool dmx2_IsConnected = false;
// Button
#define PIN_LED 7
@@ -29,10 +42,10 @@ DMXESPSerial dmx2;
uint8_t brightness_led = 20;
bool status_led;
-hw_timer_t *timer = NULL; // H/W timer defining (Pointer to the Structure)
+/* hw_timer_t *timer = NULL; // H/W timer defining (Pointer to the Structure)
portMUX_TYPE timerMux = portMUX_INITIALIZER_UNLOCKED;
void IRAM_ATTR onTimer()
-{ // Defining Inerrupt function with IRAM_ATTR for faster access
+{ // Defining interrupt function with IRAM_ATTR for faster access
portENTER_CRITICAL_ISR(&timerMux);
status_led = !status_led;
if (!status_led)
@@ -44,7 +57,7 @@ void IRAM_ATTR onTimer()
analogWrite(PIN_LED, 0);
}
portEXIT_CRITICAL_ISR(&timerMux);
-}
+} */
// Ethernet stuff
#define ETH_SCK 36
@@ -53,7 +66,7 @@ void IRAM_ATTR onTimer()
#define ETH_MISO 37
#define ETH_INT 38
#define ETH_SPI_CLOCK_MHZ 25
-byte mac[6] = {0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED};
+byte mac[6];
AsyncWebServer server(80);
@@ -64,9 +77,7 @@ uint8_t universe1;
uint8_t universe2;
Direction direction1;
Direction direction2;
-// const uint16_t size = 512;
-// uint8_t data[DMXCHANNELS];
-
+/*
void ledBlink(int ms)
{
if (timer == NULL)
@@ -85,6 +96,13 @@ void ledBlink(int ms)
timerAlarmWrite(timer, ms, true); // Match value= 1000000 for 1 sec. delay.
timerAlarmEnable(timer); // Enable Timer with interrupt (Alarm Enable)
}
+} */
+
+float getTemperature()
+{
+ float tempC = -1.0f;
+ temp_sensor_read_celsius(&tempC);
+ return tempC;
}
void onButtonPress()
@@ -118,10 +136,28 @@ void onButtonPress()
void setup()
{
+
Serial.begin(9600);
// Get ETH mac
+ delay(1000);
+
+ esp_efuse_mac_get_default(mac);
+
esp_read_mac(mac, ESP_MAC_ETH);
+ Serial.printf("%02x:%02x:%02x:%02x:%02x:%02x ESP MAC ETH\n",
+ mac[0], mac[1], mac[2],
+ mac[3], mac[4], mac[5]);
+
+ esp_read_mac(mac, ESP_MAC_WIFI_SOFTAP);
+ Serial.printf("%02x:%02x:%02x:%02x:%02x:%02x ESP MAC SOFTAP\n",
+ mac[0], mac[1], mac[2],
+ mac[3], mac[4], mac[5]);
+
+ esp_read_mac(mac, ESP_MAC_WIFI_STA); // ESP_MAC_BASE
+ Serial.printf("%02x:%02x:%02x:%02x:%02x:%02x ESP MAC BASE\n",
+ mac[0], mac[1], mac[2],
+ mac[3], mac[4], mac[5]);
// LED
config.begin("dmx", true);
@@ -134,14 +170,14 @@ void setup()
pinMode(PIN_BUTTON, INPUT_PULLUP);
if (digitalRead(PIN_BUTTON) == LOW && !restartViaButton)
{
- ledBlink(100);
+ // ledBlink(100);
unsigned long startTime = millis();
while (digitalRead(PIN_BUTTON) == LOW && (millis() - startTime <= 3000))
{
}
if (digitalRead(PIN_BUTTON) == LOW)
{
- ledBlink(0);
+ // ledBlink(0);
Serial.println("Reset config");
config.begin("dmx", false);
config.clear();
@@ -154,7 +190,7 @@ void setup()
config.putBool("restart-via-btn", false);
config.end();
- ledBlink(500);
+ // ledBlink(500);
attachInterrupt(PIN_BUTTON, onButtonPress, FALLING);
@@ -222,6 +258,8 @@ void setup()
Serial.println(WiFi.localIP());
Serial.print("MAC address: ");
Serial.println(WiFi.macAddress());
+ Serial.print("Broadcast IP: ");
+ Serial.println(broadcastIp);
break;
case Ethernet:
@@ -269,6 +307,8 @@ void setup()
Serial.println(ETH.dnsIP());
Serial.print("MAC address : ");
Serial.println(ETH.macAddress());
+ Serial.print("Broadcast IP: ");
+ Serial.println(broadcastIp);
Serial.println("Ethernet Successfully Initialized");
break;
}
@@ -283,13 +323,58 @@ void setup()
Serial.println(WiFi.softAPIP());
Serial.print("MAC address: ");
Serial.println(WiFi.softAPmacAddress());
+ Serial.print("Broadcast IP: ");
+ Serial.println(broadcastIp);
break;
}
// Initialize DMX ports
Serial.println("Initialize DMX...");
- dmx1.init(21, 33, Serial0);
- dmx2.init(17, 18, Serial1);
+
+#ifdef CONFIG_IDF_TARGET_ESP32S2
+ // dmx1.init(21, 33, Serial0);
+ // dmx2.init(17, 18, Serial1);
+
+ Serial.print("DMX driver 1 installed: ");
+ Serial.println(dmx_driver_is_installed(dmx1));
+
+ Serial.print("DMX driver 2 installed: ");
+ Serial.println(dmx_driver_is_installed(dmx2));
+
+ dmx_config_t dmx_config = DMX_CONFIG_DEFAULT;
+
+ dmx_personality_t personalities[] = {};
+ /*dmx_personality_t personalities[] = {
+ {1, "Default Personality"}
+ };*/
+ /*int personality_count = 1;*/
+ int personality_count = 0;
+ dmx_driver_install(dmx1, &dmx_config, personalities, personality_count);
+ dmx_set_pin(dmx1, 21, 33, -1);
+ dmx_driver_install(dmx2, &dmx_config, personalities, personality_count);
+ dmx_set_pin(dmx2, 17, 18, -1);
+
+ Serial.print("DMX driver 1 installed: ");
+ Serial.println(dmx_driver_is_installed(dmx1));
+
+ Serial.print("DMX driver 2 installed: ");
+ Serial.println(dmx_driver_is_installed(dmx2));
+
+ Serial.print("DMX driver 1 enabled: ");
+ Serial.println(dmx_driver_is_enabled(dmx1));
+
+ Serial.print("DMX driver 2 enabled: ");
+ Serial.println(dmx_driver_is_enabled(dmx2));
+
+ // TX/RX Pins und Serial0/Serial1 ausgeben
+
+ /* Now set the DMX hardware pins to the pins that we want to use and setup
+ will be complete! */
+
+#else
+ dmx1.init(21, 33, Serial1);
+ dmx2.init(17, 18, Serial2);
+#endif
// Initialize Art-Net
Serial.println("Initialize Art-Net...");
@@ -298,24 +383,22 @@ void setup()
// if Artnet packet comes to this universe, this function is called
if (direction1 == Output)
{
+ Serial.println("DMX1 as out");
artnet.subscribeArtDmxUniverse(universe1, [&](const uint8_t *data, uint16_t size, const ArtDmxMetadata &metadata, const ArtNetRemoteInfo &remote)
{
- for (size_t i = 0; i < size; ++i)
- {
- dmx1.write((i + 1), data[i]);
- }
- dmx1.update(); });
+ dmx_write_offset(dmx1, 1, data, size);
+ dmx_send(dmx1);
+ dmx_wait_sent(dmx1, DMX_TIMEOUT_TICK); });
}
if (direction2 == Output)
{
+ Serial.println("DMX2 as out");
artnet.subscribeArtDmxUniverse(universe2, [&](const uint8_t *data, uint16_t size, const ArtDmxMetadata &metadata, const ArtNetRemoteInfo &remote)
{
- for (size_t i = 0; i < size; ++i)
- {
- dmx2.write((i + 1), data[i]);
- }
- dmx2.update(); });
+ dmx_write_offset(dmx2, 1, data, size);
+ dmx_send(dmx2);
+ dmx_wait_sent(dmx2, DMX_TIMEOUT_TICK); });
}
// if Artnet packet comes, this function is called to every universe
@@ -345,9 +428,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) {
@@ -363,7 +443,26 @@ void setup()
// scan networks and cache them
WiFi.scanNetworks(true);
- ledBlink(0);
+ // ledBlink(0);
+
+ // Internal temperature RP2040
+ /*float tempC = analogReadTemp(); // Get internal temperature
+ Serial.print("Temperature Celsius (ºC): ");
+ Serial.println(tempC);*/
+ // Internal temperature ESP32 https://www.espboards.dev/blog/esp32-inbuilt-temperature-sensor/
+ Serial.print("Temperature: ");
+ float result = 0;
+ temp_sensor_read_celsius(&result);
+ Serial.print(result);
+ Serial.println(" °C");
+
+ Serial.print(getTemperature());
+ Serial.println(" °C");
+
+ Serial.printf("Internal Total heap %d, internal Free Heap %d\n", ESP.getHeapSize(), ESP.getFreeHeap());
+ Serial.printf("SPIRam Total heap %d, SPIRam Free Heap %d\n", ESP.getPsramSize(), ESP.getFreePsram());
+ Serial.printf("ChipRevision %d, Cpu Freq %d, SDK Version %s\n", ESP.getChipRevision(), ESP.getCpuFreqMHz(), ESP.getSdkVersion());
+ Serial.printf("Flash Size %d, Flash Speed %d\n", ESP.getFlashChipSize(), ESP.getFlashChipSpeed());
}
void loop()
@@ -371,14 +470,121 @@ void loop()
// check if artnet packet has come and execute callback
artnet.parse();
- // Receive Callback/INT currently not implemented
- /*if (direction1 == Input) {
- artnet.setArtDmxData(dmx1.readAll(), DMXCHANNELS);
- artnet.streamArtDmxTo(broadcastIp, universe1);
+ /* We need a place to store information about the DMX packets we receive. We
+ will use a dmx_packet_t to store that packet information. */
+ dmx_packet_t dmx1_packet;
+ dmx_packet_t dmx2_packet;
+
+ /* And now we wait! The DMX standard defines the amount of time until DMX
+ officially times out. That amount of time is converted into ESP32 clock
+ ticks using the constant `DMX_TIMEOUT_TICK`. If it takes longer than that
+ amount of time to receive data, this if statement will evaluate to false. */
+ if (direction1 == Input && dmx_receive(dmx1, &dmx1_packet, 0))
+ {
+ // Serial.println("Recv DMX1");
+ /* If this code gets called, it means we've received DMX data! */
+
+ dmx_read_offset(dmx1, 1, dmx1_data, 512);
+ artnet.sendArtDmx(broadcastIp, universe1, dmx1_data, 512);
+ /* Get the current time since boot in milliseconds so that we can find out
+ how long it has been since we last updated data and printed to the Serial
+ Monitor. */
+ unsigned long now = millis();
+
+ /* We should check to make sure that there weren't any DMX errors. */
+ if (!dmx1_packet.err)
+ {
+ /* If this is the first DMX data we've received, lets log it! */
+ if (!dmx1_IsConnected)
+ {
+ Serial.println("DMX1 in is connected!");
+ dmx1_IsConnected = true;
+ }
+
+ /* Don't forget we need to actually read the DMX data into our buffer so
+ that we can print it out. */
+
+ /*dmx_read_offset(dmx1, 1, dmx1_data, dmx1_packet.size);
+ artnet.sendArtDmx(broadcastIp, universe1, dmx1_data, 512);*/
+
+ if (now - dmx1_lastUpdate > 1000)
+ {
+ /* Print the received start code - it's usually 0. */
+ // Serial.printf("Start code is 0x%02X and slot 1 is 0x%02X\n", dmx1_data[0], dmx1_data[1]);
+ dmx1_lastUpdate = now;
+ }
+ }
+ else
+ {
+ /* Oops! A DMX error occurred! Don't worry, this can happen when you first
+ connect or disconnect your DMX devices. If you are consistently getting
+ DMX errors, then something may have gone wrong with your code or
+ something is seriously wrong with your DMX transmitter. */
+ Serial.println("A DMX 1 error occurred.");
+ }
+ }
+ else if (dmx1_IsConnected)
+ {
+ /* If DMX times out after having been connected, it likely means that the
+ DMX cable was unplugged. When that happens in this example sketch, we'll
+ uninstall the DMX driver. */
+ Serial.println("DMX 1 was disconnected.");
+ dmx1_IsConnected = false;
+ // dmx_driver_delete(dmx1);
}
- if (direction2 == Input) {
- artnet.setArtDmxData(dmx2.readAll(), DMXCHANNELS);
- artnet.streamArtDmxTo(broadcastIp, universe2);
- }*/
+ if (direction2 == Input && dmx_receive(dmx2, &dmx2_packet, 0))
+ {
+ // Serial.println("Recv DMX2");
+ /* If this code gets called, it means we've received DMX data! */
+
+ dmx_read_offset(dmx2, 1, dmx2_data, 512);
+ artnet.sendArtDmx(broadcastIp, universe2, dmx2_data, 512);
+
+ /* Get the current time since boot in milliseconds so that we can find out
+ how long it has been since we last updated data and printed to the Serial
+ Monitor. */
+ unsigned long now = millis();
+
+ /* We should check to make sure that there weren't any DMX errors. */
+ if (!dmx2_packet.err)
+ {
+ /* If this is the first DMX data we've received, lets log it! */
+ if (!dmx2_IsConnected)
+ {
+ Serial.println("DMX2 in is connected!");
+ dmx2_IsConnected = true;
+ }
+
+ /* Don't forget we need to actually read the DMX data into our buffer so
+ that we can print it out. */
+
+ /*dmx_read_offset(dmx2, 1, dmx2_data, dmx2_packet.size);
+ artnet.sendArtDmx(broadcastIp, universe2, dmx2_data, 512);*/
+
+ if (now - dmx2_lastUpdate > 1000)
+ {
+ /* Print the received start code - it's usually 0. */
+ // Serial.printf("Start code is 0x%02X and slot 1 is 0x%02X\n", dmx2_data[0], dmx2_data[1]);
+ dmx2_lastUpdate = now;
+ }
+ }
+ else
+ {
+ /* Oops! A DMX error occurred! Don't worry, this can happen when you first
+ connect or disconnect your DMX devices. If you are consistently getting
+ DMX errors, then something may have gone wrong with your code or
+ something is seriously wrong with your DMX transmitter. */
+ Serial.println("A DMX 2 error occurred.");
+ }
+ }
+ else if (dmx2_IsConnected)
+ {
+ /* If DMX times out after having been connected, it likely means that the
+ DMX cable was unplugged. When that happens in this example sketch, we'll
+ uninstall the DMX driver. */
+ Serial.println("DMX 2 was disconnected.");
+ dmx2_IsConnected = false;
+ // dmx_driver_delete(dmx2);
+ }
}
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
diff --git a/src/routes/config.h b/src/routes/config.h
index 157292c..957ba25 100644
--- a/src/routes/config.h
+++ b/src/routes/config.h
@@ -1,5 +1,4 @@
#include
-#include
#include
#ifndef CONFIG_h