Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Bouffalolab] Refact BL602 & BL702 platform code #27186

Merged
merged 11 commits into from
Jun 12, 2023
Merged

[Bouffalolab] Refact BL602 & BL702 platform code #27186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ed5a093
refact platform code
wy-hh Apr 26, 2023
e455cbd
use common ConnectivityManagerImpl.cpp
wy-hh Apr 27, 2023
87b1cb7
Merge remote-tracking branch 'official/master' into refact-platform
wy-hh Jun 8, 2023
bad8ab4
fix compile error after merged
wy-hh Jun 8, 2023
c38e60e
update readme
wy-hh Jun 8, 2023
95f3b7b
fix overflow issue
wy-hh Jun 8, 2023
3cd87f0
add common PlatformManagerImpl.cpp
wy-hh Jun 9, 2023
7b44afd
Merge remote-tracking branch 'official/master' into refact-platform
wy-hh Jun 9, 2023
59b5764
Merge remote-tracking branch 'official/master' into refact-platform
wy-hh Jun 9, 2023
3177ece
Merge remote-tracking branch 'official/master' into refact-platform
wy-hh Jun 10, 2023
7d5bfc3
fix restyle
wy-hh Jun 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/lighting-app/bouffalolab/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ ota-provider-app build and usage.
- BLE commission BL602/BL702 lighting if not commissioned.
- Start OTA software upgrade process
```shell
./chip-tool otasoftwareupdaterequestor announce-ota-provider 1 0 0 0 <node_id_to_lighting_app> 0
./chip-tool otasoftwareupdaterequestor announce-otaprovider 1 0 0 0 <node_id_to_lighting_app> 0
```
where `<node_id_to_lighting_app>` is node id of BL602/BL702 lighting app.
- After OTA software upgrade gets done, BL602/BL702 will get reboot
Expand Down
5 changes: 5 additions & 0 deletions examples/lighting-app/bouffalolab/bl702/args.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,8 @@ lwip_platform = "bl702"

chip_enable_ota_requestor = true
chip_detail_logging = false

pw_build_LINK_DEPS = [
"$dir_pw_assert:impl",
"$dir_pw_log:impl",
]
2 changes: 1 addition & 1 deletion examples/lighting-app/bouffalolab/common/AppTask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
#endif

#if CHIP_ENABLE_OPENTHREAD
#include <ThreadStackManagerImpl.h>
#include <platform/OpenThread/OpenThreadUtils.h>
#include <platform/ThreadStackManager.h>
#include <platform/bouffalolab/common/ThreadStackManagerImpl.h>
#include <utils_list.h>
#endif

Expand Down
1 change: 1 addition & 0 deletions examples/platform/bouffalolab/common/plat/OTAConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include "OTAConfig.h"
#include <app/server/Server.h>

#include <platform/bouffalolab/common/OTAImageProcessorImpl.h>
// Global OTA objects
chip::DefaultOTARequestor gRequestorCore;
chip::DefaultOTARequestorStorage gRequestorStorage;
Expand Down
1 change: 0 additions & 1 deletion examples/platform/bouffalolab/common/plat/OTAConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include <app/clusters/ota-requestor/DefaultOTARequestor.h>
#include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
#include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
#include <platform/bouffalolab/BL702/OTAImageProcessorImpl.h>

class OTAConfig
{
Expand Down
4 changes: 2 additions & 2 deletions examples/platform/bouffalolab/common/plat/platform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@
#include <app/clusters/network-commissioning/network-commissioning.h>
#include <route_hook/bl_route_hook.h>
#endif
#include <PlatformManagerImpl.h>
#include <platform/bouffalolab/common/PlatformManagerImpl.h>

#if HEAP_MONITORING
#include <MemMonitoring.h>
#include <lib/support/CHIPMem.h>
#endif

#if CHIP_ENABLE_OPENTHREAD
#include <ThreadStackManagerImpl.h>
#include <platform/OpenThread/OpenThreadUtils.h>
#include <platform/ThreadStackManager.h>
#include <platform/bouffalolab/common/ThreadStackManagerImpl.h>
#include <utils_list.h>
#endif

Expand Down
4 changes: 2 additions & 2 deletions src/platform/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,13 +229,13 @@ if (chip_device_platform != "none" && chip_device_platform != "external") {
} else if (chip_device_platform == "bl602") {
defines += [
"CHIP_DEVICE_LAYER_TARGET_BL602=1",
"CHIP_DEVICE_LAYER_TARGET=bouffalolab/BL602",
"CHIP_DEVICE_LAYER_TARGET=bouffalolab/common",
"CHIP_DEVICE_CONFIG_ENABLE_WIFI=${chip_enable_wifi}",
]
} else if (chip_device_platform == "bl702") {
defines += [
"CHIP_DEVICE_LAYER_TARGET_BL702=1",
"CHIP_DEVICE_LAYER_TARGET=bouffalolab/BL702",
"CHIP_DEVICE_LAYER_TARGET=bouffalolab/common",
"CHIP_DEVICE_CONFIG_ENABLE_WIFI=${chip_enable_wifi}",
]
} else if (chip_device_platform == "fake") {
Expand Down
Loading