Skip to content

Commit

Permalink
Merge branch 'master' into Set-3-18-24
Browse files Browse the repository at this point in the history
  • Loading branch information
raul-marquez-csa authored Apr 9, 2024
2 parents f92c7a6 + bc9fc76 commit e45fe09
Show file tree
Hide file tree
Showing 60 changed files with 914 additions and 344 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: Builds

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
merge_group:
workflow_dispatch:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/chef.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: Build Chef CI examples on all platforms

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
merge_group:

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/cirque.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: Cirque

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
merge_group:
workflow_dispatch:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/darwin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: Darwin

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
merge_group:
workflow_dispatch:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/examples-ameba.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: Build example - Ameba

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
merge_group:

Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/examples-asr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: Build example - ASR

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
merge_group:

Expand Down Expand Up @@ -60,4 +62,4 @@ jobs:
--target asr-asr582x-dishwasher \
--target asr-asr582x-refrigerator \
build \
"
"
2 changes: 2 additions & 0 deletions .github/workflows/examples-bouffalolab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: Build example - BouffaloLab

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
merge_group:
workflow_dispatch:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/examples-cc32xx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: Build example - TI CC32XX

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
merge_group:

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/examples-efr32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: Build example - EFR32

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
merge_group:

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/examples-esp32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: Build example - ESP32

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
merge_group:

Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/examples-infineon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: Build example - Infineon

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
merge_group:
workflow_dispatch:
Expand Down Expand Up @@ -144,4 +146,4 @@ jobs:
uses: ./.github/actions/upload-size-reports
if: ${{ !env.ACT }}
with:
platform-name: Infineon
platform-name: Infineon
2 changes: 2 additions & 0 deletions .github/workflows/examples-linux-arm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: Build example - Linux ARM

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
merge_group:

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/examples-linux-imx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: Build example - i.MX Linux

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
merge_group:

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/examples-linux-standalone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: Build example - Linux Standalone

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
merge_group:

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/examples-mbed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: Build example - Mbed OS

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
merge_group:
workflow_dispatch:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/examples-mw320.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: Build example - MW320

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
merge_group:

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/examples-nrfconnect.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: Build example - nRF Connect SDK

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
merge_group:

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/examples-openiotsdk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: Build example - Open IoT SDK

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
merge_group:
workflow_dispatch:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/examples-qpg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: Build example - QPG

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
merge_group:

Expand Down Expand Up @@ -86,4 +88,4 @@ jobs:
uses: ./.github/actions/upload-size-reports
if: ${{ !env.ACT }}
with:
platform-name: QPG
platform-name: QPG
2 changes: 2 additions & 0 deletions .github/workflows/examples-stm32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: Build example - stm32

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
merge_group:

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/examples-telink.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: Build example - Telink

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
merge_group:

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/examples-tizen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: Build example - Tizen

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
merge_group:

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/full-android.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: Full builds - Android

on:
push:
branches-ignore:
- 'dependabot/**'
workflow_dispatch:

concurrency:
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/gradle-wrapper-validation.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
name: "Validate Gradle Wrapper"
on: [push, pull_request]
on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:

jobs:
validation:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/java-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: Java Tests

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
merge_group:
workflow_dispatch:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,11 @@
# limitations under the License.

name: Lint Code Base

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
merge_group:
workflow_dispatch:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/minimal-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: Minimal Build (Linux / configure)

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
merge_group:

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/qemu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: QEMU

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
merge_group:

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/spell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: Run misspell

on:
push:
branches-ignore:
- 'dependabot/**'
paths:
- "**.md"
- ".github/.wordlist.txt"
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: Tests

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
merge_group:
workflow_dispatch:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/unit_integration_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: Unit / Integration Tests

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
merge_group:

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/zap_templates.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: ZAP

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
merge_group:

Expand Down
14 changes: 7 additions & 7 deletions examples/tv-casting-app/APIs.md
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,9 @@ client's lifecycle:
the Matter specification's "Onboarding Payload" section for more details on
commissioning data.

On Linux, define a function `InitCommissionableDataProvider` to initialize
initialize a `LinuxCommissionableDataProvider` that can provide the required
values to the `CastingApp`.
On Linux, define a function `InitCommissionableDataProvider` to initialize a
`LinuxCommissionableDataProvider` that can provide the required values to
the `CastingApp`.

```c
CHIP_ERROR InitCommissionableDataProvider(LinuxCommissionableDataProvider & provider, LinuxDeviceOptions & options) {
Expand Down Expand Up @@ -917,14 +917,14 @@ On iOS refer to the following platform specific files:
1. For a list of clusters, commands and attributes supported by the Matter TV
Casting library:
[/darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCClusterObjects.h](/darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCClusterObjects.h)
[darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCClusterObjects.h](darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCClusterObjects.h)
2. For the IDs and request / response types to use with the commands:
[/darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCCommandObjects.h](/darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCCommandObjects.h)
[darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCCommandObjects.h](darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCCommandObjects.h)
and
[/darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCCommandPayloads.h](/darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCCommandPayloads.h)
[darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCCommandPayloads.h](darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCCommandPayloads.h)
3. For attribute [read operations](#read-operations) and
[subscriptions](#subscriptions):
[/darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCAttributeObjects.h](/darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCAttributeObjects.h)
[darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCAttributeObjects.h](darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/MCAttributeObjects.h)
### Issuing Commands
Expand Down
1 change: 1 addition & 0 deletions examples/tv-casting-app/linux/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ CHIP_ERROR ProcessClusterCommand(int argc, char ** argv)

int main(int argc, char * argv[])
{
ChipLogProgress(AppServer, "chip_casting_simplified = 0"); // this file is built/run only if chip_casting_simplified = 0
VerifyOrDie(CHIP_NO_ERROR == chip::Platform::MemoryInit());
VerifyOrDie(CHIP_NO_ERROR == chip::DeviceLayer::PlatformMgr().InitChipStack());

Expand Down
1 change: 1 addition & 0 deletions examples/tv-casting-app/linux/simple-app.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ class CommonCaseDeviceServerInitParamsProvider : public ServerInitParamsProvider

int main(int argc, char * argv[])
{
ChipLogProgress(AppServer, "chip_casting_simplified = 1"); // this file is built/run only if chip_casting_simplified = 1
// Create AppParameters that need to be passed to CastingApp.Initialize()
AppParameters appParameters;
RotatingDeviceIdUniqueIdProvider rotatingDeviceIdUniqueIdProvider;
Expand Down
Loading

0 comments on commit e45fe09

Please sign in to comment.