Skip to content

Commit

Permalink
Merge branch 'master' into fix-runner
Browse files Browse the repository at this point in the history
  • Loading branch information
arkq authored Aug 8, 2024
2 parents 72d8ee6 + ea01e21 commit 716f926
Show file tree
Hide file tree
Showing 153 changed files with 4,202 additions and 494 deletions.
42 changes: 0 additions & 42 deletions .github/stale.yml

This file was deleted.

42 changes: 42 additions & 0 deletions .github/workflows/stale.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: "Process Stale Issues and PRs"
on:
workflow_dispatch:
schedule:
- cron: "30 1 * * *"

permissions:
issues: write
pull-requests: write

jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v9
with:
stale-issue-message:
"This issue has been automatically marked as stale because
it has not had recent activity. It will be closed if no
further activity occurs. Remove stale label or comment or
this will be closed in 30 days."
stale-pr-message:
"This pull request has been automatically marked as stale
because it has not had recent activity. It will be closed
if no further activity occurs. Remove stale label or
comment or this will be closed in 10 days."
close-issue-message:
"This stale issue has been automatically closed. Thank you
for your contributions."
close-pr-message:
"This stale pull request has been automatically closed.
Thank you for your contributions."
days-before-issue-stale: 30
days-before-issue-close: -1 # Don't close them for now
days-before-pr-stale: 90
days-before-pr-close: 10
exempt-issue-labels:
"security,blocked,cert blocker,build issue,Spec XML
align,CI/CD improvements,memory"
exempt-pr-labels:
"security,blocked,cert blocker,build issue,Spec XML
align,CI/CD improvements,memory"
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@ ending in the cluster initialization code.
EmberAfInitializeAttributes - ember attribute storage - for all attributes
marked as “RAM” in the zap, sets defaults in the storage
Matter<Cluster>PluginServerCallback - .h is a generated file, .cpp impl is done
in the server cluster code. Use this to setup the cluster and do attribute
overrides registerAttributeAccessOverride - use this if you want to handle
attribute reads and writes externally
in the server cluster code. Use this to setup the cluster and setup overrides in
chip::app::AttributeAccessInterfaceRegistry::Instance().Register - use this if
you want to handle attribute reads and writes externally

Blue sections can be overridden.

Expand Down
1 change: 1 addition & 0 deletions docs/testing/yaml_schema.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ YAML schema
|&emsp; &emsp; &emsp; hasMasksClear |list||
|&emsp; &emsp; &emsp; notValue |NoneType,bool,int,float,list,dict|Y|
|&emsp; &emsp; &emsp; anyOf |list||
|&emsp; &emsp; &emsp; python |str|Y|
|&emsp; &emsp; saveAs |str||
|&emsp; &emsp; saveDataVersschemaionAs |str||
|&emsp; saveResponseAs |str||
Expand Down
24 changes: 20 additions & 4 deletions docs/upgrading.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,26 @@ independent of the InteractionModelEngine class.
The following replacements exist:

- `chip::app::InteractionModelEngine::RegisterCommandHandler` replaced by
`chip::app::CommandHandlerInterfaceRegistry::RegisterCommandHandler`
`chip::app::CommandHandlerInterfaceRegistry::Instance().RegisterCommandHandler`
- `chip::app::InteractionModelEngine::UnregisterCommandHandler` replaced by
`chip::app::CommandHandlerInterfaceRegistry::UnregisterCommandHandler`
`chip::app::CommandHandlerInterfaceRegistry::Instance().UnregisterCommandHandler`
- `chip::app::InteractionModelEngine::FindCommandHandler` replaced by
`chip::app::CommandHandlerInterfaceRegistry::GetCommandHandler`
`chip::app::CommandHandlerInterfaceRegistry::Instance().GetCommandHandler`
- `chip::app::InteractionModelEngine::UnregisterCommandHandlers` replaced by
`chip::app::CommandHandlerInterfaceRegistry::UnregisterAllCommandHandlersForEndpoint`
`chip::app::CommandHandlerInterfaceRegistry::Instance().UnregisterAllCommandHandlersForEndpoint`

### AttributeAccessInterface registration and removal

A new object exists for the attribute access interface registry, accessible as
`chip::app::AttributeHandlerInterfaceRegistry::Instance()`

Replacements for methods are:

