feat(cmake): remove CXX compile options

Author: Lzw655

CHANGELOG.md

@@ -1,5 +1,15 @@
 # ChangeLog
 
+## v0.2.2 - 2025-06-27
+
+### Enhancements:
+
+* feat(log): add CXX log trace guard and ESP-IDF log implementation
+* feat(check): add value check macros
+* feat(repo): add thread module, support configure thread
+* feat(repo): add more module, support some guard classes
+* feat(cmake): remove CXX compile options
+
 ## v0.2.1 - 2025-05-30
 
 ### Enhancements:

CMakeLists.txt

@@ -17,8 +17,6 @@ endif()
 target_compile_options(${COMPONENT_LIB}
     PUBLIC
         -Wno-missing-field-initializers
-    PRIVATE
-        $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++20>
 )
 
 if(NOT ESP_PLATFORM)

Kconfig

@@ -7,7 +7,7 @@ menu "ESP Library Utils Configurations"
 
     if ESP_UTILS_CONF_FILE_SKIP
         menu "Check functions"
-            choice ESP_UTILS_CONF_CHECK_HANDLE_METHOD
+            choice ESP_UTILS_CONF_CHECK_HANDLE_METHOD_CHOICE
                 prompt "Select handle method when check failed"
                 default ESP_UTILS_CHECK_HANDLE_WITH_ERROR_LOG
 
@@ -29,7 +29,7 @@ menu "ESP Library Utils Configurations"
         endmenu
 
         menu "Log functions"
-            choice ESP_UTILS_CONF_LOG_IMPL_TYPE
+            choice ESP_UTILS_CONF_LOG_IMPL_TYPE_CHOICE
                 prompt "Select log implementation"
                 default ESP_UTILS_CONF_LOG_IMPL_ESP
 
@@ -45,7 +45,7 @@ menu "ESP Library Utils Configurations"
                 default 0 if ESP_UTILS_CONF_LOG_IMPL_STDLIB
                 default 1 if ESP_UTILS_CONF_LOG_IMPL_ESP
 
-            choice ESP_UTILS_CONF_LOG_LEVEL
+            choice ESP_UTILS_CONF_LOG_LEVEL_CHOICE
                 prompt "Select global log level"
                 default ESP_UTILS_CONF_LOG_LEVEL_INFO
 
@@ -126,7 +126,7 @@ menu "ESP Library Utils Configurations"
                     default 2 if ESP_UTILS_CONF_MEM_GEN_ALLOC_TYPE_MICROPYTHON
                     default 3 if ESP_UTILS_CONF_MEM_GEN_ALLOC_TYPE_CUSTOM
 
-                choice ESP_UTILS_CONF_MEM_GEN_ALLOC_ESP_CAPS
+                choice ESP_UTILS_CONF_MEM_GEN_ALLOC_ESP_CAPS_CHOICE
                     prompt "ESP memory caps"
                     depends on ESP_UTILS_CONF_MEM_GEN_ALLOC_TYPE_ESP
                     default ESP_UTILS_CONF_MEM_GEN_ALLOC_ESP_CAPS_DEFAULT
@@ -193,7 +193,7 @@ menu "ESP Library Utils Configurations"
                     default 2 if ESP_UTILS_CONF_MEM_CXX_GLOB_ALLOC_TYPE_MICROPYTHON
                     default 3 if ESP_UTILS_CONF_MEM_CXX_GLOB_ALLOC_TYPE_CUSTOM
 
-                choice ESP_UTILS_CONF_MEM_CXX_GLOB_ALLOC_ESP_CAPS
+                choice ESP_UTILS_CONF_MEM_CXX_GLOB_ALLOC_ESP_CAPS_CHOICE
                     prompt "ESP memory caps"
                     depends on ESP_UTILS_CONF_MEM_CXX_GLOB_ALLOC_TYPE_ESP
                     default ESP_UTILS_CONF_MEM_CXX_GLOB_ALLOC_ESP_CAPS_DEFAULT

src/esp_utils_conf_kconfig.h

@@ -24,7 +24,7 @@
 #   ifdef CONFIG_ESP_UTILS_CONF_LOG_IMPL_TYPE
 #       define ESP_UTILS_CONF_LOG_IMPL_TYPE      CONFIG_ESP_UTILS_CONF_LOG_IMPL_TYPE
 #   else
-#       error "Missing configuration: ESP_UTILS_CONF_LOG_IMPL_TYPE"
+#       define ESP_UTILS_CONF_LOG_IMPL_TYPE      ESP_UTILS_LOG_IMPL_STDLIB
 #   endif
 #endif
 

src/log/esp_utils_log_helper.h

@@ -7,6 +7,7 @@
 
 #include "esp_utils_log.h"
 
+#if ESP_UTILS_CONF_LOG_IMPL_TYPE != ESP_UTILS_LOG_IMPL_ESP
 /**
  * Helper macros to replace ESP-IDF logging functions
  */
@@ -20,3 +21,4 @@
 #define ESP_LOGI(TAG, ...) { (void)TAG; ESP_UTILS_LOGI(__VA_ARGS__); }
 #define ESP_LOGW(TAG, ...) { (void)TAG; ESP_UTILS_LOGW(__VA_ARGS__); }
 #define ESP_LOGE(TAG, ...) { (void)TAG; ESP_UTILS_LOGE(__VA_ARGS__); }
