Upgrade to idf 5.1

dk307 · Aug 11, 2023 · f665ae5 · f665ae5
1 parent d549a7d
commit f665ae5
Show file tree

Hide file tree

Showing 11 changed files with 291 additions and 143 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,7 +1,7 @@
 {
     "idf.adapterTargetName": "esp32s3",
     "idf.openOcdConfigs": [
-        "board/esp32s3-bridge.cfg"
+        "board/esp32s3-builtin.cfg"
     ],
     "idf.portWin": "COM4",
     "idf.flashType": "UART",

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -37,4 +37,5 @@ message(STATUS "SDKCONFIG = ${SDKCONFIG}")
 message(STATUS "SDKCONFIG_DEFAULTS = ${SDKCONFIG_DEFAULTS}")
 message(STATUS "CMAKE_SOURCE_DIR = ${CMAKE_SOURCE_DIR}")
 message(STATUS "CMAKE_BINARY_DIR = ${CMAKE_BINARY_DIR}")
+message(STATUS "COMPILE_OPTIONS = ${COMPILE_OPTIONS}")
 message(STATUS "---------------------------------------")
diff --git a/README.md b/README.md
@@ -10,6 +10,7 @@ Air quality sensor on ESP32-S3 using ESP-IDF framework
 * BH1750 - Light Sensor
 * SPS30 Sensirion - Particle sensor
 * SCD30 Sensirion - CO2 Sensor (Optional)
+* SCD4x Sensirion - CO2 Sensor (Optional)
 
 ## Features
 * LVGL based display UI

diff --git a/components/lvgl b/components/lvgl
diff --git a/dependencies.lock b/dependencies.lock
@@ -21,7 +21,7 @@ dependencies:
     component_hash: null
     source:
       type: idf
-    version: 5.0.0
+    version: 5.1.0
 manifest_hash: 9275a596616c0a70cfe5b167d7bb0650aa90eb700c5b2ebe12470c3274692aa7
 target: esp32s3
 version: 1.0.0
diff --git a/main/hardware/sensors/sensor.h b/main/hardware/sensors/sensor.h
@@ -4,13 +4,15 @@
 #include "util/circular_buffer.h"
 #include "util/psram_allocator.h"
 #include "util/semaphore_lockable.h"
+#include <array>
 #include <atomic>
 #include <cmath>
 #include <mutex>
 #include <optional>
 #include <type_traits>
 #include <vector>
 
+
 class sensor_definition_display
 {
   public:

diff --git a/main/idf_component.yml b/main/idf_component.yml
@@ -14,4 +14,4 @@ dependencies:
   #   # For transient dependencies `public` flag can be set.
   #   # `public` flag doesn't have an effect dependencies of the `main` component.
   #   # All dependencies of `main` are public by default.
-  #   public: true
+  #   public: true
diff --git a/main/lv_conf.h b/main/lv_conf.h
@@ -1,6 +1,5 @@
 /**
  * @file lv_conf.h
- * Configuration file for v8.3.2
  */
 
 /*

diff --git a/main/ui/ui2.cpp b/main/ui/ui2.cpp
@@ -46,7 +46,6 @@ void ui::no_wifi_img_animation_cb(void *var, int32_t v)
 
 void ui::load_boot_screen()
 {
-
 #if LV_USE_LOG
     lv_log_register_print_cb(&lv_logger);
 #endif

diff --git a/main/util/helper.h b/main/util/helper.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <algorithm>
 #include <cmath>
 #include <cstring>
 #include <memory>
@@ -9,6 +10,7 @@
 #include <type_traits>
 #include <vector>
 
+
 // copied from https://github.com/esphome/esphome/tree/dev/esphome/core
 
 namespace esp32