- `registerAttributeAccessOverride` replaced by
`chip::app::AttributeAccessInterfaceRegistry::Instance().Register`
- `unregisterAttributeAccessOverride` replaced by
`chip::app::AttributeAccessInterfaceRegistry::Instance().Unregister`
- `unregisterAllAttributeAccessOverridesForEndpoint` replaced by
`chip::app::AttributeAccessInterfaceRegistry::Instance().UnregisterAllForEndpoint`
- `chip::app::GetAttributeAccessOverride` replaced by
`chip::app::AttributeAccessInterfaceRegistry::Instance().Get`
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,5 @@ CHIP_ERROR ActionsAttrAccess::Read(const ConcreteReadAttributePath & aPath, Attr

void MatterActionsPluginServerInitCallback()
{
registerAttributeAccessOverride(&gAttrAccess);
AttributeAccessInterfaceRegistry::Instance().Register(&gAttrAccess);
}
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,6 @@ void emberAfFanControlClusterInitCallback(EndpointId endpoint)
{
VerifyOrDie(mFanControlManager == nullptr);
mFanControlManager = new FanControlManager(endpoint);
registerAttributeAccessOverride(mFanControlManager);
AttributeAccessInterfaceRegistry::Instance().Register(mFanControlManager);
FanControl::SetDefaultDelegate(endpoint, mFanControlManager);
}
Original file line number Diff line number Diff line change
Expand Up @@ -5583,6 +5583,9 @@ cluster ApplicationLauncher = 1292 {
kSuccess = 0;
kAppNotAvailable = 1;
kSystemBusy = 2;
kPendingUserApproval = 3;
kDownloading = 4;
kInstalling = 5;
}

bitmap Feature : bitmap32 {
Expand Down
2 changes: 1 addition & 1 deletion examples/bridge-app/asr/src/bridged-actions-stub.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -97,5 +97,5 @@ CHIP_ERROR ActionsAttrAccess::Read(const ConcreteReadAttributePath & aPath, Attr

void MatterActionsPluginServerInitCallback(void)
{
registerAttributeAccessOverride(&gAttrAccess);
AttributeAccessInterfaceRegistry::Instance().Register(&gAttrAccess);
}
2 changes: 1 addition & 1 deletion examples/bridge-app/esp32/main/DeviceCallbacks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -113,5 +113,5 @@ CHIP_ERROR ActionsAttrAccess::Read(const ConcreteReadAttributePath & aPath, Attr

void MatterActionsPluginServerInitCallback(void)
{
registerAttributeAccessOverride(&gAttrAccess);
AttributeAccessInterfaceRegistry::Instance().Register(&gAttrAccess);
}
2 changes: 1 addition & 1 deletion examples/bridge-app/linux/bridged-actions-stub.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -133,5 +133,5 @@ CHIP_ERROR ActionsAttrAccess::Read(const ConcreteReadAttributePath & aPath, Attr

void MatterActionsPluginServerInitCallback()
{
registerAttributeAccessOverride(&gAttrAccess);
AttributeAccessInterfaceRegistry::Instance().Register(&gAttrAccess);
}
2 changes: 1 addition & 1 deletion examples/bridge-app/linux/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -998,7 +998,7 @@ void ApplicationInit()
}
}

registerAttributeAccessOverride(&gPowerAttrAccess);
AttributeAccessInterfaceRegistry::Instance().Register(&gPowerAttrAccess);
}

void ApplicationShutdown() {}
Expand Down
2 changes: 1 addition & 1 deletion examples/bridge-app/telink/src/DeviceCallbacks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -101,5 +101,5 @@ CHIP_ERROR ActionsAttrAccess::Read(const ConcreteReadAttributePath & aPath, Attr

void MatterActionsPluginServerInitCallback(void)
{
registerAttributeAccessOverride(&gAttrAccess);
AttributeAccessInterfaceRegistry::Instance().Register(&gAttrAccess);
}
2 changes: 1 addition & 1 deletion examples/chef/common/chef-concentration-measurement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Protocols::InteractionModel::Status chefConcentrationMeasurementWriteCallback(
CHIP_ERROR err = clusterInstance->SetMeasuredValue(MakeNullable(newValue));
if (CHIP_NO_ERROR == err)
{
ChipLogDetail(DeviceLayer, "Updated EP:%d, Cluster: 0x%04x to MeasuredValue: %f", endpoint, clusterId, newValue);
ChipLogDetail(DeviceLayer, "Updated EP:%d, Cluster: 0x%04x MeasuredValue", endpoint, clusterId);
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/common/chef-fan-control-manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,6 @@ void emberAfFanControlClusterInitCallback(EndpointId endpoint)
{
VerifyOrDie(!mFanControlManager);
mFanControlManager = std::make_unique<ChefFanControlManager>(endpoint);
registerAttributeAccessOverride(mFanControlManager.get());
AttributeAccessInterfaceRegistry::Instance().Register(mFanControlManager.get());
FanControl::SetDefaultDelegate(endpoint, mFanControlManager.get());
}
2 changes: 2 additions & 0 deletions examples/chef/common/chef-rpc-actions-worker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,9 @@ void ChefRpcActionsWorker::RegisterRpcActionsDelegate(ClusterId clusterId, Actio

ChefRpcActionsWorker::ChefRpcActionsWorker()
{
#if CONFIG_ENABLE_PW_RPC
chip::rpc::SubscribeActions(ChefRpcActionsCallback);
#endif
}

static ChefRpcActionsWorker instance;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
Original file line number Diff line number Diff line change
Expand Up @@ -2726,7 +2726,7 @@ endpoint 1 {
ram attribute credentialRulesSupport default = 1;
ram attribute numberOfCredentialsSupportedPerUser default = 5;
ram attribute language default = "en";
ram attribute autoRelockTime default = 5;
ram attribute autoRelockTime default = 0;
ram attribute soundVolume default = 0;
ram attribute operatingMode default = 0;
ram attribute supportedOperatingModes default = 0xFFFF;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
Original file line number Diff line number Diff line change
Expand Up @@ -3665,7 +3665,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "5",
"defaultValue": "0",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
4 changes: 2 additions & 2 deletions examples/energy-management-app/linux/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# CHIP Linux Energy Management Example
# Matter Linux Energy Management Example

An example showing the use of CHIP on the Linux. The document will describe how
to build and run CHIP Linux Energy Management Example on Raspberry Pi. This doc
Expand All @@ -12,7 +12,7 @@ details.

<hr>

- [CHIP Linux Energy Management Example](#chip-linux-energy-management-example)
- [Matter Linux Energy Management Example](#matter-linux-energy-management-example)
- [Building](#building)
- [Commandline arguments](#commandline-arguments)
- [Running the Complete Example on Raspberry Pi 4](#running-the-complete-example-on-raspberry-pi-4)
Expand Down
5 changes: 2 additions & 3 deletions examples/fabric-bridge-app/linux/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#include "RpcServer.h"
#endif

#include <string>
#include <sys/ioctl.h>
#include <thread>

Expand Down Expand Up @@ -186,8 +185,8 @@ void ApplicationInit()
ChipLogDetail(NotSpecified, "Fabric-Bridge: ApplicationInit()");

MatterEcosystemInformationPluginServerInitCallback();
CommandHandlerInterfaceRegistry::RegisterCommandHandler(&gAdministratorCommissioningCommandHandler);
registerAttributeAccessOverride(&gBridgedDeviceBasicInformationAttributes);
CommandHandlerInterfaceRegistry::Instance().RegisterCommandHandler(&gAdministratorCommissioningCommandHandler);
AttributeAccessInterfaceRegistry::Instance().Register(&gBridgedDeviceBasicInformationAttributes);

#if defined(PW_RPC_FABRIC_BRIDGE_SERVICE) && PW_RPC_FABRIC_BRIDGE_SERVICE
InitRpcServer(kFabricBridgeServerPort);
Expand Down
2 changes: 1 addition & 1 deletion examples/log-source-app/linux/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ int main(int argc, char * argv[])
// Initialize device attestation config
SetDeviceAttestationCredentialsProvider(chip::Credentials::Examples::GetExampleDACProvider());

CommandHandlerInterfaceRegistry::RegisterCommandHandler(&GetLogProvider());
CommandHandlerInterfaceRegistry::Instance().RegisterCommandHandler(&GetLogProvider());

chip::DeviceLayer::PlatformMgr().RunEventLoop();

Expand Down
6 changes: 6 additions & 0 deletions examples/placeholder/linux/apps/app1/config.matter
Original file line number Diff line number Diff line change
Expand Up @@ -8236,6 +8236,9 @@ cluster ApplicationLauncher = 1292 {
kSuccess = 0;
kAppNotAvailable = 1;
kSystemBusy = 2;
kPendingUserApproval = 3;
kDownloading = 4;
kInstalling = 5;
}

bitmap Feature : bitmap32 {
Expand Down Expand Up @@ -8295,6 +8298,9 @@ cluster ApplicationLauncher = 1292 {
kSuccess = 0;
kAppNotAvailable = 1;
kSystemBusy = 2;
kPendingUserApproval = 3;
kDownloading = 4;
kInstalling = 5;
}

bitmap Feature : bitmap32 {
Expand Down
6 changes: 6 additions & 0 deletions examples/placeholder/linux/apps/app2/config.matter
Original file line number Diff line number Diff line change
Expand Up @@ -8193,6 +8193,9 @@ cluster ApplicationLauncher = 1292 {
kSuccess = 0;
kAppNotAvailable = 1;
kSystemBusy = 2;
kPendingUserApproval = 3;
kDownloading = 4;
kInstalling = 5;
}

bitmap Feature : bitmap32 {
Expand Down Expand Up @@ -8252,6 +8255,9 @@ cluster ApplicationLauncher = 1292 {
kSuccess = 0;
kAppNotAvailable = 1;
kSystemBusy = 2;
kPendingUserApproval = 3;
kDownloading = 4;
kInstalling = 5;
}

bitmap Feature : bitmap32 {
Expand Down
2 changes: 1 addition & 1 deletion examples/placeholder/linux/src/bridged-actions-stub.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,5 @@ CHIP_ERROR ActionsAttrAccess::Read(const ConcreteReadAttributePath & aPath, Attr

void MatterActionsPluginServerInitCallback(void)
{
registerAttributeAccessOverride(&gAttrAccess);
chip::app::AttributeAccessInterfaceRegistry::Instance().Register(&gAttrAccess);
}
2 changes: 1 addition & 1 deletion examples/tv-app/android/App/platform-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@ dependencies {
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
implementation 'com.google.zxing:core:3.3.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
}
}
Loading

0 comments on commit 716f926

Please sign in to comment.