Stop using exceptions

.gitmodules

@@ -1,24 +0,0 @@
-[submodule "components/SHT31"]
-	path = components/SHT31
-	url = https://github.com/RobTillaart/SHT31
-[submodule "components/SHT2x"]
-	path = components/SHT2x
-	url = https://github.com/RobTillaart/SHT2x
-[submodule "components/OneWire"]
-	path = components/OneWire
-	url = https://github.com/PaulStoffregen/OneWire
-[submodule "components/DallasTemperature"]
-	path = components/DallasTemperature
-	url = https://github.com/milesburton/Arduino-Temperature-Control-Library
-[submodule "components/BH1750"]
-	path = components/BH1750
-	url = https://github.com/claws/BH1750
-[submodule "components/Adafruit_TSL2591_Library"]
-	path = components/Adafruit_TSL2591_Library
-	url = https://github.com/adafruit/Adafruit_TSL2591_Library
-[submodule "components/Adafruit_Sensor"]
-	path = components/Adafruit_Sensor
-	url = https://github.com/adafruit/Adafruit_Sensor
-[submodule "components/Adafruit_BusIO"]
-	path = components/Adafruit_BusIO
-	url = https://github.com/adafruit/Adafruit_BusIO

CMakeLists.txt

@@ -1,5 +1,17 @@
 cmake_minimum_required(VERSION 3.16.0)
 
+
+# Add esp-idf-lib components
+include(FetchContent)
+FetchContent_Declare(
+  espidflib
+  GIT_REPOSITORY https://github.com/UncleRus/esp-idf-lib.git
+  GIT_TAG "0.9.4"
+)
+FetchContent_MakeAvailable(espidflib)
+set(EXTRA_COMPONENT_DIRS ${espidflib_SOURCE_DIR}/components)
+
+
 if(NOT DEFINED UD_GEN)
     set(UD_GEN "$ENV{UD_GEN}")
 endif()
@@ -40,33 +52,19 @@ set_property(DIRECTORY PROPERTY UD_DEBUG_TRACKER "${UD_DEBUG}")
 if (UD_DEBUG)
     message("Building with debug options")
     set(SDKCONFIG_DEFAULTS "sdkconfig.defaults;sdkconfig.${UD_GEN_LOWER}.defaults;sdkconfig.debug.defaults")
+    set(CMAKE_BUILD_TYPE Debug)
 else()
     message("Building with release options")
     set(SDKCONFIG_DEFAULTS "sdkconfig.defaults;sdkconfig.${UD_GEN_LOWER}.defaults")
-    add_compile_options("-O2")
+    set(CMAKE_BUILD_TYPE Release)
 endif()
+add_link_options("-Wl,--gc-sections")
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 
-idf_build_set_property(DEPENDENCIES_LOCK "dependencies.lock")
-
-# list(APPEND EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/components)
-list(APPEND EXTRA_COMPONENT_DIRS components)
-
-# Adds necessary definitions for compiling it using Serial symbol attached to the HW USB CDC port
-add_compile_definitions(ARDUINO_USB_CDC_ON_BOOT=1)
-add_compile_definitions(ARDUINO_USB_MODE=1)
-
-if(UD_GEN STREQUAL MK4)
-    add_compile_definitions(HWCDCSerial=Serial0)
-endif()
-
 # Keep struct initializers simple
 add_compile_options("-Wno-missing-field-initializers")
 
-# TODO Make this depend on some flag
-set(CMAKE_BUILD_TYPE Debug)
-
 project(ugly-duckling)
 
 # Use `idf.py -DFSUPLOAD=1 flash` to upload the data partition

README.md

@@ -4,7 +4,7 @@
 
 Ugly Duckling is a firmware for IoT devices participating in the FarmHub ecosystem.
 
-The devices are built around the Espressif ESP32 micro-controller using FreeRTOS and the Arduino framework.
+The devices are built around the Espressif ESP32 micro-controller using the ESP-IDF framework and FreeRTOS.
 The devices can report telemetry to, and receive configuration and commands from the FarmHub server via MQTT over WiFi.
 They can also receive firmware updates via HTTP(S).
 
