Skip to content

Commit

Permalink
Merge branch 'master' into fix-pw-config-file
Browse files Browse the repository at this point in the history
  • Loading branch information
andy31415 authored Sep 20, 2022
2 parents dd200b8 + 847f450 commit 60901a5
Show file tree
Hide file tree
Showing 77 changed files with 12,339 additions and 550 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/zap_templates.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ concurrency:
jobs:
zap_templates:
name: ZAP templates generation
timeout-minutes: 90
timeout-minutes: 120

runs-on: ubuntu-20.04
container:
Expand Down
2 changes: 1 addition & 1 deletion examples/all-clusters-app/linux/main-common.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ void ApplicationExit()

void emberAfLowPowerClusterInitCallback(EndpointId endpoint)
{
ChipLogProgress(NotSpecified, "TV Linux App: LowPower::SetDefaultDelegate");
ChipLogProgress(NotSpecified, "Setting LowPower default delegate to global manager");
chip::app::Clusters::LowPower::SetDefaultDelegate(endpoint, &sLowPowerManager);
}

Expand Down
Loading

0 comments on commit 60901a5

Please sign in to comment.