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

resolved conflicts

Browse source
This commit is contained in:
Hendrik Rauh 2024-12-15 22:44:52 +01:00
commit 33d3974b01
5 changed files with 777 additions and 798 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/main.cpp
View file

@ -74,12 +74,7 @@ void ledBlink(int ms)
timer = timerBegin(0, 80, true); // timer 0, prescalar: 80, UP counting
timerAttachInterrupt(timer, &onTimer, true); // Attach interrupt
}
if (ms == 0)
{
timerAlarmDisable(timer);
analogWrite(PIN_LED, 0);
}
else if (ms == 1)
else if (ms == 0)
{
timerAlarmDisable(timer);
analogWrite(PIN_LED, brightness_led);
@ -104,21 +99,29 @@ void setup()
brightness_led = config.getUInt("led-brightness", DEFAULT_LED_BRIGHTNESS);
config.end();
analogWrite(PIN_LED, brightness_led);
// delay(5000);
ledBlink(500);
// Button
pinMode(PIN_BUTTON, INPUT_PULLUP);
if (digitalRead(PIN_BUTTON) == LOW)
{
ledBlink(100);
delay(2000);
Serial.println("Reset config");
config.begin("dmx", false);
config.clear();
config.end();
unsigned long startTime = millis();
while (digitalRead(PIN_BUTTON) == LOW && (millis() - startTime <= 3000))
{
}
if (digitalRead(PIN_BUTTON) == LOW)
{
ledBlink(0);
Serial.println("Reset config");
config.begin("dmx", false);
config.clear();
config.end();
delay(2000);
}
}
ledBlink(500);
// wait for serial monitor
delay(5000);
Serial.println("Starting DMX-Interface...");
@ -321,7 +324,7 @@ void setup()
// scan networks and cache them
WiFi.scanNetworks(true);
ledBlink(1);
ledBlink(0);
}
void loop()