Restucture and make the device folder a component

This is importent to ease the possibility of using EMBED_TXTFILES to
embed the .pem certificate into the image.

.gitignore

@@ -5,9 +5,9 @@ sdkconfig.old
 # This directory contains user-specific devices
 /devices/*
 # Ignore symlink to current device
-/main/device
+/main
 
 # This directory contains user-specific environment configurations
 /environments/*
 # Ignore symlink to current environment
-/main/environment.h
+/qthing/environment.h

CMakeLists.txt

@@ -3,4 +3,5 @@
 cmake_minimum_required(VERSION 3.5)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+idf_build_component(qthing)
 project(qthing)

default.nix

@@ -37,15 +37,14 @@ let
   '';
 
   qthingBaseRepo = pkgs.runCommand "qthing" {} ''
-    mkdir -p $out/main
+    mkdir -p $out/qthing
     for file in CMakeLists.txt components esp-idf sdkconfig; do
       ln -s ${./.}/$file $out/$file
     done
-    cd ${./.}/main
+    cd ${./.}/qthing
     for file in *; do
-      [[ "$file" == device ]] && continue
       [[ "$file" == environment.h ]] && continue
-      ln -s ${./.}/main/$file $out/main/$file
+      ln -s ${./.}/qthing/$file $out/qthing/$file
     done
   '';
 
@@ -57,7 +56,7 @@ in rec {
     shellHook = shellSetup;
   };
 
-  mkProject = { name, device, environment }: let
+  mkProject = { name, src, environment }: let
     flashScript = pkgs.writeScript "flash" ''
       PATH=${pkgs.esptool}/bin/:$PATH
       cd @out@
@@ -68,9 +67,9 @@ in rec {
     buildInputs = qthingDependencies;
     unpackPhase = ''
       cp --reflink=auto -r ${qthingBaseRepo}/* ./
-      chmod -R u+w .
-      cp --reflink=auto -r ${device} ./main/device
-      cp --reflink=auto ${environment} ./main/environment.h
+      chmod u+w qthing
+      cp --reflink=auto -r ${src} ./main
+      cp --reflink=auto ${environment} ./qthing/environment.h
     '';
     configurePhase = shellSetup + ''
       patchShebangs esp-idf

main/CMakeLists.txt → qthing/CMakeLists.txt

 idf_component_register(
   SRC_DIRS
   "."
-  "device"
   "network"
   "peripherals"
   "system"
@@ -15,6 +14,7 @@ idf_component_register(
   LiquidCrystal
   app_update
   arduino-esp32
+  main
   mqtt
   nvs_flash
   rc-switch

main/measured.h → qthing/measured.h

@@ -4,7 +4,7 @@
 #include <vector>
 #include <functional>
 
-#include "device/device_config.h"
+#include "device_config.h"
 
 #ifndef MEASURED_PERIOD_MS
 #define MEASURED_PERIOD_MS 1000
@@ -55,4 +55,4 @@ namespace qthing {
             void mqtt(const std::vector<qthing::measured::sensor_data_t>& data);
         }
     }
-}
+}
\ No newline at end of file

main/mqtt.cpp → qthing/mqtt.cpp

@@ -4,7 +4,7 @@
 
 #include "environment.h"
 #include "event.h"
-#include "device/device_config.h"
+#include "device_config.h"
 #include "io.h"
 
 #include <new>

main/mqtt_common.h → qthing/mqtt_common.h

@@ -2,7 +2,7 @@
 #define MQTT_COMMON_H
 
 #include "environment.h"
-#include "device/device_config.h"
+#include "device_config.h"
 
 #define STATUS_TOPIC DEVICE_NAMESPACE "status"
 #define STATUS_MESSAGE_ONLINE "online"
@@ -21,4 +21,4 @@
 #define OTA_STATE_TOPIC    DEVICE_NAMESPACE "ota/state"
 #define OTA_ERROR_TOPIC    DEVICE_NAMESPACE "ota/error"
 
-#endif
+#endif
\ No newline at end of file