formatted init commit

.gitignore

@@ -1,3 +1,5 @@
+# Development
+
 .pio
 .vscode/.browse.c_cpp.db*
 .vscode/c_cpp_properties.json

.vscode/extensions.json

@@ -1,10 +1,6 @@
 {
     // See http://go.microsoft.com/fwlink/?LinkId=827846
     // for the documentation about the extensions.json format
-    "recommendations": [
+    "recommendations": ["platformio.platformio-ide"],
-        "platformio.platformio-ide"
+    "unwantedRecommendations": ["ms-vscode.cpptools-extension-pack"]
-    ],
-    "unwantedRecommendations": [
-        "ms-vscode.cpptools-extension-pack"
-    ]
 }

README.md

@@ -1,2 +1,3 @@
-# dmx-interface
+# DMX / Artnet Interface
-Simple DIY DMX-Interface
+
+Simple DIY Interface to control

include/README

@@ -1,4 +1,3 @@
-
 This directory is intended for project header files.
 
 A header file is a file containing C declarations and macro definitions
@@ -31,9 +30,9 @@ header file names, and at most one dot.
 
 Read more about using header files in official GCC documentation:
 
-* Include Syntax
+-   Include Syntax
-* Include Operation
+-   Include Operation
-* Once-Only Headers
+-   Once-Only Headers
-* Computed Includes
+-   Computed Includes
 
 https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html

lib/README

@@ -1,4 +1,3 @@
-
 This directory is intended for project specific (private) libraries.
 PlatformIO will compile them to static libraries and link into executable file.
 
@@ -25,9 +24,10 @@ For example, see a structure of the following two libraries `Foo` and `Bar`:
 |
 |- platformio.ini
 |--src
-   |- main.c
+|- main.c
 
 and a contents of `src/main.c`:
