fix(openthread): Include Openthread guarding

espressif · Jun 20, 2024 · 3687c5f · 3687c5f
1 parent 739b77c
commit 3687c5f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/libraries/OpenThread/src/OThreadCLI.cpp b/libraries/OpenThread/src/OThreadCLI.cpp
@@ -1,5 +1,6 @@
 #include "OThreadCLI.h"
 #if SOC_IEEE802154_SUPPORTED
+#if CONFIG_OPENTHREAD_ENABLED
 
 #include "Arduino.h"
 #include "OThreadCLI.h"
@@ -422,4 +423,5 @@ void OpenThreadCLI::flush() {
 
 OpenThreadCLI OThreadCLI;
 
+#endif /* CONFIG_OPENTHREAD_ENABLED */
 #endif /* SOC_IEEE802154_SUPPORTED */
diff --git a/libraries/OpenThread/src/OThreadCLI.h b/libraries/OpenThread/src/OThreadCLI.h
@@ -1,16 +1,15 @@
 #pragma once
 #include "soc/soc_caps.h"
+#include "sdkconfig.h"
 #if SOC_IEEE802154_SUPPORTED
+#if CONFIG_OPENTHREAD_ENABLED
 
 #include "esp_openthread.h"
 #include "esp_openthread_cli.h"
 #include "esp_openthread_lock.h"
 #include "esp_openthread_netif_glue.h"
 #include "esp_openthread_types.h"
 
-#include "sdkconfig.h"
-#if CONFIG_OPENTHREAD_ENABLED
-
 #include "openthread/cli.h"
 #include "openthread/instance.h"
 #include "openthread/logging.h"
@@ -52,5 +51,6 @@ class OpenThreadCLI : public Stream {
 };
 
 extern OpenThreadCLI OThreadCLI;
+
 #endif /* CONFIG_OPENTHREAD_ENABLED */
 #endif /* SOC_IEEE802154_SUPPORTED */
diff --git a/libraries/OpenThread/src/OThreadCLI_Util.cpp b/libraries/OpenThread/src/OThreadCLI_Util.cpp
@@ -1,5 +1,7 @@
 #include "OThreadCLI.h"
 #if SOC_IEEE802154_SUPPORTED
+#if CONFIG_OPENTHREAD_ENABLED
+
 #include "OThreadCLI_Util.h"
 
 static const char *otRoleString[] = {
@@ -70,4 +72,6 @@ bool otExecCommand(const char *cmd, const char *arg, ot_cmd_return_t *returnCode
     return false;
   }
 }
+
+#endif /* CONFIG_OPENTHREAD_ENABLED */
 #endif /* SOC_IEEE802154_SUPPORTED */
diff --git a/libraries/OpenThread/src/OThreadCLI_Util.h b/libraries/OpenThread/src/OThreadCLI_Util.h
@@ -1,6 +1,8 @@
 #pragma once
 #include "soc/soc_caps.h"
+#include "sdkconfig.h"
 #if SOC_IEEE802154_SUPPORTED
+#if CONFIG_OPENTHREAD_ENABLED
 
 typedef enum {
   OT_ROLE_DISABLED = 0, ///< The Thread stack is disabled.
@@ -19,4 +21,5 @@ ot_device_role_t getOtDeviceRole();
 const char* getStringOtDeviceRole();
 bool otExecCommand(const char *cmd, const char *arg, ot_cmd_return_t *returnCode = NULL);
 
+#endif /* CONFIG_OPENTHREAD_ENABLED */
 #endif /* SOC_IEEE802154_SUPPORTED */