@@ -150,8 +150,6 @@ See `FileCommands` for more information.
 
 - ESP-IDF v5.3.2 (see [installation instructions](https://docs.espressif.com/projects/esp-idf/en/stable/esp32/get-started/index.html))
 
-We are using this version because it is the latest version that is compatible with Arduino-ESP32 3.1.0-rc-1.
-
 ### Building
 
 There are two ways to build the firmware:

data-templates/multiplexer-mk6.json

@@ -0,0 +1,23 @@
+{
+  "instance": "DEVICE_INSTANCE",
+  "id": "DEVICE_ID",
+  "peripherals": [
+    {
+      "name": "relay",
+      "type": "multiplexer:xl9535",
+      "params": {
+        "sda": "C1",
+        "scl": "C4",
+        "address": "0x20"
+      }
+    },
+    {
+      "name": "valve-1",
+      "type": "valve",
+      "params": {
+        "pin": "relay:0"
+      }
+    }
+  ],
+  "sleepWhenIdle": true
+}

main/CMakeLists.txt

@@ -1,5 +1,11 @@
 FILE(GLOB_RECURSE app_sources main.cpp **/*.cpp)
 
+idf_component_register(
+    SRCS ${app_sources}
+    INCLUDE_DIRS "."
+    EMBED_TXTFILES "${CMAKE_SOURCE_DIR}/partitions.csv"
+)
+
 if(NOT DEFINED WOKWI)
     set(WOKWI "$ENV{WOKWI}")
 endif()
@@ -11,12 +17,6 @@ if(WOKWI)
     component_compile_definitions(WOKWI)
 endif()
 
-idf_component_register(
-    SRCS ${app_sources}
-    INCLUDE_DIRS "."
-    EMBED_TXTFILES "${CMAKE_SOURCE_DIR}/partitions.csv"
-)
-
 component_compile_definitions("${UD_GEN}")
 component_compile_definitions(FARMHUB_REPORT_MEMORY)
 

main/devices/Device.hpp

@@ -3,15 +3,11 @@
 #include <chrono>
 #include <memory>
 
-#include <Arduino.h>
-
 #include "esp_netif.h"
 #include "esp_wifi.h"
 #include <esp_pm.h>
 #include <esp_private/esp_clk.h>
 
-#include <Print.h>
-
 #include <kernel/BootClock.hpp>
 #include <kernel/Command.hpp>
 #include <kernel/Concurrent.hpp>
@@ -114,42 +110,18 @@ class ConsolePrinter {
         static const int spinnerLength = strlen(spinner);
         auto uptime = duration_cast<milliseconds>(boot_clock::now().time_since_epoch());
 
-        status.clear();
         counter = (counter + 1) % spinnerLength;
-        status.concat("[");
-        status.concat(spinner[counter]);
-        status.concat("] ");
-
-        status.concat("\033[33m");
-        status.concat(farmhubVersion);
-        status.concat("\033[0m");
-
-        status.concat(", uptime: \033[33m");
-        status.concat(String(uptime.count() / 1000.0, 1));
-        status.concat("\033[0m s");
-
-        status.concat(", WIFI: ");
-        status.concat(wifiStatus());
-        status.concat(" (up \033[33m");
-        status.concat(String(double(wifi.getUptime().count()) / 1000.0, 1));
-        status.concat("\033[0m s)");
-
-        status.concat(", RTC: \033[33m");
-        status.concat(RtcDriver::isTimeSet() ? "OK" : "UNSYNCED");
-        status.concat("\033[0m");
-
-        status.concat(", heap: \033[33m");
-        status.concat(String(double(heap_caps_get_free_size(MALLOC_CAP_INTERNAL)) / 1024.0, 2));
-        status.concat("\033[0m kB");
-
-        status.concat(", CPU: \033[33m");
-        status.concat(esp_clk_cpu_freq() / 1000000);
-        status.concat("\033[0m MHz");
+        status.clear();
+        status += std::format("[{}] ", spinner[counter]);
+        status += std::format("\033[33m{}\033[0m", farmhubVersion);
+        status += std::format(", uptime: \033[33m{:.2f}\033[0m s", uptime.count() / 1000.0);
+        status += std::format(", WIFI: {} (up \033[33m{:.1f}\033[0m s)", wifiStatus(), wifi.getUptime().count() / 1000.0);
+        status += std::format(", RTC \033[33m{}\033[0m", RtcDriver::isTimeSet() ? "OK" : "UNSYNCED");
+        status += std::format(", heap \033[33m{:.2f}\033[0m kB", heap_caps_get_free_size(MALLOC_CAP_INTERNAL) / 1024.0);
+        status += std::format(", CPU: \033[33m{}\033[0m MHz", esp_clk_cpu_freq() / 1000000);
 
         if (battery != nullptr) {
-            status.concat(", battery: \033[33m");
-            status.concat(String(battery->getVoltage(), 2));
-            status.concat("\033[0m V");
+            status += std::format(", battery: \033[33m{:.2f}\033[0m V", battery->getVoltage());
         }
 
         printf("\033[1G\033[0K%s", status.c_str());
@@ -205,7 +177,7 @@ class ConsolePrinter {
     }
 
     int counter;
-    String status;
+    std::string status;
     const std::shared_ptr<BatteryDriver> battery;
     WiFiDriver& wifi;
 };
@@ -335,14 +307,14 @@ class ConfiguredKernel {
                 }
                 printf("Shutdown process finished\n");
             });
-            task.delay(LOW_BATTERY_SHUTDOWN_TIMEOUT);
+            Task::delay(LOW_BATTERY_SHUTDOWN_TIMEOUT);
             enterLowPowerDeepSleep();
         }
     }
 
     [[noreturn]] inline void enterLowPowerDeepSleep() {
         printf("Entering low power deep sleep\n");
-        ESP.deepSleep(duration_cast<microseconds>(LOW_POWER_SLEEP_CHECK_INTERVAL).count());
+        esp_deep_sleep(duration_cast<microseconds>(LOW_POWER_SLEEP_CHECK_INTERVAL).count());
         // Signal to the compiler that we are not returning for real
         abort();
     }
@@ -435,10 +407,10 @@ class Device {
                 // Remove the level prefix
                 auto messageStart = 2;
                 // Remove trailing newline
-                auto messageEnd = record.message.charAt(length - 1) == '\n'
+                auto messageEnd = record.message[length - 1] == '\n'
                     ? length - 1
                     : length;
-                String message = record.message.substring(messageStart, messageEnd);
+                std::string message = record.message.substr(messageStart, messageEnd - messageStart);
 
                 mqttDeviceRoot->publish(
                     "log", [&](JsonObject& json) {
@@ -513,7 +485,7 @@ class Device {
         kernel.getKernelReadyState().set();
 
         LOGI("Device ready in %.2f s (kernel version %s on %s instance '%s' with hostname '%s' and IP '%s', SSID '%s', current time is %lld)",
-            millis() / 1000.0,
+            duration_cast<milliseconds>(boot_clock::now().time_since_epoch()).count() / 1000.0,
             kernel.version.c_str(),
             deviceConfig.model.get().c_str(),
             deviceConfig.instance.get().c_str(),
@@ -534,7 +506,7 @@ class Device {
         peripheralManager.publishTelemetry();
     }
 
-    String locationPrefix() {
+    std::string locationPrefix() {
         if (deviceConfig.location.hasValue()) {
             return deviceConfig.location.get() + "/";
         } else {
@@ -565,7 +537,7 @@ class Device {
     FileReadCommand fileReadCommand { fs };
     FileWriteCommand fileWriteCommand { fs };
     FileRemoveCommand fileRemoveCommand { fs };
-    HttpUpdateCommand httpUpdateCommand { [this](const String& url) {
+    HttpUpdateCommand httpUpdateCommand { [this](const std::string& url) {
         kernel.prepareUpdate(url);
     } };