From ce531681c6b75d52fdb40a9436bc5b30fc78676e Mon Sep 17 00:00:00 2001
From: wyhong <30567533+wy-hh@users.noreply.github.com>
Date: Sat, 15 Apr 2023 01:35:06 +0800
Subject: [PATCH] [Bouffalolab] Disable strict_warnings for pigweed enabled and
 fix to get Wi-Fi BSSID (#26099)

* disable strict warnings compile options for pigweed enabled and fix to get wifi bssid

* Fix restyle
---
 examples/lighting-app/bouffalolab/bl602/with_pw_rpc.gni    | 7 ++++++-
 examples/lighting-app/bouffalolab/bl702/with_pw_rpc.gni    | 7 ++++++-
 .../bouffalolab/BL602/DiagnosticDataProviderImpl.cpp       | 4 +---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/examples/lighting-app/bouffalolab/bl602/with_pw_rpc.gni b/examples/lighting-app/bouffalolab/bl602/with_pw_rpc.gni
index 9498d4ed99dcdc..ae2a86be69f00f 100644
--- a/examples/lighting-app/bouffalolab/bl602/with_pw_rpc.gni
+++ b/examples/lighting-app/bouffalolab/bl602/with_pw_rpc.gni
@@ -24,4 +24,9 @@ chip_enable_pw_rpc = true
 chip_build_pw_trace_lib = false
 
 cpp_standard = "gnu++17"
-#pw_trace_BACKEND = "$dir_pw_trace_tokenized"
+
+# pigweed updated to a1bd248 makes compile conversion errors;
+# it seems riscv gcc (version > 10) can fixes this issue.
+# let's disable strict warnings for RPC enabled for now.
+remove_default_configs = [ "$dir_pw_build:strict_warnings" ]
+treat_warnings_as_errors = false
diff --git a/examples/lighting-app/bouffalolab/bl702/with_pw_rpc.gni b/examples/lighting-app/bouffalolab/bl702/with_pw_rpc.gni
index 2739fee2b22f35..72cbc4e25122b6 100644
--- a/examples/lighting-app/bouffalolab/bl702/with_pw_rpc.gni
+++ b/examples/lighting-app/bouffalolab/bl702/with_pw_rpc.gni
@@ -24,4 +24,9 @@ chip_enable_pw_rpc = true
 chip_build_pw_trace_lib = false
 
 cpp_standard = "gnu++17"
-#pw_trace_BACKEND = "$dir_pw_trace_tokenized"
+
+# pigweed updated to a1bd248 makes compile conversion errors;
+# it seems riscv gcc (version > 10) can fixes this issue.
+# let's disable strict warnings for RPC enabled for now.
+remove_default_configs = [ "$dir_pw_build:strict_warnings" ]
+treat_warnings_as_errors = false
diff --git a/src/platform/bouffalolab/BL602/DiagnosticDataProviderImpl.cpp b/src/platform/bouffalolab/BL602/DiagnosticDataProviderImpl.cpp
index c52788334f90af..7cb3b802dd8036 100644
--- a/src/platform/bouffalolab/BL602/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/bouffalolab/BL602/DiagnosticDataProviderImpl.cpp
@@ -221,9 +221,7 @@ DiagnosticDataProvider & GetDiagnosticDataProviderImpl()
 
 CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiBssId(MutableByteSpan & BssId)
 {
-    static uint8_t macAddress[kMaxHardwareAddrSize];
-
-    memcpy(macAddress, wifiMgmr.wifi_mgmr_stat_info.bssid, kMaxHardwareAddrSize);
+    BssId = ByteSpan(wifiMgmr.wifi_mgmr_stat_info.bssid, sizeof(wifiMgmr.wifi_mgmr_stat_info.bssid));
 
     // TODO: This does not actually put the data in the out param.
     return CHIP_ERROR_READ_FAILED;