Merge branch 'main' into HendrikRauh/issue33

data/index.html

@@ -299,7 +299,23 @@
                                 <span class="range-value"></span>
                             </div>
                         </label>
+                        <label>
+                            <span>Aktion bei Knopfdruck:</span>
+                            <select
+                                name="button-action"
+                                id="input-button-action"
+                                title="Aktion bei Knopfdruck"
+                                required
+                            >
+                                <option value="0">Nichts</option>
+                                <option value="1">
+                                    Konfiguration zurücksetzen
+                                </option>
+                                <option value="2">Neustart</option>
+                            </select>
+                        </label>
                     </fieldset>
+
                     <div class="buttons">
                         <button type="reset">Zurücksetzen</button>
                         <button type="submit">Speichern</button>

src/main.cpp

@@ -105,6 +105,36 @@ float getTemperature()
     temp_sensor_read_celsius(&tempC);
     return tempC;
 }
+
+void onButtonPress()
+{
+    config.begin("dmx", true);
+    ButtonAction action = static_cast<ButtonAction>(config.getUInt("button-action", DEFAULT_BUTTON_ACTION));
+    config.end();
+
+    switch (action)
+    {
+    case ResetConfig:
+        config.begin("dmx", false);
+        config.clear();
+        config.end();
+
+        ESP.restart();
+        break;
+
+    case Restart:
+        config.begin("dmx", false);
+        config.putBool("restart-via-btn", true);
+        config.end();
+
+        ESP.restart();
+        break;
+    case None:
+        // do nothing
+        break;
+    }
+}
+
 void setup()
 {
 
@@ -133,12 +163,13 @@ void setup()
     // LED
     config.begin("dmx", true);
     brightness_led = config.getUInt("led-brightness", DEFAULT_LED_BRIGHTNESS);
+    bool restartViaButton = config.getBool("restart-via-btn", false);
     config.end();
     analogWrite(PIN_LED, brightness_led);
 
     // Button
     pinMode(PIN_BUTTON, INPUT_PULLUP);
-    if (digitalRead(PIN_BUTTON) == LOW)
+    if (digitalRead(PIN_BUTTON) == LOW && !restartViaButton)
     {
         // ledBlink(100);
         unsigned long startTime = millis();
@@ -156,8 +187,14 @@ void setup()
         }
     }
 
+    config.begin("dmx", false);
+    config.putBool("restart-via-btn", false);
+    config.end();
+
     // ledBlink(500);
 
+    attachInterrupt(PIN_BUTTON, onButtonPress, FALLING);
+
     // wait for serial monitor
     delay(5000);
     Serial.println("Starting DMX-Interface...");

src/routes/config.cpp

@@ -70,6 +70,16 @@ Direction parseDirection(uint8_t direction)
     throw ::std::invalid_argument("Invalid direction value: " + direction);
 }
 
+ButtonAction parseButtonAction(uint8_t buttonAction)
+{
+    if (buttonAction > 0 || buttonAction < BUTTON_ACTION_SIZE)
+    {
+        return static_cast<ButtonAction>(buttonAction);
+    }
+
+    throw ::std::invalid_argument("Invalid value for button action: " + buttonAction);
+}
+
 #pragma endregion
 
 void onGetConfig(AsyncWebServerRequest *request)
@@ -93,6 +103,7 @@ void onGetConfig(AsyncWebServerRequest *request)
     doc["universe-2"] = config.getUInt("universe-2", DEFAULT_UNIVERSE2);
     doc["direction-2"] = config.getUInt("direction-2", DEFAULT_DIRECTION2);
     doc["led-brightness"] = config.getUInt("led-brightness", DEFAULT_LED_BRIGHTNESS);
+    doc["button-action"] = config.getUInt("button-action", DEFAULT_BUTTON_ACTION);
 
     config.end();
 
@@ -151,6 +162,9 @@ void onPutConfig(AsyncWebServerRequest *request, uint8_t *data, size_t len, size
 
         config.putUInt("led-brightness", doc["led-brightness"]);
 
+        ButtonAction buttonAction = parseButtonAction(doc["button-action"].as<uint8_t>());
+        config.putUInt("button-action", buttonAction);
+
         config.end();
 
         request->send(200);

src/routes/config.h

@@ -28,6 +28,14 @@ enum Direction
 };
 const uint8_t DIRECTION_SIZE = 2;
 
+enum ButtonAction
+{
+    None,
+    ResetConfig,
+    Restart
+};
+const uint8_t BUTTON_ACTION_SIZE = 3;
+
 const Connection DEFAULT_CONNECTION = WiFiAP;
 const IpMethod DEFAULT_IP_METHOD = DHCP;
 extern String DEFAULT_SSID; // initialized in setup because it depends on the mac address
@@ -42,6 +50,7 @@ const uint8_t DEFAULT_UNIVERSE1 = 1;
 const uint8_t DEFAULT_UNIVERSE2 = 2;
 
 const uint8_t DEFAULT_LED_BRIGHTNESS = 25;
+const ButtonAction DEFAULT_BUTTON_ACTION = Restart;
 
 void onGetConfig(AsyncWebServerRequest *request);