Skip to content

Commit

Permalink
fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
DejinChen committed Sep 9, 2024
2 parents b6819ca + 7249c56 commit 75df75b
Show file tree
Hide file tree
Showing 56 changed files with 880 additions and 899 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2554,7 +2554,7 @@ cluster TimeSynchronization = 56 {
Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
cluster Switch = 59 {
revision 1;
revision 2;

bitmap Feature : bitmap32 {
kLatchingSwitch = 0x1;
Expand Down
2 changes: 1 addition & 1 deletion examples/all-clusters-app/linux/ValveControlDelegate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ DataModel::Nullable<chip::Percent> ValveControlDelegate::HandleOpenValve(DataMod
sLastOpenDuration = 0;
ChipLogProgress(NotSpecified, "Valve opening from level: %d to %d", currentLevel, sLevel);

// In this demo application, the trasition is considered instant,
// In this demo application, the transition is considered instant,
// so current level is set to the requested level and current state is set to kOpen.
currentLevel = sLevel;
Attributes::CurrentState::Set(kValveEndpoint, ValveConfigurationAndControl::ValveStateEnum::kOpen);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2286,7 +2286,7 @@ cluster EthernetNetworkDiagnostics = 55 {
Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
cluster Switch = 59 {
revision 1;
revision 2;

bitmap Feature : bitmap32 {
kLatchingSwitch = 0x1;
Expand Down
2 changes: 1 addition & 1 deletion examples/bridge-app/bridge-common/bridge-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1921,7 +1921,7 @@ cluster EthernetNetworkDiagnostics = 55 {
Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
cluster Switch = 59 {
revision 1;
revision 2;

bitmap Feature : bitmap32 {
kLatchingSwitch = 0x1;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1251,7 +1251,7 @@ cluster GeneralDiagnostics = 51 {
Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
cluster Switch = 59 {
revision 1;
revision 2;

bitmap Feature : bitmap32 {
kLatchingSwitch = 0x1;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1251,7 +1251,7 @@ cluster GeneralDiagnostics = 51 {
Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
cluster Switch = 59 {
revision 1;
revision 2;

bitmap Feature : bitmap32 {
kLatchingSwitch = 0x1;
Expand Down
7 changes: 1 addition & 6 deletions examples/contact-sensor-app/linux/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,6 @@ details.

## Running the Complete Example on Raspberry Pi 4

> If you want to test Echo protocol, please enable Echo handler
>
> gn gen out/debug --args='chip_app_use_echo=true'
> ninja -C out/debug
- Prerequisites

1. A Raspberry Pi 4 board
Expand Down Expand Up @@ -112,7 +107,7 @@ details.
$ cd ~/connectedhomeip/examples/contact-sensor-app/linux
$ sudo out/debug/chip-contact-sensor-app --ble-device [bluetooth device number]
# In this example, the device we want to use is hci1
$ sudo out/debug/chip-contact-sensor-app --ble-device 1
$ sudo out/debug/contact-sensor-app --ble-device 1

- Test the device using ChipDeviceController on your laptop /
workstation etc.
Expand Down
18 changes: 9 additions & 9 deletions examples/fabric-admin/commands/pairing/PairingCommand.h
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ class PairingCommand : public CHIPCommand,
const PairingNetworkType mNetworkType;
const chip::Dnssd::DiscoveryFilterType mFilterType;
Command::AddressWithInterface mRemoteAddr;
NodeId mNodeId;
NodeId mNodeId = chip::kUndefinedNodeId;
chip::Optional<uint16_t> mTimeout;
chip::Optional<bool> mDiscoverOnce;
chip::Optional<bool> mUseOnlyOnNetworkDiscovery;
Expand All @@ -272,18 +272,18 @@ class PairingCommand : public CHIPCommand,
TypedComplexArgument<chip::app::DataModel::List<chip::app::Clusters::TimeSynchronization::Structs::DSTOffsetStruct::Type>>
mComplex_DSTOffsets;

uint16_t mRemotePort;
uint16_t mDiscriminator;
uint32_t mSetupPINCode;
uint16_t mIndex;
uint16_t mRemotePort = 0;
uint16_t mDiscriminator = 0;
uint32_t mSetupPINCode = 0;
uint16_t mIndex = 0;
chip::ByteSpan mOperationalDataset;
chip::ByteSpan mSSID;
chip::ByteSpan mPassword;
char * mOnboardingPayload;
uint64_t mDiscoveryFilterCode;
char * mDiscoveryFilterInstanceName;
char * mOnboardingPayload = nullptr;
uint64_t mDiscoveryFilterCode = 0;
char * mDiscoveryFilterInstanceName = nullptr;

bool mDeviceIsICD;
bool mDeviceIsICD = false;
uint8_t mRandomGeneratedICDSymmetricKey[chip::Crypto::kAES_CCM128_Key_Length];

// For unpair
Expand Down
2 changes: 2 additions & 0 deletions examples/fabric-admin/scripts/run_fabric_sync.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ DEFAULT_BRIDGE_CHOICES=(
"./fabric-bridge-app"
"out/debug/standalone/fabric-bridge-app"
"out/linux-x64-fabric-bridge-rpc/fabric-bridge-app"
"out/linux-x64-fabric-bridge-rpc-no-ble/fabric-bridge-app"
"out/darwin-arm64-fabric-bridge-rpc/fabric-bridge-app"
"out/darwin-arm64-fabric-bridge-rpc-no-ble/fabric-bridge-app"
)
FABRIC_ADMIN_LOG="/tmp/fabric_admin.log"
FABRIC_BRIDGE_APP_LOG="/tmp/fabric_bridge_app.log"
Expand Down
2 changes: 1 addition & 1 deletion examples/fabric-bridge-app/linux/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ defined:

```
source scripts/activate.sh
./scripts/build/build_examples.py --target linux-x64-fabric-bridge-rpc build
./scripts/build/build_examples.py --target linux-x64-fabric-bridge-rpc-no-ble build
```

### For Raspberry Pi 4 example:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1897,7 +1897,7 @@ cluster TimeSynchronization = 56 {
Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
cluster Switch = 59 {
revision 1;
revision 2;

bitmap Feature : bitmap32 {
kLatchingSwitch = 0x1;
Expand Down
2 changes: 1 addition & 1 deletion examples/light-switch-app/qpg/zap/switch.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1953,7 +1953,7 @@ cluster ThreadNetworkDiagnostics = 53 {
Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
cluster Switch = 59 {
revision 1;
revision 2;

bitmap Feature : bitmap32 {
kLatchingSwitch = 0x1;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1803,7 +1803,7 @@ cluster EthernetNetworkDiagnostics = 55 {
Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
cluster Switch = 59 {
revision 1;
revision 2;

bitmap Feature : bitmap32 {
kLatchingSwitch = 0x1;
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/lighting-common/lighting-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1803,7 +1803,7 @@ cluster EthernetNetworkDiagnostics = 55 {
Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
cluster Switch = 59 {
revision 1;
revision 2;

bitmap Feature : bitmap32 {
kLatchingSwitch = 0x1;
Expand Down
4 changes: 2 additions & 2 deletions examples/placeholder/linux/apps/app1/config.matter
Original file line number Diff line number Diff line change
Expand Up @@ -2711,7 +2711,7 @@ cluster BridgedDeviceBasicInformation = 57 {
Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
cluster Switch = 59 {
revision 1;
revision 2;

bitmap Feature : bitmap32 {
kLatchingSwitch = 0x1;
Expand Down Expand Up @@ -2767,7 +2767,7 @@ cluster Switch = 59 {
Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
cluster Switch = 59 {
revision 1;
revision 2;

bitmap Feature : bitmap32 {
kLatchingSwitch = 0x1;
Expand Down
4 changes: 2 additions & 2 deletions examples/placeholder/linux/apps/app2/config.matter
Original file line number Diff line number Diff line change
Expand Up @@ -2668,7 +2668,7 @@ cluster BridgedDeviceBasicInformation = 57 {
Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
cluster Switch = 59 {
revision 1;
revision 2;

bitmap Feature : bitmap32 {
kLatchingSwitch = 0x1;
Expand Down Expand Up @@ -2724,7 +2724,7 @@ cluster Switch = 59 {
Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
cluster Switch = 59 {
revision 1;
revision 2;

bitmap Feature : bitmap32 {
kLatchingSwitch = 0x1;
Expand Down
Loading

0 comments on commit 75df75b

Please sign in to comment.