+#endif

src/thread/esp_utils_thread.cpp

@@ -18,12 +18,16 @@ void ThreadConfig::dump() const
         "\t-core_id(%d)\n"
         "\t-priority(%d)\n"
         "\t-stack_size(%d)\n"
-        "\t-stack_in_ext(%s)\n",
-        (name == nullptr) ? CONFIG_PTHREAD_TASK_NAME_DEFAULT : name,
-        core_id,
-        static_cast<int>(priority),
-        static_cast<int>(stack_size),
-        stack_in_ext ? "true" : "false"
+#if ESP_THREAD_CONFIG_STACK_CAPS_VALID
+        "\t-stack_in_ext(%s)\n"
+#endif
+        , (name == nullptr) ? CONFIG_PTHREAD_TASK_NAME_DEFAULT : name
+        , core_id
+        , static_cast<int>(priority)
+        , static_cast<int>(stack_size)
+#if ESP_THREAD_CONFIG_STACK_CAPS_VALID
+        , stack_in_ext ? "true" : "false"
+#endif
     );
 }
 
@@ -42,7 +46,9 @@ thread_config_guard::thread_config_guard(const ThreadConfig &config)
     new_cfg.prio = config.priority;
     new_cfg.inherit_cfg = false;
     new_cfg.pin_to_core = config.core_id;
+#if ESP_THREAD_CONFIG_STACK_CAPS_VALID
     new_cfg.stack_alloc_caps = (config.stack_in_ext ? MALLOC_CAP_SPIRAM : MALLOC_CAP_INTERNAL) | MALLOC_CAP_8BIT;
+#endif
 
     auto err = esp_pthread_set_cfg(&new_cfg);
     ESP_UTILS_CHECK_FALSE_EXIT(err == ESP_OK, "Set thread config failed(%s)", esp_err_to_name(err));

src/thread/esp_utils_thread.hpp

@@ -9,6 +9,8 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 
+#define ESP_THREAD_CONFIG_STACK_CAPS_VALID  (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0))
+
 namespace esp_utils {
 
 struct ThreadConfig {
@@ -18,7 +20,9 @@ struct ThreadConfig {
     int       core_id = (CONFIG_PTHREAD_TASK_CORE_DEFAULT == -1) ? tskNO_AFFINITY : CONFIG_PTHREAD_TASK_CORE_DEFAULT;
     size_t   priority = CONFIG_PTHREAD_TASK_PRIO_DEFAULT;
     size_t stack_size = CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT;
+#if ESP_THREAD_CONFIG_STACK_CAPS_VALID
     bool stack_in_ext = false;
+#endif
 };
 
 class thread_config_guard {

test_apps/main/test_on_cpp.cpp

@@ -3,13 +3,14 @@
  *
  * SPDX-License-Identifier: CC0-1.0
  */
+#include <thread>
 #include <memory>
 #include "unity.h"
 #define ESP_UTILS_LOG_TAG "TestCpp"
 #include "esp_lib_utils.h"
 #include "esp_utils_helpers.h"
 
-using namespace std;
+using namespace esp_utils;
 
 TEST_CASE("Test log functions on cpp", "[utils][log][CPP]")
 {
@@ -47,15 +48,15 @@ TEST_CASE("Test memory functions on cpp", "[utils][memory][CPP]")
 
     std::shared_ptr<TestGoodClass> good_ptr = nullptr;
     ESP_UTILS_CHECK_EXCEPTION_GOTO(
-        (good_ptr = make_shared<TestGoodClass>()), err, "Failed to allocate memory size: %d",
+        (good_ptr = std::make_shared<TestGoodClass>()), err, "Failed to allocate memory size: %d",
         MALLOC_GOOD_SIZE
     );
     ESP_UTILS_LOGI("Malloced value: %d", good_ptr->buffer[0]);
 
     {
         std::shared_ptr<TestBadClass> bad_ptr = nullptr;
         ESP_UTILS_CHECK_EXCEPTION_GOTO(
-            (bad_ptr = make_shared<TestBadClass>()), end, "Failed to allocate memory size: %d", MALLOC_BAD_SIZE
+            (bad_ptr = std::make_shared<TestBadClass>()), end, "Failed to allocate memory size: %d", MALLOC_BAD_SIZE
         );
         ESP_UTILS_LOGI("Malloced value: %d", bad_ptr->buffer[0]);
     }
@@ -184,3 +185,18 @@ TEST_CASE("Test check functions on cpp", "[utils][check][CPP]")
     test_check_null_exit();
     TEST_ASSERT(test_check_null_exit_result);
 }
+
+TEST_CASE("Test thread functions on cpp", "[utils][thread][CPP]")
+{
+    thread_config_guard guard(ThreadConfig{
+        .name = "test_thread",
+        .core_id = 0,
+        .priority = 5,
+        .stack_size = 10 * 1024,
+    });
+    std::thread([]() {
+        char buffer[5 * 1024] = { 0 };
+        sprintf(buffer, "Create thread");
+        ESP_UTILS_LOGI("%s", buffer);
+    }).join();
+}