Merge pull request #304 from robszewczyk/bug/missing-802154-MAC-on-Nordic

Populate 802.15.4 MAC address on Nordic

Author: robszewczyk

src/adaptations/device-layer/include/Weave/DeviceLayer/OpenThread/GenericThreadStackManagerImpl_OpenThread.h

@@ -77,6 +77,7 @@ class GenericThreadStackManagerImpl_OpenThread
     WEAVE_ERROR _GetAndLogThreadStatsCounters(void);
     WEAVE_ERROR _GetAndLogThreadTopologyMinimal(void);
     WEAVE_ERROR _GetAndLogThreadTopologyFull(void);
+    WEAVE_ERROR _GetPrimary802154MACAddress(uint8_t *buf);
 
     // ===== Members available to the implementation subclass.
 

src/adaptations/device-layer/include/Weave/DeviceLayer/OpenThread/GenericThreadStackManagerImpl_OpenThread.ipp

@@ -806,6 +806,14 @@ exit:
     return err;
 }
 
+template<class ImplClass>
+WEAVE_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_GetPrimary802154MACAddress(uint8_t *buf)
+{
+    const otExtAddress *extendedAddr = otLinkGetExtendedAddress(mOTInst);
+    memcpy(buf, extendedAddr, sizeof(otExtAddress));
+    return WEAVE_NO_ERROR;
+};
+
 template<class ImplClass>
 WEAVE_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::DoInit(otInstance * otInst)
 {
@@ -871,7 +879,6 @@ bool GenericThreadStackManagerImpl_OpenThread<ImplClass>::IsThreadAttachedNoLock
     return (curRole != OT_DEVICE_ROLE_DISABLED && curRole != OT_DEVICE_ROLE_DETACHED);
 }
 
-
 } // namespace Internal
 } // namespace DeviceLayer
 } // namespace Weave

src/adaptations/device-layer/include/Weave/DeviceLayer/ThreadStackManager.h

@@ -66,6 +66,7 @@ class ThreadStackManager
     WEAVE_ERROR GetAndLogThreadStatsCounters(void);
     WEAVE_ERROR GetAndLogThreadTopologyMinimal(void);
     WEAVE_ERROR GetAndLogThreadTopologyFull(void);
+    WEAVE_ERROR GetPrimary802154MACAddress(uint8_t *buf);
 
 private:
 
@@ -75,6 +76,7 @@ class ThreadStackManager
     friend class ConfigurationManagerImpl;
     friend class Internal::DeviceControlServer;
     template<class> friend class Internal::GenericPlatformManagerImpl;
+    template<class> friend class Internal::GenericConfigurationManagerImpl;
     template<class> friend class Internal::GenericPlatformManagerImpl_FreeRTOS;
     template<class> friend class Internal::GenericConnectivityManagerImpl_Thread;
     template<class> friend class Internal::GenericThreadStackManagerImpl_OpenThread;
@@ -236,6 +238,11 @@ inline WEAVE_ERROR ThreadStackManager::GetAndLogThreadTopologyFull(void)
     return static_cast<ImplClass*>(this)->_GetAndLogThreadTopologyFull();
 }
 
+inline WEAVE_ERROR ThreadStackManager::GetPrimary802154MACAddress(uint8_t * buf)
+{
+    return static_cast<ImplClass*>(this)->_GetPrimary802154MACAddress(buf);
+}
+
 } // namespace DeviceLayer
 } // namespace Weave
 } // namespace nl

src/adaptations/device-layer/include/Weave/DeviceLayer/internal/GenericConfigurationManagerImpl.ipp

@@ -29,6 +29,9 @@
 #include <Weave/DeviceLayer/internal/GenericConfigurationManagerImpl.h>
 #include <BleLayer/WeaveBleServiceData.h>
 
+#if WEAVE_DEVICE_CONFIG_ENABLE_THREAD
+#include <Weave/DeviceLayer/ThreadStackManager.h>
+#endif
 
 namespace nl {
 namespace Weave {
@@ -195,7 +198,11 @@ WEAVE_ERROR GenericConfigurationManagerImpl<ImplClass>::_StorePrimaryWiFiMACAddr
 template<class ImplClass>
 WEAVE_ERROR GenericConfigurationManagerImpl<ImplClass>::_GetPrimary802154MACAddress(uint8_t * buf)
 {
+#if WEAVE_DEVICE_CONFIG_ENABLE_THREAD
+    return ThreadStackManager().GetPrimary802154MACAddress(buf);
+#else
     return WEAVE_DEVICE_ERROR_CONFIG_NOT_FOUND;
+#endif // WEAVE_DEVICE_CONFIG_ENABLE_THREAD
 }
 
 template<class ImplClass>