From bbb797e4cc74d04d369c52a7d75dee66ae97bc1f Mon Sep 17 00:00:00 2001
From: iranl <iranl@users.noreply.github.com>
Date: Sat, 17 May 2025 23:27:13 +0200
Subject: [PATCH] P4

---
 platformio.ini                      | 30 +++++++++++++++--------------
 src/idf_component.yml               |  3 +--
 updater/platformio.ini              | 16 ++++++++-------
 updater/sdkconfig.defaults.esp32-p4 |  3 ++-
 4 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 3bdb8aa..4ce70c0 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -145,18 +145,20 @@ board_build.cmake_extra_args =
 extends = env:esp32
 board_build.embed_txtfiles =
 board = esp32-p4
+board_build.cmake_extra_args =
+    -DSDKCONFIG_DEFAULTS="sdkconfig.defaults;sdkconfig.release.defaults;sdkconfig.defaults.esp32-p4"
 build_flags =
     ${env.build_flags}
     -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_NONE
     -DCONFIG_NIMBLE_CPP_LOG_LEVEL=0
     -DCONFIG_BT_NIMBLE_LOG_LEVEL=0
-    -DCONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM=7
-    -DCONFIG_ESP_WIFI_CACHE_TX_BUFFER_NUM=32
-    -DCONFIG_ESP_WIFI_TX_BUFFER_TYPE=0
-    -DCONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16
-    -DCONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=32
-    -DCONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUF=0
-    -DCONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
+    -DCONFIG_WIFI_RMT_ESPNOW_MAX_ENCRYPT_NUM=7
+    -DCONFIG_WIFI_RMT_CACHE_TX_BUFFER_NUM=32
+    -DCONFIG_WIFI_RMT_TX_BUFFER_TYPE=0
+    -DCONFIG_WIFI_RMT_STATIC_RX_BUFFER_NUM=16
+    -DCONFIG_WIFI_RMT_DYNAMIC_RX_BUFFER_NUM=32
+    -DCONFIG_WIFI_RMT_DYNAMIC_RX_MGMT_BUF=0
+    -DCONFIG_WIFI_RMT_SOFTAP_SUPPORT=y
 
 [env:esp32_dbg]
 extends = env:esp32
@@ -275,10 +277,10 @@ build_flags =
     -DCONFIG_NIMBLE_CPP_LOG_LEVEL=0
     -DCONFIG_BT_NIMBLE_LOG_LEVEL=0
     -DDEBUG_NUKIHUB
-    -DCONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM=7
-    -DCONFIG_ESP_WIFI_CACHE_TX_BUFFER_NUM=32
-    -DCONFIG_ESP_WIFI_TX_BUFFER_TYPE=0
-    -DCONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16
-    -DCONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=32
-    -DCONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUF=0
-    -DCONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
\ No newline at end of file
+    -DCONFIG_WIFI_RMT_ESPNOW_MAX_ENCRYPT_NUM=7
+    -DCONFIG_WIFI_RMT_CACHE_TX_BUFFER_NUM=32
+    -DCONFIG_WIFI_RMT_TX_BUFFER_TYPE=0
+    -DCONFIG_WIFI_RMT_STATIC_RX_BUFFER_NUM=16
+    -DCONFIG_WIFI_RMT_DYNAMIC_RX_BUFFER_NUM=32
+    -DCONFIG_WIFI_RMT_DYNAMIC_RX_MGMT_BUF=0
+    -DCONFIG_WIFI_RMT_SOFTAP_SUPPORT=y
\ No newline at end of file
diff --git a/src/idf_component.yml b/src/idf_component.yml
index 8551548..1a2fff3 100644
--- a/src/idf_component.yml
+++ b/src/idf_component.yml
@@ -4,7 +4,7 @@ dependencies:
 
   esp-nimble-cpp:
     git: https://github.com/h2zero/esp-nimble-cpp.git
-    version: da9450dbdb60b56bca15f431e137c912b11114bb
+    version: 39f974625c81882f1a4b0967f1beb0fe01e2b4ea
     
   espressif/libsodium: "^1.0.20~2"
 
@@ -12,7 +12,6 @@ dependencies:
     version: "*"
     rules:
       - if: "target in [esp32p4]"
-
   espressif/esp_wifi_remote:
     version: "*"
     rules:
diff --git a/updater/platformio.ini b/updater/platformio.ini
index ab1ab00..067a8d0 100644
--- a/updater/platformio.ini
+++ b/updater/platformio.ini
@@ -108,18 +108,20 @@ board_build.cmake_extra_args =
 extends = env:updater_esp32
 board_build.embed_txtfiles =
 board = esp32-p4
+board_build.cmake_extra_args =
+    -DSDKCONFIG_DEFAULTS="sdkconfig.defaults;sdkconfig.defaults.esp32-p4"
 build_flags =
     ${env.build_flags}
     -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_NONE
     -DCONFIG_NIMBLE_CPP_LOG_LEVEL=0
     -DCONFIG_BT_NIMBLE_LOG_LEVEL=0
-    -DCONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM=7
-    -DCONFIG_ESP_WIFI_CACHE_TX_BUFFER_NUM=32
-    -DCONFIG_ESP_WIFI_TX_BUFFER_TYPE=0
-    -DCONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16
-    -DCONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=32
-    -DCONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUF=0
-    -DCONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
+    -DCONFIG_WIFI_RMT_ESPNOW_MAX_ENCRYPT_NUM=7
+    -DCONFIG_WIFI_RMT_CACHE_TX_BUFFER_NUM=32
+    -DCONFIG_WIFI_RMT_TX_BUFFER_TYPE=0
+    -DCONFIG_WIFI_RMT_STATIC_RX_BUFFER_NUM=16
+    -DCONFIG_WIFI_RMT_DYNAMIC_RX_BUFFER_NUM=32
+    -DCONFIG_WIFI_RMT_DYNAMIC_RX_MGMT_BUF=0
+    -DCONFIG_WIFI_RMT_SOFTAP_SUPPORT=y
 
 [env:updater_esp32-h2]
 extends = env:updater_esp32
diff --git a/updater/sdkconfig.defaults.esp32-p4 b/updater/sdkconfig.defaults.esp32-p4
index b8c91d6..ddc46cb 100644
--- a/updater/sdkconfig.defaults.esp32-p4
+++ b/updater/sdkconfig.defaults.esp32-p4
@@ -26,4 +26,5 @@ CONFIG_ESP_WIFI_CACHE_TX_BUFFER_NUM=32
 CONFIG_ESP_WIFI_TX_BUFFER_TYPE=0
 CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16
 CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=32
-CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUF=0
\ No newline at end of file
+CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUF=0
+CONFIG_SLAVE_IDF_TARGET_ESP32C6=y
\ No newline at end of file