feat: update

Author: Lzw655

CMakeLists.txt

@@ -9,4 +9,7 @@ idf_component_register(
     REQUIRES driver esp_lcd
 )
 
-target_compile_options(${COMPONENT_LIB} PUBLIC -Wno-missing-field-initializers)
+target_compile_options(${COMPONENT_LIB}
+    PUBLIC -Wno-missing-field-initializers
+    PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>
+)

micropython.cmake

@@ -21,7 +21,7 @@ target_include_directories(usermod_esp_display_panel INTERFACE ${SRC_DIR} ${MPY_
 # Add compile options. Since the target is not created by `idf_component_register()`, we need to add the `ESP_PLATFORM` define manually.
 target_compile_options(usermod_esp_display_panel
     INTERFACE
-        -Wno-missing-field-initializers -DESP_PLATFORM $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++2b>
+        -Wno-missing-field-initializers -DESP_PLATFORM $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>
 )
 
 # Link INTERFACE library to the usermod target.

src/drivers/io_expander/esp_panel_io_expander_adapter.hpp

@@ -13,23 +13,17 @@
 
 namespace esp_panel::drivers {
 
-/**
- * @brief Concept to check whether a type is derived from `esp_expander::Base`
- *
- * @tparam T Type to be checked
- */
-template<class T>
-concept CheckIsIO_ExpanderAdaptee = std::is_base_of_v<esp_expander::Base, T>;
 
 /**
  * @brief Adapter class template for IO expander devices
  *
  * @tparam T Type of the IO expander device, must satisfy CheckIsIO_ExpanderAdaptee concept
  */
 template <class T>
-requires CheckIsIO_ExpanderAdaptee<T>
 class IO_ExpanderAdapter: public IO_Expander, public T {
 public:
+    static_assert(std::is_base_of_v<esp_expander::Base, T>, "`T` must be derived from `esp_expander::Base`");
+
     /**
      * @brief Construct a new IO expander adapter
      *
@@ -94,7 +88,6 @@ class IO_ExpanderAdapter: public IO_Expander, public T {
 };
 
 template <class T>
-requires CheckIsIO_ExpanderAdaptee<T>
 IO_ExpanderAdapter<T>::~IO_ExpanderAdapter()
 {
     ESP_UTILS_LOG_TRACE_ENTER_WITH_THIS();
@@ -105,7 +98,6 @@ IO_ExpanderAdapter<T>::~IO_ExpanderAdapter()
 }
 
 template <class T>
-requires CheckIsIO_ExpanderAdaptee<T>
 bool IO_ExpanderAdapter<T>::init()
 {
     ESP_UTILS_LOG_TRACE_ENTER_WITH_THIS();
@@ -137,7 +129,6 @@ bool IO_ExpanderAdapter<T>::init()
 }
 
 template <class T>
-requires CheckIsIO_ExpanderAdaptee<T>
 bool IO_ExpanderAdapter<T>::begin()
 {
     ESP_UTILS_LOG_TRACE_ENTER_WITH_THIS();
@@ -162,7 +153,6 @@ bool IO_ExpanderAdapter<T>::begin()
 }
 
 template <class T>
-requires CheckIsIO_ExpanderAdaptee<T>
 bool IO_ExpanderAdapter<T>::del()
 {
     ESP_UTILS_LOG_TRACE_ENTER_WITH_THIS();

src/drivers/lcd/esp_panel_lcd.cpp

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <algorithm>
 #include <memory>
 #include <numeric>
 #include "sdkconfig.h"
@@ -801,10 +802,8 @@ bool LCD::colorBarTest(uint16_t width, uint16_t height)
     int res_line_count = 0;
 
     /* Malloc memory for a single color bar */
-    auto single_bar_buf_ptr = utils::make_shared<uint8_t[]>(row_per_bar * width * bytes_per_piexl);
-    ESP_UTILS_CHECK_NULL_RETURN(single_bar_buf_ptr, false, "Alloc color buffer failed");
-
-    auto single_bar_buf = single_bar_buf_ptr.get();
+    utils::vector<uint8_t> single_bar(row_per_bar * width * bytes_per_piexl);
+    auto single_bar_buf = single_bar.data();
     auto bus_type = getBus()->getBasicAttributes().type;
     /* Draw color bar from top left to bottom right, the order is B - G - R */
     for (int j = 0; j < bits_per_piexl; j++) {

src/drivers/touch/esp_panel_touch.cpp

@@ -534,23 +534,23 @@ bool Touch::readRawDataPoints(int points_num)
     }
     ESP_UTILS_LOGD("Try to read %d points", points_num);
 
-    auto x_ptr = utils::make_shared<uint16_t[]>(points_num);
-    auto y_ptr = utils::make_shared<uint16_t[]>(points_num);
-    auto strength_ptr = utils::make_shared<uint16_t[]>(points_num);
-    auto x = x_ptr.get();
-    auto y = y_ptr.get();
-    auto strength = strength_ptr.get();
+    utils::vector<uint16_t> x(points_num);
+    utils::vector<uint16_t> y(points_num);
+    utils::vector<uint16_t> strength(points_num);
+    auto x_buf = x.data();
+    auto y_buf = y.data();
+    auto strength_buf = strength.data();
     uint8_t ret_points_num = 0;
 
     // Get the point coordinates from the raw data
-    esp_lcd_touch_get_coordinates(touch_panel, x, y, strength, &ret_points_num, points_num);
+    esp_lcd_touch_get_coordinates(touch_panel, x_buf, y_buf, strength_buf, &ret_points_num, points_num);
     ESP_UTILS_LOGD("Get %d points number", ret_points_num);
 
     // Update the points
     std::unique_lock lock(_resource_mutex);
     _points.clear();
     for (int i = 0; i < ret_points_num; i++) {
-        _points.emplace_back(x[i], y[i], strength[i]);
+        _points.emplace_back(static_cast<int>(x_buf[i]), static_cast<int>(y_buf[i]), static_cast<int>(strength_buf[i]));
     }
     lock.unlock();
 

src/drivers/touch/esp_panel_touch.hpp

@@ -25,6 +25,9 @@ namespace esp_panel::drivers {
  * Contains x/y coordinates and touch strength information for a single touch point
  */
 struct TouchPoint {
+    TouchPoint() = default;
+    TouchPoint(int x, int y, int strength) : x(x), y(y), strength(strength) {}
+
     /**
      * @brief Compare if two touch points are equal
      *

src/esp_display_panel.hpp

@@ -10,6 +10,9 @@
 #include "esp_panel_versions.h"
 #include "esp_panel_conf_internal.h"
 
+/* Utils */
+#include "utils/esp_panel_utils_cxx.hpp"
+
 /* Drivers */
 #include "drivers/bus/esp_panel_bus_factory.hpp"
 #include "drivers/lcd/esp_panel_lcd_factory.hpp"

src/utils/esp_panel_utils_map.hpp

@@ -6,7 +6,7 @@
 #pragma once
 
 #include <unordered_map>
-#include "memory/esp_utils_mem.h"
+#include "esp_lib_utils.h"
 
 namespace esp_panel::utils {
 

src/utils/esp_panel_utils_memory.hpp

@@ -6,7 +6,7 @@
 #pragma once
 
 #include <memory>
-#include "memory/esp_utils_mem.h"
+#include "esp_lib_utils.h"
 
 namespace esp_panel::utils {
 

src/utils/esp_panel_utils_string.hpp

@@ -10,7 +10,7 @@
 #include <string>
 #include <memory>
 #include <stdexcept>
-#include "memory/esp_utils_mem.h"
+#include "esp_lib_utils.h"
 
 namespace esp_panel::utils {
 

src/utils/esp_panel_utils_vector.hpp

@@ -6,7 +6,7 @@
 #pragma once
 
 #include <vector>
-#include "memory/esp_utils_mem.h"
+#include "esp_lib_utils.h"
 
 namespace esp_panel::utils {