Add changes to make factory_demo example compatible with ESP-IDF 5.x

2022-08-04 13:14:37 +05:30
parent 9ddbf76bae
commit 2c3fe7c8d6
7 changed files with 21 additions and 4 deletions
@@ -29,7 +29,7 @@
    .use_apll               = false, \
    .tx_desc_auto_clear     = true, \
    .fixed_mclk             = 0, \
-    .mclk_multiple          = I2S_MCLK_MULTIPLE_DEFAULT, \
+    .mclk_multiple          = I2S_MCLK_MULTIPLE_256, \
    .bits_per_chan          = I2S_BITS_PER_CHAN_16BIT, \
 }

@@ -4,3 +4,5 @@ idf_component_register(
    INCLUDE_DIRS
        "include"
    REQUIRES driver)
+
+target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format")
@@ -1,3 +1,12 @@
+if("${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}" VERSION_GREATER_EQUAL "5.0")
+    set(PRIVREQ esp_adc)
+else()
+    set(PRIVREQ esp_adc_cal)
+endif()
+
 idf_component_register(SRCS "button_adc.c" "button_gpio.c" "iot_button.c"
                        INCLUDE_DIRS include
-                        PRIV_REQUIRES esp_adc_cal)
+                        REQUIRES driver
+                        PRIV_REQUIRES ${PRIVREQ})
+
+target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format")
@@ -13,7 +13,7 @@ endif(DEFINED ENV{RMAKER_PATH})

 set(EXTRA_COMPONENT_DIRS
    ../../components
-    $ENV{IDF_PATH}/examples/common_components/led_strip
+    $ENV{IDF_PATH}/examples/common_components
    ${RMAKER_PATH}/components
    )

@@ -14,6 +14,8 @@ idf_component_register(
        "app"
        "rmaker")

+target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format")
+
 target_compile_definitions(${COMPONENT_TARGET} PRIVATE "-D RMAKER_DEMO_PROJECT_NAME=\"${CMAKE_PROJECT_NAME}\"")

 spiffs_create_partition_image(storage ../spiffs FLASH_IN_PROJECT)
@@ -1,5 +1,9 @@
 ## IDF Component Manager Manifest File
 dependencies:
+  espressif/led_strip:
+    version: "~2.0.0"
+    rules:
+      - if: "idf_version >=5.0"
  chmorgan/esp-libhelix-mp3: "1.0.1"
  chmorgan/esp-file-iterator: "1.0.0"
  chmorgan/esp-audio-player: "1.0.2"