Trying to add more config

ampel-firmware/web_config.cpp

@@ -17,19 +17,34 @@ namespace web_config {
   IotWebConf *iotWebConf;
 
 // -- Configuration specific key. The value should be modified if config structure was changed.
-  const char config_version[] = "ampel_test_v3";
+  const char config_version[] = "ampel_test_v4";
 
   static const char chooserValues[][STRING_LEN] = { "red", "blue", "darkYellow" };
   static const char chooserNames[][STRING_LEN] = { "Red", "Blue", "Dark yellow" };
 
-  iotwebconf::ParameterGroup group1 = iotwebconf::ParameterGroup("group1", "");
-  iotwebconf::IntTParameter<int16_t> intParam =
-      iotwebconf::Builder<iotwebconf::IntTParameter<int16_t>>("intParam").label("Int param").defaultValue(30).min(1).max(
-          100).step(1).placeholder("1..100").build();
-// -- We can add a legend to the separator
+  iotwebconf::ParameterGroup serviceParams = iotwebconf::ParameterGroup("Services", "Services");
+
+  iotwebconf::CheckboxTParameter ampelWifiParam = iotwebconf::Builder<iotwebconf::CheckboxTParameter>("WiFi").label(
+      "WiFi").defaultValue(true).build();
+  iotwebconf::CheckboxTParameter ampelCSVParam =
+      iotwebconf::Builder<iotwebconf::CheckboxTParameter>("CSV").label("CSV").defaultValue(true).build();
+  iotwebconf::CheckboxTParameter ampelMQTTParam = iotwebconf::Builder<iotwebconf::CheckboxTParameter>("MQTT").label(
+      "MQTT").defaultValue(true).build();
+  iotwebconf::CheckboxTParameter ampelLoRaWANParam =
+      iotwebconf::Builder<iotwebconf::CheckboxTParameter>("LoRaWAN").label("LoRaWAN").defaultValue(false).build();
+
+  iotwebconf::ParameterGroup co2Params = iotwebconf::ParameterGroup("co2", "CO2 Sensor");
+
+  //TODO: UIntTParameter?
+  iotwebconf::IntTParameter<uint16_t> timestepParam = iotwebconf::Builder<iotwebconf::IntTParameter<uint16_t>>(
+      "timestep").label("Measurement timestep").defaultValue(MEASUREMENT_TIMESTEP).min(2).max(1800).step(1).placeholder(
+      "2..1800").build();
+
+  iotwebconf::FloatTParameter temperatureOffsetParam =
+      iotwebconf::Builder<iotwebconf::FloatTParameter>("temp_offset").label("Temperature offset").defaultValue(
+      TEMPERATURE_OFFSET).placeholder("-3").build();
+
   iotwebconf::ParameterGroup group2 = iotwebconf::ParameterGroup("c_factor", "Calibration factor");
-  iotwebconf::FloatTParameter floatParam = iotwebconf::Builder<iotwebconf::FloatTParameter>("floatParam").label(
-      "Float param").defaultValue(0.0).step(0.1).placeholder("e.g. 23.4").build();
   iotwebconf::CheckboxTParameter checkboxParam =
       iotwebconf::Builder<iotwebconf::CheckboxTParameter>("checkParam").label("Check param").defaultValue(true).build();
   iotwebconf::SelectTParameter<STRING_LEN> chooserParam =
@@ -55,14 +70,16 @@ namespace web_config {
   void initialize() {
     iotWebConf = new IotWebConf(ampel.sensorId, &dnsServer, &http, HTTP_PASSWORD, config_version);
 
-    group1.addItem(&intParam);
-    group2.addItem(&floatParam);
-    group2.addItem(&checkboxParam);
-    group2.addItem(&chooserParam);
+    serviceParams.addItem(&ampelWifiParam);
+    serviceParams.addItem(&ampelMQTTParam);
+    serviceParams.addItem(&ampelCSVParam);
+    serviceParams.addItem(&ampelLoRaWANParam);
+
+    co2Params.addItem(&timestepParam);
+    co2Params.addItem(&temperatureOffsetParam);
 
-    iotWebConf->addSystemParameter(&config::stringParam);
-    iotWebConf->addParameterGroup(&group1);
-    iotWebConf->addParameterGroup(&group2);
+    iotWebConf->addParameterGroup(&serviceParams);
+    iotWebConf->addParameterGroup(&co2Params);
 
     sensor_console::defineCommand("reset_config", []() {
       Serial.println(F("Resetting config..."));

ampel-firmware/web_config.h

@@ -9,7 +9,7 @@
 
 #define STRING_LEN 64
 
-//#include "config.h"
+#include "config.h"
 
 #include <IotWebConf.h>
 #include <IotWebConfTParameter.h>