Merge pull request #42 from xrobot-org/dev

Support esp-idf v5.1.

.github/workflows/build.yml

@@ -42,4 +42,4 @@ jobs:
       run: git config --global --add safe.directory /__w/XRobot/XRobot && git submodule init && git submodule update
 
     - name: Build
-      run: export HOME=/root && bash -c "source ~/.idf_profile && python project.py build all all"
+      run: export HOME=/root && bash -c "python project.py build all all"

.github/workflows/build_publish.yml

@@ -39,7 +39,7 @@ jobs:
       run: git config --global --add safe.directory /__w/XRobot/XRobot && git submodule init && git submodule update
 
     - name: Build
-      run: export HOME=/root && bash -c "source ~/.idf_profile && python project.py build all all"
+      run: export HOME=/root && bash -c "python project.py build all all"
 
     - name: Pack firmware
       run: zip -r ./firmware.zip ./firmware

.vscode/settings.json

@@ -49,4 +49,5 @@
     ],
     "clangd.path": "clangd",
     "editor.inlayHints.enabled": "offUnlessPressed",
+    "cmake.options.statusBarVisibility": "visible",
 }

CMakeLists.txt

@@ -40,9 +40,9 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
   add_compile_options(-Werror -gdwarf-4)
 
 elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
-  set(CMAKE_C_FLAGS_RELEASE "-O3 -g")
-  set(CMAKE_ASM_FLAGS_RELEASE "-O3 -g")
-  set(CMAKE_EXE_LINKER_FLAGS_RELEASE "")
+  set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -g")
+  set(CMAKE_ASM_FLAGS_RELWITHDEBINFO "-O3 -g")
+  set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "")
   add_compile_definitions(MCU_DEBUG_BUILD)
   add_compile_options(-Werror -gdwarf-4)
 
@@ -53,9 +53,9 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
   add_compile_definitions()
 
 elseif(CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
-  set(CMAKE_C_FLAGS_RELEASE "-Os")
-  set(CMAKE_ASM_FLAGS_RELEASE "-Os")
-  set(CMAKE_EXE_LINKER_FLAGS_RELEASE "")
+  set(CMAKE_C_FLAGS_MINSIZEREL "-Os")
+  set(CMAKE_ASM_FLAGS_MINSIZEREL "-Os")
+  set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "")
   add_compile_definitions()
 else()
   message(FATAL_ERROR "Unknown build type.")

hw/bsp/esp32-c3-arduino/board.cmake

@@ -1,9 +1,15 @@
 cmake_minimum_required(VERSION 3.16)
 
+include_directories(
+  PUBLIC $ENV{IDF_PATH}/components/esp_http_client/include
+  PUBLIC $ENV{IDF_PATH}/components/mdns/include
+  PUBLIC $ENV{IDF_PATH}/components/lwip/lwip/src/include/lwip/apps
+  PUBLIC $ENV{IDF_PATH}/components/libhelix-mp3/libhelix-mp3/pub
+)
+
 # Include for ESP-IDF build system functions
 include($ENV{IDF_PATH}/tools/cmake/idf.cmake)
 
-add_compile_options(-Wno-missing-field-initializers -Wno-write-strings)
 add_compile_definitions(ARDUINO_USB_CDC_ON_BOOT=1 ARDUINO_USB_MODE=1)
 
 # Create idf::{target} and idf::freertos static libraries
@@ -14,7 +20,7 @@ idf_build_process("esp32c3"
                 # although esptool_py does not generate static library,
                 # processing the component is needed for flashing related
                 # targets and file generation
-                COMPONENTS freertos esptool_py driver nvs_flash bt esp_http_client esp_https_ota arduino-esp32
+                COMPONENTS freertos esptool_py driver nvs_flash bt mdns libhelix-mp3 esp_http_client esp_https_ota arduino-esp32
                 SDKCONFIG ${BOARD_DIR}/sdkconfig
                 BUILD_DIR ${CMAKE_BINARY_DIR})
 
@@ -31,6 +37,8 @@ target_link_libraries(
   idf::spi_flash
   idf::driver
   idf::nvs_flash
+  idf::mdns
+  idf::libhelix-mp3
   idf::esp_wifi
   idf::esp_http_client
   idf::esp_https_ota
@@ -39,19 +47,17 @@ target_link_libraries(
   system
   robot
 )
-# Attach additional targets to the executable file for flashing,
-# linker script generation, partition_table generation, etc.
-idf_build_executable(${elf_file})
 
 add_subdirectory(${BOARD_DIR}/drivers)
 
-# add_compile_options(-Wno-missing-field-initializers)
 
 target_include_directories(
   ${PROJECT_NAME}.elf
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
-  PRIVATE $ENV{IDF_PATH}/components/esp_http_client/include
-  PRIVATE $<TARGET_PROPERTY:bsp,INTERFACE_INCLUDE_DIRECTORIES>
-  PRIVATE $<TARGET_PROPERTY:system,INTERFACE_INCLUDE_DIRECTORIES>
-  PRIVATE $<TARGET_PROPERTY:robot,INTERFACE_INCLUDE_DIRECTORIES>
+  PUBLIC $<TARGET_PROPERTY:idf::mdns,INTERFACE_INCLUDE_DIRECTORIES>
+  PUBLIC $<TARGET_PROPERTY:bsp,INTERFACE_INCLUDE_DIRECTORIES>
+  PUBLIC $<TARGET_PROPERTY:system,INTERFACE_INCLUDE_DIRECTORIES>
+  PUBLIC $<TARGET_PROPERTY:robot,INTERFACE_INCLUDE_DIRECTORIES>
 )
+
+idf_build_executable(${elf_file})

hw/bsp/esp32-c3-arduino/drivers/bsp_flash.c

@@ -15,6 +15,8 @@ bsp_status_t bsp_flash_init() {
     err = nvs_flash_init();
   }
   ESP_ERROR_CHECK(err);
+
+  return err == ESP_OK ? BSP_OK : BSP_ERR;
 }
 
 size_t bsp_flash_check_blog(const char* name) {

hw/bsp/esp32-c3-arduino/main.ino

@@ -2,4 +2,4 @@
 
 void setup() {}
 
-void loop() { sleep(1000); }
+void loop() { delay(1000); }