+
 ```
 #include <Foo.h>
 #include <Bar.h>
@@ -43,4 +43,5 @@ PlatformIO Library Dependency Finder will find automatically dependent
 libraries scanning project source files.
 
 More information about PlatformIO Library Dependency Finder
+
 -   https://docs.platformio.org/page/librarymanager/ldf.html

src/ESPDMX.cpp

@@ -26,47 +26,60 @@ int sendPin = 18;
 int receivePin = -1;
 
 // DMX value array and size. Entry 0 will hold startbyte, so we need 512+1 elements
-uint8_t dmxDataStore[DMXCHANNELS+1] = {};
+uint8_t dmxDataStore[DMXCHANNELS + 1] = {};
-
 
 // Set up the DMX-Protocol
-void DMXESPSerial::init() {
+void DMXESPSerial::init()
+{
     SERIALPORT.begin(DMXSPEED, DMXFORMAT, receivePin, sendPin);
     pinMode(sendPin, OUTPUT);
     dmxStarted = true;
 }
 
 // Function to read DMX data
-uint8_t DMXESPSerial::read(int Channel) {
+uint8_t DMXESPSerial::read(int Channel)
-  if (dmxStarted == false) init();
+{
+    if (dmxStarted == false)
+        init();
 
-  if (Channel < 1) Channel = 1;
+    if (Channel < 1)
-  if (Channel > DMXCHANNELS) Channel = DMXCHANNELS;
+        Channel = 1;
-  return(dmxDataStore[Channel]);
+    if (Channel > DMXCHANNELS)
+        Channel = DMXCHANNELS;
+    return (dmxDataStore[Channel]);
 }
 
 // Function to send DMX data
-void DMXESPSerial::write(int Channel, uint8_t value) {
+void DMXESPSerial::write(int Channel, uint8_t value)
-  if (dmxStarted == false) init();
+{
+    if (dmxStarted == false)
+        init();
 
-  if (Channel < 1) Channel = 1;
+    if (Channel < 1)
-  if (Channel > DMXCHANNELS) Channel = DMXCHANNELS;
+        Channel = 1;
-  if (value < 0) value = 0;
+    if (Channel > DMXCHANNELS)
-  if (value > 255) value = 255;
+        Channel = DMXCHANNELS;
+    if (value < 0)
+        value = 0;
+    if (value > 255)
+        value = 255;
 
     dmxDataStore[Channel] = value;
 }
 
-void DMXESPSerial::end() {
+void DMXESPSerial::end()
+{
     SERIALPORT.end();
     dmxStarted = false;
 }
 
 // Function to update the DMX bus
-void DMXESPSerial::update() {
+void DMXESPSerial::update()
-  if (dmxStarted == false) init();
+{
+    if (dmxStarted == false)
+        init();
 
-  //Send break
+    // Send break
     digitalWrite(sendPin, HIGH);
     SERIALPORT.begin(BREAKSPEED, BREAKFORMAT, receivePin, sendPin);
     SERIALPORT.write(0);
@@ -74,7 +87,7 @@ void DMXESPSerial::update() {
     delay(1);
     SERIALPORT.end();
 
-  //send data
+    // send data
     SERIALPORT.begin(DMXSPEED, DMXFORMAT, receivePin, sendPin);
     digitalWrite(sendPin, LOW);
     SERIALPORT.write(dmxDataStore, DMXCHANNELS);

src/ESPDMX.h

@@ -19,11 +19,10 @@
 // ---- Methods ----
 
 class DMXESPSerial {
-public:
+    public:
         void init();
         uint8_t read(int Channel);
-  void write(int channel, uint8_t value);
+        void write(int channel, uint8_t value);void update();
-  void update();
         void end();
 };
 

src/main.cpp

@@ -2,20 +2,20 @@
 // 2024-10-17 Patrick Schwarz
 
 #include <ArtnetWiFi.h>
-//#include <ArtnetEther.h>
+// #include <ArtnetEther.h>
 
 #include "ESPDMX.h"
 
 // WiFi stuff
-const char* ssid = "artnet";
+const char *ssid = "artnet";
-const char* pwd = "mbgmbgmbg";
+const char *pwd = "mbgmbgmbg";
 const IPAddress ip(192, 168, 1, 201);
 const IPAddress gateway(192, 168, 1, 1);
 const IPAddress subnet(255, 255, 255, 0);
 
 // Art-Net stuff
 ArtnetWiFi artnet;
-//const String target_ip = "192.168.1.200";
+// const String target_ip = "192.168.1.200";
 uint8_t universe = 1; // 0 - 15
 const uint16_t size = 512;
 uint8_t data[size];
@@ -24,23 +24,23 @@ uint8_t value = 0;
 // DMX stuff
 DMXESPSerial dmx;
 
-
+void setup()
-void setup() {
+{
 
     // Serial console
-    //Serial.begin(115200);
+    // Serial.begin(115200);
 
     // WiFi stuff
-    //WiFi.begin(ssid, pwd);
+    // WiFi.begin(ssid, pwd);
     WiFi.softAP(ssid, pwd);
     WiFi.softAPConfig(ip, gateway, subnet);
-    //WiFi.config(ip, gateway, subnet);
+    // WiFi.config(ip, gateway, subnet);
-    //while (WiFi.status() != WL_CONNECTED) {
+    // while (WiFi.status() != WL_CONNECTED) {
     //     Serial.print(".");
     delay(500);
     //}
-    //Serial.print("WiFi connected, IP = ");
+    // Serial.print("WiFi connected, IP = ");
-    //Serial.println(WiFi.localIP());
+    // Serial.println(WiFi.localIP());
 
     // Initialize Art-Net
     artnet.begin();
@@ -49,7 +49,8 @@ void setup() {
     dmx.init();
 
     // if Artnet packet comes to this universe, this function is called
-    artnet.subscribeArtDmxUniverse(universe, [&](const uint8_t *data, uint16_t size, const ArtDmxMetadata& metadata, const ArtNetRemoteInfo& remote) {
+    artnet.subscribeArtDmxUniverse(universe, [&](const uint8_t *data, uint16_t size, const ArtDmxMetadata &metadata, const ArtNetRemoteInfo &remote)
+                                   {
                                        /*Serial.print("lambda : artnet data from ");
                                        Serial.print(remote.ip);
                                        Serial.print(":");
@@ -60,19 +61,19 @@ void setup() {
                                        Serial.print(size);
                                        Serial.print(") :");*/
 
-        for (size_t i = 0; i < size; ++i) {
+                                       for (size_t i = 0; i < size; ++i)
-            dmx.write((i+1), data[i]);
+                                       {
+                                           dmx.write((i + 1), data[i]);
                                            //    Serial.print(data[i]);
                                            //    Serial.print(",");
                                        }
-        //Serial.println();
+                                       // Serial.println();
 
-        dmx.update(); 
+                                       dmx.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) {
+    artnet.subscribeArtDmx([&](const uint8_t *data, uint16_t size, const ArtDmxMetadata &metadata, const ArtNetRemoteInfo &remote)
+                           {
         /*Serial.print("received ArtNet data from ");
         Serial.print(remote.ip);
         Serial.print(":");
@@ -87,11 +88,11 @@ void setup() {
         Serial.print(metadata.sequence);
         Serial.print(", size = ");
         Serial.print(size);
-        Serial.println(")");*/
+        Serial.println(")");*/ });
-    });
 }
 
-void loop() {
+void loop()
+{
     artnet.parse(); // check if artnet packet has come and execute callback
 
     /*value = (millis() / 4) % 256;
@@ -100,5 +101,4 @@ void loop() {
     artnet.setArtDmxData(data, size);
     artnet.streamArtDmxTo(target_ip, universe);  // automatically send set data in 40fps
     // artnet.streamArtDmxTo(target_ip, net, subnet, univ);  // or you can set net, subnet, and universe */
-
 }