Skip to content

Commit ead75b9

Browse files
andy31415andy31415
authored
Merge branch 'master' into add_chef_rootnode_fan
2 parents 0c22a0a + d668dc2 commit ead75b9

File tree

75 files changed

+1521
-304
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+1521
-304
lines changed

‎.github/workflows/tests.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,7 @@ jobs:
285285
scripts/run_in_build_env.sh './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace_decode 1" --script "src/python_testing/TC_RR_1_1.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021"'
286286
scripts/run_in_build_env.sh './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace_decode 1" --script "src/python_testing/TC_SC_3_6.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021"'
287287
scripts/run_in_build_env.sh './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace_decode 1" --script "src/python_testing/TC_DA_1_7.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --bool-arg allow_sdk_dac:true"'
288+
scripts/run_in_build_env.sh './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace_decode 1 --enable-key 000102030405060708090a0b0c0d0e0f" --script "src/python_testing/TC_TestEventTrigger.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --bool-arg allow_sdk_dac:true"'
288289
- name: Uploading core files
289290
uses: actions/upload-artifact@v2
290291
if: ${{ failure() && !env.ACT }}

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

+2
Original file line numberDiff line numberDiff line change
@@ -3708,6 +3708,7 @@ server cluster TestCluster = 4294048773 {
37083708
attribute nullable int8s nullableRangeRestrictedInt8s = 16423;
37093709
attribute nullable int16u nullableRangeRestrictedInt16u = 16424;
37103710
attribute nullable int16s nullableRangeRestrictedInt16s = 16425;
3711+
attribute int8u writeOnlyInt8u = 16426;
37113712
readonly attribute bitmap32 featureMap = 65532;
37123713
readonly attribute int16u clusterRevision = 65533;
37133714

@@ -4772,6 +4773,7 @@ endpoint 1 {
47724773
ram attribute nullableRangeRestrictedInt8s default = -20;
47734774
ram attribute nullableRangeRestrictedInt16u default = 200;
47744775
ram attribute nullableRangeRestrictedInt16s default = -100;
4776+
callback attribute writeOnlyInt8u;
47754777
ram attribute featureMap;
47764778
ram attribute clusterRevision default = 1;
47774779
}

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.zap

+18-1
Original file line numberDiff line numberDiff line change
@@ -20700,6 +20700,22 @@
2070020700
"maxInterval": 65534,
2070120701
"reportableChange": 0
2070220702
},
20703+
{
20704+
"name": "write_only_int8u",
20705+
"code": 16426,
20706+
"mfgCode": null,
20707+
"side": "server",
20708+
"type": "int8u",
20709+
"included": 1,
20710+
"storageOption": "External",
20711+
"singleton": 0,
20712+
"bounded": 0,
20713+
"defaultValue": "0",
20714+
"reportable": 1,
20715+
"minInterval": 1,
20716+
"maxInterval": 65534,
20717+
"reportableChange": 0
20718+
},
2070320719
{
2070420720
"name": "AttributeList",
2070520721
"code": 65531,
@@ -24724,5 +24740,6 @@
2472424740
"endpointVersion": 1,
2472524741
"deviceIdentifier": 61442
2472624742
}
24727-
]
24743+
],
24744+
"log": []
2472824745
}

‎examples/all-clusters-app/ameba/chip_main.cmake

+4
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,9 @@ list(
163163
${chip_dir}/examples/all-clusters-app/ameba/main/LEDWidget.cpp
164164
${chip_dir}/examples/all-clusters-app/ameba/main/DsoHack.cpp
165165

166+
${chip_dir}/examples/platform/ameba/route_hook/ameba_route_hook.c
167+
${chip_dir}/examples/platform/ameba/route_hook/ameba_route_table.c
168+
166169
${chip_dir}/examples/providers/DeviceInfoProviderImpl.cpp
167170
)
168171

