formatted init commit

This commit is contained in:
Hendrik Rauh 2024-10-17 20:20:17 +02:00
parent b1454a5c5f
commit 45019c6e4c
8 changed files with 130 additions and 119 deletions

2
.gitignore vendored
View file

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

View file

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

View file

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

View file

@ -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 Operation
* Once-Only Headers
* Computed Includes
- Include Syntax
- Include Operation
- Once-Only Headers
- Computed Includes
https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html

View file

@ -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.
@ -28,6 +27,7 @@ For example, see a structure of the following two libraries `Foo` and `Bar`:
|- 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

View file

@ -28,43 +28,56 @@ int receivePin = -1;
// DMX value array and size. Entry 0 will hold startbyte, so we need 512+1 elements
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) {
if (dmxStarted == false) init();
uint8_t DMXESPSerial::read(int Channel)
{
if (dmxStarted == false)
init();
if (Channel < 1) Channel = 1;
if (Channel > DMXCHANNELS) Channel = DMXCHANNELS;
if (Channel < 1)
Channel = 1;
if (Channel > DMXCHANNELS)
Channel = DMXCHANNELS;
return (dmxDataStore[Channel]);
}
// Function to send DMX data
void DMXESPSerial::write(int Channel, uint8_t value) {
if (dmxStarted == false) init();
void DMXESPSerial::write(int Channel, uint8_t value)
{
if (dmxStarted == false)
init();
if (Channel < 1) Channel = 1;
if (Channel > DMXCHANNELS) Channel = DMXCHANNELS;
if (value < 0) value = 0;
if (value > 255) value = 255;
if (Channel < 1)
Channel = 1;
if (Channel > DMXCHANNELS)
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() {
if (dmxStarted == false) init();
void DMXESPSerial::update()
{
if (dmxStarted == false)
init();
// Send break
digitalWrite(sendPin, HIGH);

View file

@ -22,8 +22,7 @@ class DMXESPSerial {
public:
void init();
uint8_t read(int Channel);
void write(int channel, uint8_t value);
void update();
void write(int channel, uint8_t value);void update();
void end();
};

View file

@ -24,8 +24,8 @@ uint8_t value = 0;
// DMX stuff
DMXESPSerial dmx;
void setup() {
void setup()
{
// Serial console
// Serial.begin(115200);
@ -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]);
// Serial.print(data[i]);
// Serial.print(",");
}
// 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 */
}