Move headers to `qthing/` path and move envronment

.gitignore

@@ -14,4 +14,4 @@ sdkconfig.old
 # This directory contains user-specific environment configurations
 /environments/*
 # Ignore symlink to current environment
-/qthing/include/environment.h
+/generated/environment.h

CMakeLists.txt

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

bin/set-environment

@@ -12,9 +12,9 @@ function list_known_environments {
 }
 
 function link_environment {
-    echo "Linking qthing/include/environment.h to $1"
-    ln -snf "$1" "${QTHING_PATH:-.}/qthing/include/environment.h"
-    touch --no-create "${QTHING_PATH:-.}/qthing/include/environment.h"
+    echo "Linking generated/environment.h to $1"
+    ln -snf "$1" "${QTHING_PATH:-.}/generated/environment.h"
+    touch --no-create "${QTHING_PATH:-.}/generated/environment.h"
 }
 
 if [[ -z "$1" ]]; then
@@ -23,7 +23,7 @@ if [[ -z "$1" ]]; then
 elif [[ -f "$1" && "$1" == *.h ]]; then
     link_environment "$1"
 elif [[ -f "${QTHING_PATH:-.}/environments/$1.h" ]]; then
-    link_environment "../../environments/$1.h"
+    link_environment "../environments/$1.h"
 else
     echo "Cannot find environment config in the following locations:"
     echo "$1"

generated/CMakeLists.txt

+idf_component_register(
+  INCLUDE_DIRS
+  "."
+)

qthing/CMakeLists.txt

@@ -7,15 +7,19 @@ idf_component_register(
 
   INCLUDE_DIRS
   "include"
+  "magic-include"
 
   REQUIRES
   ESP32-Digital-RGB-LED-Drivers
   LiquidCrystal
   app_update
   arduino-esp32
+  generated
   main
   mqtt
   nvs_flash
   rc-switch
 )
 component_compile_options(-std=c++17)
+component_compile_options(-fdiagnostics-color=always)
+component_compile_options(-Wall)

qthing/color.cpp

 #include <cmath>
 
-#include "qthing_legacy.hpp"
+#include "qthing/qthing_legacy.hpp"
 
 namespace qthing {
 // TODO: should return RGB once that can be casted to RGBW

qthing/error.cpp

-#include "error.hpp"
+#include "qthing/error.hpp"
 
 void qthing::errorCodeToException(esp_err_t errorNumber) {
   if (errorNumber != ESP_OK) {

qthing/event.cpp

-#include "event.hpp"
+#include "qthing/event.hpp"
 
-#include "qthing_legacy.hpp"
+#include "qthing/qthing_legacy.hpp"
 
 namespace qthing {
 

qthing/include/qthing.hpp

@@ -2,11 +2,11 @@
 
 #define QTHING_HIDE_PRIVATE_API
 
-#include "error.hpp"
-#include "network.hpp"
-#include "power.hpp"
-#include "qthing_legacy.hpp"
-#include "time.hpp"
-#include "util.hpp"
+#include "qthing/error.hpp"
+#include "qthing/network.hpp"
+#include "qthing/power.hpp"
+#include "qthing/qthing_legacy.hpp"
+#include "qthing/time.hpp"
+#include "qthing/util.hpp"
 
 #undef QTHING_HIDE_PRIVATE_API