@@ -204,6 +207,7 @@ target_include_directories(
204207
${chip_dir}/examples/all-clusters-app/all-clusters-common/include
205208
${chip_dir}/examples/all-clusters-app/ameba/main/include
206209
${chip_dir}/examples/platform/ameba
210+
${chip_dir}/examples/platform/ameba/route_hook
207211
${chip_dir}/examples/providers
208212
${chip_dir_output}/gen/include
209213
${chip_dir}/src/include/

‎examples/all-clusters-app/ameba/main/DeviceCallbacks.cpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
* Implements all the callbacks to the application from the CHIP Stack
2323
*
2424
**/
25-
#include "DeviceCallbacks.h"
2625

26+
#include "DeviceCallbacks.h"
2727
#include "CHIPDeviceManager.h"
2828
#include <app-common/zap-generated/attribute-id.h>
2929
#include <app-common/zap-generated/cluster-id.h>
@@ -33,6 +33,7 @@
3333
#include <app/util/basic-types.h>
3434
#include <app/util/util.h>
3535
#include <lib/dnssd/Advertiser.h>
36+
#include <route_hook/ameba_route_hook.h>
3637
#include <support/CodeUtils.h>
3738
#include <support/logging/CHIPLogging.h>
3839
#include <support/logging/Constants.h>
@@ -121,6 +122,9 @@ void DeviceCallbacks::OnInternetConnectivityChange(const ChipDeviceEvent * event
121122
{
122123
ChipLogProgress(DeviceLayer, "IPv6 Server ready...");
123124
chip::app::DnssdServer::Instance().StartServer();
125+
126+
ChipLogProgress(DeviceLayer, "Initializing route hook...");
127+
ameba_route_hook_init();
124128
#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
125129
// Init OTA requestor only when we have gotten IPv6 address
126130
if (!isOTAInitialized)

‎examples/all-clusters-app/cc13x2x7_26x2x7/chip.syscfg

-2
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,6 @@ ble.connUpdateParamsPeripheral.reqMaxConnInt = 50;
152152

153153
ble.advSet1.$name = "ti_ble5stack_broadcaster_advertisement_set0";
154154
ble.advSet1.advParam1.$name = "ti_ble5stack_broadcaster_advertisement_params0";
155-
ble.advSet1.advParam1.primIntMin = 100;
156-
ble.advSet1.advParam1.primIntMax = 200;
157155

158156
/* DMM */
159157
dmm.project = "ti_thread_thermostat_remote_display";

‎examples/all-clusters-minimal-app/cc13x2x7_26x2x7/chip.syscfg

-2
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,6 @@ ble.connUpdateParamsPeripheral.reqMaxConnInt = 50;
152152

153153
ble.advSet1.$name = "ti_ble5stack_broadcaster_advertisement_set0";
154154
ble.advSet1.advParam1.$name = "ti_ble5stack_broadcaster_advertisement_params0";
155-
ble.advSet1.advParam1.primIntMin = 100;
156-
ble.advSet1.advParam1.primIntMax = 200;
157155

158156
/* DMM */
159157
dmm.project = "ti_thread_thermostat_remote_display";

‎examples/darwin-framework-tool/commands/tests/TestCommandBridge.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ constexpr const char * kDefaultKey = "default";
4848
@property chip::NodeId deviceId;
4949
@property BOOL active; // Whether to pass on notifications to the commandBridge
5050

51-
- (void)onStatusUpdate:(MTRCommissioningStatus)status;
52-
- (void)onCommissioningSessionEstablishmentDone:(NSError * _Nullable)error;
53-
- (void)onCommissioningComplete:(NSError * _Nullable)error;
51+
- (void)controller:(MTRDeviceController *)controller statusUpdate:(MTRCommissioningStatus)status;
52+
- (void)controller:(MTRDeviceController *)controller commissioningSessionEstablishmentDone:(NSError * _Nullable)error;
53+
- (void)controller:(MTRDeviceController *)controller commissioningComplete:(NSError * _Nullable)error;
5454

5555
- (instancetype)init NS_UNAVAILABLE;
5656
- (instancetype)initWithTestCommandBridge:(TestCommandBridge *)commandBridge;
@@ -529,7 +529,7 @@ class TestCommandBridge : public CHIPCommandBridge,
529529
NS_ASSUME_NONNULL_BEGIN
530530

531531
@implementation TestDeviceControllerDelegate
532-
- (void)onStatusUpdate:(MTRCommissioningStatus)status
532+
- (void)controller:(MTRDeviceController *)controller statusUpdate:(MTRCommissioningStatus)status
533533
{
534534
if (_active) {
535535
if (status == MTRCommissioningStatusSuccess) {
@@ -542,7 +542,7 @@ NS_ASSUME_NONNULL_BEGIN
542542
}
543543
}
544544

545-
- (void)onCommissioningSessionEstablishmentDone:(NSError * _Nullable)error
545+
- (void)controller:(MTRDeviceController *)controller commissioningSessionEstablishmentDone:(NSError * _Nullable)error
546546
{
547547
if (_active) {
548548
if (error != nil) {
@@ -556,7 +556,7 @@ NS_ASSUME_NONNULL_BEGIN
556556
}
557557
}
558558

559-
- (void)onCommissioningComplete:(NSError * _Nullable)error
559+
- (void)controller:(MTRDeviceController *)controller commissioningComplete:(NSError * _Nullable)error
560560
{
561561
if (_active) {
562562
_active = NO;

‎examples/light-switch-app/nrfconnect/main/BindingHandler.cpp

+3-12
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,13 @@ void BindingHandler::Init()
3535
DeviceLayer::PlatformMgr().ScheduleWork(InitInternal);
3636
}
3737

38-
void BindingHandler::OnInvokeCommandFailure(DeviceProxy * aDevice, BindingData & aBindingData, CHIP_ERROR aError)
38+
void BindingHandler::OnInvokeCommandFailure(BindingData & aBindingData, CHIP_ERROR aError)
3939
{
4040
CHIP_ERROR error;
4141

4242
if (aError == CHIP_ERROR_TIMEOUT && !BindingHandler::GetInstance().mCaseSessionRecovered)
4343
{
4444
LOG_INF("Response timeout for invoked command, trying to recover CASE session.");
45-
if (!aDevice)
46-
return;
47-
48-
// Release current CASE session.
49-
aDevice->Disconnect();
5045

5146
// Set flag to not try recover session multiple times.
5247
BindingHandler::GetInstance().mCaseSessionRecovered = true;
@@ -85,9 +80,7 @@ void BindingHandler::OnOffProcessCommand(CommandId aCommandId, const EmberBindin
8580
BindingHandler::GetInstance().mCaseSessionRecovered = false;
8681
};
8782

88-
auto onFailure = [aDevice, dataRef = *data](CHIP_ERROR aError) mutable {
89-
BindingHandler::OnInvokeCommandFailure(aDevice, dataRef, aError);
90-
};
83+
auto onFailure = [dataRef = *data](CHIP_ERROR aError) mutable { BindingHandler::OnInvokeCommandFailure(dataRef, aError); };
9184

9285
if (aDevice)
9386
{
@@ -162,9 +155,7 @@ void BindingHandler::LevelControlProcessCommand(CommandId aCommandId, const Embe
162155
BindingHandler::GetInstance().mCaseSessionRecovered = false;
163156
};
164157

165-
auto onFailure = [aDevice, dataRef = *data](CHIP_ERROR aError) mutable {
166-
BindingHandler::OnInvokeCommandFailure(aDevice, dataRef, aError);
167-
};
158+
auto onFailure = [dataRef = *data](CHIP_ERROR aError) mutable { BindingHandler::OnInvokeCommandFailure(dataRef, aError); };
168159

169160
CHIP_ERROR ret = CHIP_NO_ERROR;
170161

‎examples/light-switch-app/nrfconnect/main/include/BindingHandler.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class BindingHandler
4242
bool IsGroupBound();
4343

4444
static void SwitchWorkerHandler(intptr_t);
45-
static void OnInvokeCommandFailure(chip::DeviceProxy * aDevice, BindingData & aBindingData, CHIP_ERROR aError);
45+
static void OnInvokeCommandFailure(BindingData & aBindingData, CHIP_ERROR aError);
4646

4747
static BindingHandler & GetInstance()
4848
{

‎examples/lighting-app/bouffalolab/bl602/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ The steps in this document were validated on Ubuntu 18.04 and 20.04.
6666
```
6767
cd third_party/bouffalolab/repo/tools/flash_tool
6868
69-
./bflb_iot_tool-ubuntu18 --chipname=BL602 --baudrate=115200 --port=/dev/ttyACM0 --pt=chips/bl602/partition/partition_cfg_4M.toml --dts=chips/bl602/device_tree/bl_factory_params_IoTKitA_40M.dts --firmware=../../../../../../out/bl602-light/chip-bl602-lighting-example.bin
69+
./bflb_iot_tool --chipname=BL602 --baudrate=115200 --port=/dev/ttyACM0 --pt=chips/bl602/partition/partition_cfg_4M.toml --dts=chips/bl602/device_tree/bl_factory_params_IoTKitA_40M.dts --firmware=../../../../../out/bl602-light/chip-bl602-lighting-example.bin
7070
```
7171
7272
```

‎examples/lighting-app/bouffalolab/bl602/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
#define FACTORY_RESET_TRIGGER_TIMEOUT 3000
5656
#define FACTORY_RESET_CANCEL_WINDOW_TIMEOUT 3000
5757
#define APP_EVENT_QUEUE_SIZE 10
58-
#define APP_TASK_STACK_SIZE (8192)
58+
#define APP_TASK_STACK_SIZE (4096)
5959
#define APP_TASK_PRIORITY 2
6060
#define STATUS_LED_GPIO_NUM GPIO_NUM_2 // Use LED1 (blue LED) as status LED on DevKitC
6161

‎examples/lock-app/cc13x2x7_26x2x7/chip.syscfg

-2
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,6 @@ ble.connUpdateParamsPeripheral.reqMaxConnInt = 50;
152152

153153
ble.advSet1.$name = "ti_ble5stack_broadcaster_advertisement_set0";
154154
ble.advSet1.advParam1.$name = "ti_ble5stack_broadcaster_advertisement_params0";
155-
ble.advSet1.advParam1.primIntMin = 100;
156-
ble.advSet1.advParam1.primIntMax = 200;
157155

158156
/* DMM */
159157
dmm.project = "ti_thread_thermostat_remote_display";

0 commit comments

Comments
 (0)