From 9c8b5ee9334380f971562b437efff7c5f91e3103 Mon Sep 17 00:00:00 2001
From: Tomasz Duda <tomaszduda23@gmail.com>
Date: Thu, 9 May 2024 21:42:09 +0200
Subject: [PATCH] move debug setting to another component

---
 esphome/components/nrf52/__init__.py        |  9 ++++++++-
 esphome/components/zephyr/__init__.py       | 19 -------------------
 esphome/components/zephyr_debug/__init__.py | 16 ++++++++++++++++
 tests/test12.2.yaml                         |  2 ++
 tests/test12.3.yaml                         |  2 ++
 5 files changed, 28 insertions(+), 20 deletions(-)
 create mode 100644 esphome/components/zephyr_debug/__init__.py

diff --git a/esphome/components/nrf52/__init__.py b/esphome/components/nrf52/__init__.py
index 16c41098df..6a8e7bc6ed 100644
--- a/esphome/components/nrf52/__init__.py
+++ b/esphome/components/nrf52/__init__.py
@@ -85,9 +85,16 @@ async def to_code(config):
     cg.add_build_flag("-DUSE_NRF52")
     cg.add_define("ESPHOME_BOARD", config[CONF_BOARD])
     cg.add_define("ESPHOME_VARIANT", "NRF52")
-    conf = {"platform_version": "platformio/nordicnrf52@10.3.0"}
+    conf = {CONF_PLATFORM_VERSION: "platformio/nordicnrf52@10.3.0"}
     cg.add_platformio_option(CONF_FRAMEWORK, CORE.data[KEY_CORE][KEY_TARGET_FRAMEWORK])
     cg.add_platformio_option("platform", conf[CONF_PLATFORM_VERSION])
+    cg.add_platformio_option(
+        "platform_packages",
+        [
+            "platformio/framework-zephyr@https://github.com/tomaszduda23/framework-sdk-nrf",
+            "platformio/toolchain-gccarmnoneeabi@https://github.com/tomaszduda23/toolchain-sdk-ng",
+        ],
+    )
 
     if config[KEY_BOOTLOADER] == BOOTLOADER_ADAFRUIT:
         # make sure that firmware.zip is created
diff --git a/esphome/components/zephyr/__init__.py b/esphome/components/zephyr/__init__.py
index c9c45573bf..2cd59e4bbb 100644
--- a/esphome/components/zephyr/__init__.py
+++ b/esphome/components/zephyr/__init__.py
@@ -77,13 +77,6 @@ def add_extra_script(stage: str, filename: str, path: str):
 def zephyr_to_code(conf):
     cg.add(zephyr_ns.setup_preferences())
     cg.add_build_flag("-DUSE_ZEPHYR")
-    cg.add_platformio_option(
-        "platform_packages",
-        [
-            "platformio/framework-zephyr@https://github.com/tomaszduda23/framework-sdk-nrf",
-            "platformio/toolchain-gccarmnoneeabi@https://github.com/tomaszduda23/toolchain-sdk-ng",
-        ],
-    )
     # build is done by west so bypass board checking in platformio
     cg.add_platformio_option("boards_dir", CORE.relative_build_path("boards"))
 
@@ -105,18 +98,6 @@ def zephyr_to_code(conf):
     zephyr_add_prj_conf("UART_CONSOLE", False)
     # TODO disable when no OTA USB CDC
     # zephyr_add_prj_conf("CONSOLE", False)
-    # TODO debug only
-    zephyr_add_prj_conf("DEBUG_THREAD_INFO", True)
-    # zephyr_add_prj_conf("DEBUG", True)
-    ###
-    zephyr_add_prj_conf("USE_SEGGER_RTT", True)
-    zephyr_add_prj_conf("RTT_CONSOLE", True)
-    zephyr_add_prj_conf("LOG", True)
-    zephyr_add_prj_conf("LOG_BLOCK_IN_THREAD", True)
-    zephyr_add_prj_conf("LOG_BUFFER_SIZE", 4096)
-    zephyr_add_prj_conf("SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL", True)
-
-    zephyr_add_prj_conf("USB_CDC_ACM_LOG_LEVEL_WRN", True)
 
     add_extra_script(
         "pre",
diff --git a/esphome/components/zephyr_debug/__init__.py b/esphome/components/zephyr_debug/__init__.py
new file mode 100644
index 0000000000..9c12e5378a
--- /dev/null
+++ b/esphome/components/zephyr_debug/__init__.py
@@ -0,0 +1,16 @@
+import esphome.config_validation as cv
+from esphome.components.zephyr import zephyr_add_prj_conf
+
+CONFIG_SCHEMA = cv.Schema({})
+
+
+async def to_code(config):
+    # gdb thread support
+    zephyr_add_prj_conf("DEBUG_THREAD_INFO", True)
+    # RTT
+    zephyr_add_prj_conf("USE_SEGGER_RTT", True)
+    zephyr_add_prj_conf("RTT_CONSOLE", True)
+    zephyr_add_prj_conf("LOG", True)
+    zephyr_add_prj_conf("LOG_BLOCK_IN_THREAD", True)
+    zephyr_add_prj_conf("LOG_BUFFER_SIZE", 4096)
+    zephyr_add_prj_conf("SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL", True)
diff --git a/tests/test12.2.yaml b/tests/test12.2.yaml
index 8efcb1e0a0..3313e5d1cb 100644
--- a/tests/test12.2.yaml
+++ b/tests/test12.2.yaml
@@ -74,3 +74,5 @@ zephyr_ble_server:
 
 zephyr_ble_nus:
   log: true
+
+zephyr_debug:
diff --git a/tests/test12.3.yaml b/tests/test12.3.yaml
index 311717a98e..33a32526c3 100644
--- a/tests/test12.3.yaml
+++ b/tests/test12.3.yaml
@@ -40,3 +40,5 @@ zephyr_ble_server:
 
 zephyr_ble_nus:
   log: true
+
+zephyr_debug: