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

Merge branch 'main' into 72-status-websocket

Browse source
This commit is contained in:
Raffael Wolf 2025-04-23 17:21:50 +02:00 • committed by GitHub
commit 3d60c1526d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 24 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -36,10 +36,10 @@ You have to short-circuit `R0` on the RS485 boards to enable the termination res
![Circuit diagram](/assets/circuit/diagram.svg) ![Circuit diagram](/assets/circuit/diagram.svg)
| GPIO | Usage | | GPIO | Usage |
| ---- | -------------- | | ------- | -------------- |
| GND | GND to others | | GND | GND to others |
| 3,5V | VIN on RS485 | | 3,3V | VIN on RS485 |
| 5V | VIN on W5500 | | 5V/VBUS | VIN on W5500 |
| 0 | Onboard Button | | 0 | Onboard Button |
| 5 | Ext. Button | | 5 | Ext. Button |
| 7 | Ext. LED | | 7 | Ext. LED |

51
src/main.cpp
View file

@ -26,8 +26,6 @@
#include "routes/networks.h" #include "routes/networks.h"
#include "routes/status.h" #include "routes/status.h"
// DMXESPSerial dmx1;
// DMXESPSerial dmx2;
dmx_port_t dmx1 = DMX_NUM_0; // for esp32s2 dmx_port_t dmx1 = DMX_NUM_0; // for esp32s2
dmx_port_t dmx2 = DMX_NUM_1; dmx_port_t dmx2 = DMX_NUM_1;
byte dmx1_data[DMX_PACKET_SIZE]; byte dmx1_data[DMX_PACKET_SIZE];
@ -197,15 +195,8 @@ void setup()
direction1 = static_cast<Direction>(config.getUInt("direction-1", DEFAULT_DIRECTION1)); direction1 = static_cast<Direction>(config.getUInt("direction-1", DEFAULT_DIRECTION1));
direction2 = static_cast<Direction>(config.getUInt("direction-2", DEFAULT_DIRECTION2)); direction2 = static_cast<Direction>(config.getUInt("direction-2", DEFAULT_DIRECTION2));
Serial.print("Port A: Universe "); Serial.printf("Port A: Universe %d %s\n", universe1, (direction1 == Input) ? "DMX -> Art-Net" : "Art-Net -> DMX");
Serial.print(universe1); Serial.printf("Port B: Universe %d %s\n", universe2, (direction2 == Input) ? "DMX -> Art-Net" : "Art-Net -> DMX");
Serial.print(" ");
Serial.println((direction1 == Input) ? "DMX -> Art-Net" : "Art-Net -> DMX");
Serial.print("Port B: Universe ");
Serial.print(universe2);
Serial.print(" ");
Serial.println((direction2 == Input) ? "DMX -> Art-Net" : "Art-Net -> DMX");
Connection connection = static_cast<Connection>(config.getUInt("connection", DEFAULT_CONNECTION)); Connection connection = static_cast<Connection>(config.getUInt("connection", DEFAULT_CONNECTION));
IpMethod ipMethod = static_cast<IpMethod>(config.getUInt("ip-method"), DEFAULT_IP_METHOD); IpMethod ipMethod = static_cast<IpMethod>(config.getUInt("ip-method"), DEFAULT_IP_METHOD);
@ -323,44 +314,21 @@ void setup()
Serial.println("Initialize DMX..."); Serial.println("Initialize DMX...");
#ifdef CONFIG_IDF_TARGET_ESP32S2 #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_config_t dmx_config = DMX_CONFIG_DEFAULT;
dmx_personality_t personalities[] = {}; dmx_personality_t personalities[] = {};
/*dmx_personality_t personalities[] = {
{1, "Default Personality"}
};*/
/*int personality_count = 1;*/
int personality_count = 0; int personality_count = 0;
dmx_driver_install(dmx1, &dmx_config, personalities, personality_count); dmx_driver_install(dmx1, &dmx_config, personalities, personality_count);
dmx_set_pin(dmx1, 21, 33, -1); dmx_set_pin(dmx1, 21, 33, -1);
dmx_driver_install(dmx2, &dmx_config, personalities, personality_count); dmx_driver_install(dmx2, &dmx_config, personalities, personality_count);
dmx_set_pin(dmx2, 17, 18, -1); dmx_set_pin(dmx2, 17, 18, -1);
Serial.print("DMX driver 1 installed: "); Serial.printf("DMX driver 1 installed: %d\n", dmx_driver_is_installed(dmx1));
Serial.println(dmx_driver_is_installed(dmx1)); Serial.printf("DMX driver 2 installed: %d\n", dmx_driver_is_installed(dmx2));
Serial.print("DMX driver 2 installed: "); Serial.printf("DMX driver 1 enabled: %d\n", dmx_driver_is_enabled(dmx1));
Serial.println(dmx_driver_is_installed(dmx2)); Serial.printf("DMX driver 2 enabled: %d\n", dmx_driver_is_enabled(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 #else
dmx1.init(21, 33, Serial1); dmx1.init(21, 33, Serial1);
@ -374,7 +342,6 @@ void setup()
// if Artnet packet comes to this universe, this function is called // if Artnet packet comes to this universe, this function is called
if (direction1 == Output) if (direction1 == Output)
{ {
Serial.println("DMX1 as out");
artnet.subscribeArtDmxUniverse(universe1, [&](const uint8_t *data, uint16_t size, const ArtDmxMetadata &metadata, const ArtNetRemoteInfo &remote) artnet.subscribeArtDmxUniverse(universe1, [&](const uint8_t *data, uint16_t size, const ArtDmxMetadata &metadata, const ArtNetRemoteInfo &remote)
{ {
dmx_write_offset(dmx1, 1, data, size); dmx_write_offset(dmx1, 1, data, size);
@ -384,7 +351,6 @@ void setup()
if (direction2 == Output) if (direction2 == Output)
{ {
Serial.println("DMX2 as out");
artnet.subscribeArtDmxUniverse(universe2, [&](const uint8_t *data, uint16_t size, const ArtDmxMetadata &metadata, const ArtNetRemoteInfo &remote) artnet.subscribeArtDmxUniverse(universe2, [&](const uint8_t *data, uint16_t size, const ArtDmxMetadata &metadata, const ArtNetRemoteInfo &remote)
{ {
dmx_write_offset(dmx2, 1, data, size); dmx_write_offset(dmx2, 1, data, size);
@ -392,9 +358,6 @@ void setup()
dmx_wait_sent(dmx2, DMX_TIMEOUT_TICK); }); dmx_wait_sent(dmx2, DMX_TIMEOUT_TICK); });
} }
// 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 (!LittleFS.begin(true)) if (!LittleFS.begin(true))
{ {
Serial.println("An Error has occurred while mounting LittleFS"); Serial.println("An Error has occurred while mounting LittleFS");