Some refactor

ampel-firmware/co2_sensor.cpp

@@ -79,10 +79,6 @@ namespace sensor {
     sensor_console::defineIntCommand("calibrate!", calibrateSensorRightNow,
         " 600 (Calibrates right now, to given ppm)");
     sensor_console::defineIntCommand("auto_calibrate", setAutoCalibration, " 0/1 (Disables/enables autocalibration)");
-
-    sensor_console::defineCommand("reset", []() {
-      ESP.restart();
-    }, " (Restarts the sensor)");
   }
 
   //NOTE: should timer deviation be used to adjust measurement_timestep?

ampel-firmware/util.cpp

@@ -51,14 +51,19 @@ namespace ntp {
   }
 }
 
+void Ampel::showFreeSpace() {
+  Serial.print(F("Free heap space : "));
+  Serial.print(get_free_heap_size());
+  Serial.println(F(" bytes."));
+}
+
 Ampel::Ampel() :
     sensorId("ESP" + macToID()), max_loop_duration(0) {
   sensor_console::defineIntCommand("set_time", ntp::setLocalTime, " 1618829570 (Sets time to the given UNIX time)");
-  sensor_console::defineCommand("free", []() {
-    Serial.print(F("Free heap space : "));
-    Serial.print(get_free_heap_size());
-    Serial.println(F(" bytes."));
-  }, " (Displays available heap space)");
+  sensor_console::defineCommand("free", Ampel::showFreeSpace, " (Displays available heap space)");
+  sensor_console::defineCommand("reset", []() {
+    ESP.restart();
+  }, " (Restarts the sensor)");
 }
 
 Ampel ampel;

ampel-firmware/util.h

@@ -8,7 +8,7 @@
 #include "src/lib/NTPClient-master/NTPClient.h" // NTP
 
 #if defined(ESP8266)
-#  define BOARD "ESP8266"
+#  define BOARD "ESP8266" //TODO: Move to ampel.board?
 #  include <ESP8266WiFi.h> // required to get MAC address
 #  define get_free_heap_size() system_get_free_heap_size()
 #elif defined(ESP32)
@@ -37,6 +37,8 @@ namespace util {
   }
 }
 class Ampel {
+private:
+  static void showFreeSpace();
 public:
   const String sensorId;
   uint32_t max_loop_duration;