Merge branch 'idf' of github.com:HendrikRauh/dmx-interface into idf

.gitignore

@@ -4,6 +4,7 @@
 /build/
 *.elf
 *.bin
+*.uf2
 *.hex
 *.map
 *.img

.pre-commit-config.yaml

@@ -99,6 +99,13 @@ repos:
         language: system
         types: [nix]
 
+  # CMake formatting and linting
+  - repo: https://github.com/cheshirekow/cmake-format-precommit
+    rev: v0.6.10
+    hooks:
+      - id: cmake-format
+      - id: cmake-lint
+
   # Doxygen code coverage
   - repo: local
     hooks:

CMakeLists.txt

@@ -1,10 +1,7 @@
-# For more information about build system see
-# https://docs.espressif.com/projects/esp-idf/en/latest/api-guides/build-system.html
-# The following five lines of boilerplate have to be in your project's
-# CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)
 
-# Clear any stale EXTRA_COMPONENT_DIRS entries (e.g. leftover from previous runs or PlatformIO)
+# Clear any stale EXTRA_COMPONENT_DIRS entries (e.g. leftover from previous runs
+# or PlatformIO)
 set(EXTRA_COMPONENT_DIRS "")
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
@@ -13,5 +10,6 @@ project(dmx-interface)
 
 # Enable LittleFS filesystem image creation for web assets
 if(COMMAND littlefs_create_partition_image)
-  littlefs_create_partition_image(storage ${CMAKE_SOURCE_DIR}/data FLASH_IN_PROJECT)
+  littlefs_create_partition_image(storage ${CMAKE_SOURCE_DIR}/data
+                                  FLASH_IN_PROJECT)
 endif()

components/storage/CMakeLists.txt

@@ -1,6 +1,10 @@
 idf_component_register(
-    SRCS "src/storage.c"
+  SRCS
-    INCLUDE_DIRS "include"
+  "src/storage.c"
-    REQUIRES joltwallet__littlefs
+  INCLUDE_DIRS
-    PRIV_REQUIRES vfs logger
+  "include"
-)
+  REQUIRES
+  joltwallet__littlefs
+  PRIV_REQUIRES
+  vfs
+  logger)

components/web_server/CMakeLists.txt

@@ -1,7 +1,16 @@
 idf_component_register(
-    SRCS "src/web_server.c"
+  SRCS
-         "src/wifi.c"
+  "src/web_server.c"
-    INCLUDE_DIRS "include"
+  "src/wifi.c"
-    REQUIRES esp_http_server storage
+  INCLUDE_DIRS
-    PRIV_REQUIRES freertos esp_wifi esp_event esp_netif nvs_flash logger
+  "include"
-)
+  REQUIRES
+  esp_http_server
+  storage
+  PRIV_REQUIRES
+  freertos
+  esp_wifi
+  esp_event
+  esp_netif
+  nvs_flash
+  logger)

main/CMakeLists.txt

@@ -1,3 +1,2 @@
-idf_component_register(SRCS "dmx-interface.c"
+idf_component_register(SRCS "dmx-interface.c" INCLUDE_DIRS "." REQUIRES
-                    INCLUDE_DIRS "."
+                       web_server)
-                    REQUIRES web_server)