Skip to content

Commit

Permalink
Merge branch 'master' into consolidate_idm_10_1_python
Browse files Browse the repository at this point in the history
  • Loading branch information
cecille authored Oct 20, 2023
2 parents 09f99d4 + 0cfb2ad commit b358f47
Show file tree
Hide file tree
Showing 324 changed files with 30,987 additions and 12,659 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@ runs:
# there is roughly 1.4GB that remains in this cache that is useless from
# this point onwards.
shell: bash
continue-on-error: true
run: |
du -sh $HOME/.cipd-cache-dir/ || true
du -sh $HOME/.cipd-cache-dir/
rm -rf $HOME/.cipd-cache-dir/ || echo "Removing cipd cache dir failed"
- name: Dump disk info after checkout submodule & Bootstrap
shell: bash
Expand Down
33 changes: 33 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,39 @@ jobs:
pip3 install -r src/setup_payload/python/requirements.txt
python3 src/setup_payload/tests/run_python_setup_payload_gen_test.py out/chip-tool
build_linux_python_lighting_device:
name: Build on Linux (python lighting-app)

runs-on: ubuntu-latest
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:21
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"

steps:
- name: Dump GitHub context
env:
GITHUB_CONTEXT: ${{ toJSON(github) }}
run: echo "$GITHUB_CONTEXT"
- name: Dump Concurrency context
env:
CONCURRENCY_CONTEXT: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
run: echo "$CONCURRENCY_CONTEXT"
- name: Checkout
uses: actions/checkout@v4
- name: Checkout submodules & Bootstrap
uses: ./.github/actions/checkout-submodules-and-bootstrap
with:
platform: linux

- name: Setup Build
run: |
scripts/build_python_device.sh --chip_detail_logging true
build_darwin:
name: Build on Darwin (clang, python_lib, simulated)
runs-on: macos-latest
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/examples-linux-arm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ jobs:
--target linux-arm64-chip-cert-clang \
--target linux-arm64-all-clusters-clang \
--target linux-arm64-chip-tool-ipv6only-clang \
--target linux-arm64-chip-tool-nodeps-ipv6only \
--target linux-arm64-lock-clang \
--target linux-arm64-minmdns-clang \
--target linux-arm64-light-rpc-ipv6only-clang \
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/full-android.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ jobs:
# This should not generally be needed, however android CI runs out of space
# We do not need pigweed cross compile here because we use android NDK
# compilers. Removing this package saves a significant amount of space.
continue-on-error: true
run: |
du -sh .environment/cipd/packages/arm
rm -rf .environment/cipd/packages/arm
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/smoketest-android.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ jobs:
# This should not generally be needed, however android CI runs out of space
# We do not need pigweed cross compile here because we use android NDK
# compilers. Removing this package save significant amount of space.
continue-on-error: true
run: |
du -sh .environment/cipd/packages/arm
rm -rf .environment/cipd/packages/arm
Expand Down
9 changes: 9 additions & 0 deletions config/nrfconnect/chip-module/Kconfig.features
Original file line number Diff line number Diff line change
Expand Up @@ -267,4 +267,13 @@ choice CHIP_LAST_FABRIC_REMOVED_ACTION

endchoice

config CHIP_LAST_FABRIC_REMOVED_ACTION_DELAY
int "After removing the last fabric wait defined time [in milliseconds] to perform an action"
depends on !CHIP_LAST_FABRIC_REMOVED_NONE
default 500
help
After removing the last fabric the device will wait for the defined time and then perform
an action chosen by the CHIP_LAST_FABRIC_REMOVED_ACTION option. This schedule will allow for
avoiding race conditions before the device removes non-volatile data.

endif # CHIP
10 changes: 9 additions & 1 deletion config/telink/chip-module/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,14 @@ else()
unset(GLOBAL_DTC_OVERLAY_FILE)
endif()

if(EXISTS "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
message(STATUS "Flash memory size is set to: " ${FLASH_SIZE} "b")
else()
set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/2m_flash.overlay")
message(STATUS "Flash memory size is set to: 2mb")
endif()

if(EXISTS "${CHIP_ROOT}/config/telink/app/bootloader.conf")
set(GLOBAL_BOOTLOADER_CONF_OVERLAY_FILE "${CHIP_ROOT}/config/telink/app/bootloader.conf")
else()
Expand All @@ -177,7 +185,7 @@ if (CONFIG_BOOTLOADER_MCUBOOT)
add_custom_target(build_mcuboot ALL
COMMAND
west build -b ${BOARD} -d build_mcuboot ${ZEPHYR_BASE}/../bootloader/mcuboot/boot/zephyr
-- -DOVERLAY_CONFIG=${GLOBAL_BOOTLOADER_CONF_OVERLAY_FILE} -DDTC_OVERLAY_FILE="${GLOBAL_DTC_OVERLAY_FILE};${USB_BOOT_DTC_OVERLAY_FILE}"
-- -DOVERLAY_CONFIG=${GLOBAL_BOOTLOADER_CONF_OVERLAY_FILE} -DDTC_OVERLAY_FILE="${GLOBAL_DTC_OVERLAY_FILE};${FLASH_DTC_OVERLAY_FILE};${USB_BOOT_DTC_OVERLAY_FILE}"
COMMAND
cp ${PROJECT_BINARY_DIR}/../modules/chip-module/build_mcuboot/zephyr/zephyr.bin ${PROJECT_BINARY_DIR}/zephyr.mcuboot.bin
)
Expand Down
224 changes: 224 additions & 0 deletions data_model/clusters/ACL-Cluster.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,224 @@
<?xml version="1.0"?>
<!--
Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
The information within this document is the property of the Connectivity
Standards Alliance and its use and disclosure are restricted, except as
expressly set forth herein.
Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
nontransferable, worldwide, limited and revocable license (without the right to
sublicense), under Connectivity Standards Alliance's applicable copyright
rights, to view, download, save, reproduce and use the document solely for your
own internal purposes and in accordance with the terms of the license set forth
herein. This license does not authorize you to, and you expressly warrant that
you shall not: (a) permit others (outside your organization) to use this
document; (b) post or publish this document; (c) modify, adapt, translate, or
otherwise change this document in any manner or create any derivative work
based on this document; (d) remove or modify any notice or label on this
document, including this Copyright Notice, License and Disclaimer. The
Connectivity Standards Alliance does not grant you any license hereunder other
than as expressly stated herein.
Elements of this document may be subject to third party intellectual property
rights, including without limitation, patent, copyright or trademark rights,
and any such third party may or may not be a member of the Connectivity
Standards Alliance. Connectivity Standards Alliance members grant other
Connectivity Standards Alliance members certain intellectual property rights as
set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
Standards Alliance members do not grant you any rights under this license. The
Connectivity Standards Alliance is not responsible for, and shall not be held
responsible in any manner for, identifying or failing to identify any or all
such third party intellectual property rights. Please visit www.csa-iot.org for
more information on how to become a member of the Connectivity Standards
Alliance.
This document and the information contained herein are provided on an “AS IS”
basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
LOSS OR DAMAGE.
All company, brand and product names in this document may be trademarks that
are the sole property of their respective owners.
This notice and disclaimer must be included on all copies of this document.
Connectivity Standards Alliance
508 Second Street, Suite 206
Davis, CA 95616, USA
-->
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x001f" name="AccessControl" revision="1">
<revisionHistory>
<revision revision="1" summary="Initial Release"/>
</revisionHistory>
<classification hierarchy="base" role="utility" picsCode="ACL" scope="Node"/>
<dataTypes>
<enum name="AccessControlEntryAuthModeEnum">
<item value="1" name="PASE" summary="Passcode authenticated session">
<mandatoryConform/>
</item>
<item value="2" name="CASE" summary="Certificate authenticated session">
<mandatoryConform/>
</item>
<item value="3" name="Group" summary="Group authenticated session">
<mandatoryConform/>
</item>
</enum>
<enum name="AccessControlEntryPrivilegeEnum">
<item value="1" name="View" summary="Can read and observe all (except Access Control Cluster and as seen by a non-Proxy)">
<mandatoryConform/>
</item>
<item value="2" name="Proxy View" summary="Can read and observe all (as seen by a Proxy)">
<otherwiseConform>
<provisionalConform/>
<mandatoryConform/>
</otherwiseConform>
</item>
<item value="3" name="Operate" summary="View privileges, and can perform the primary function of this Node (except Access Control Cluster)">
<mandatoryConform/>
</item>
<item value="4" name="Manage" summary="Operate privileges, and can modify persistent configuration of this Node (except Access Control Cluster)">
<mandatoryConform/>
</item>
<item value="5" name="Administer" summary="Manage privileges, and can observe and modify the Access Control Cluster">
<mandatoryConform/>
</item>
</enum>
<enum name="ChangeTypeEnum">
<item value="0" name="Changed" summary="Entry or extension was changed">
<mandatoryConform/>
</item>
<item value="1" name="Added" summary="Entry or extension was added">
<mandatoryConform/>
</item>
<item value="2" name="Removed" summary="Entry or extension was removed">
<mandatoryConform/>
</item>
</enum>
<struct name="AccessControlEntryStruct">
<field id="1" name="Privilege" type="AccessControlEntryPrivilegeEnum">
<access fabricSensitive="true"/>
<mandatoryConform/>
</field>
<field id="2" name="AuthMode" type="AccessControlEntryAuthModeEnum">
<access fabricSensitive="true"/>
<mandatoryConform/>
</field>
<field id="3" name="Subjects" type="&lt;&lt;ref_DataTypeList&gt;&gt;[&lt;&lt;ref_SubjectId&gt;&gt;]">
<access fabricSensitive="true"/>
<quality nullable="true"/>
<mandatoryConform/>
<constraint type="max" value="SubjectsPerAccessControlEntry"/>
</field>
<field id="4" name="Targets" type="&lt;&lt;ref_DataTypeList&gt;&gt;[AccessControlTargetStruct Type]">
<access fabricSensitive="true"/>
<quality nullable="true"/>
<mandatoryConform/>
<constraint type="max" value="TargetsPerAccessControlEntry"/>
</field>
</struct>
<struct name="AccessControlExtensionStruct">
<field id="1" name="Data" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;">
<access fabricSensitive="true"/>
<mandatoryConform/>
<constraint type="max" value="128"/>
</field>
</struct>
<struct name="AccessControlTargetStruct">
<field id="0" name="Cluster" type="cluster-id">
<quality nullable="true"/>
<mandatoryConform/>
</field>
<field id="1" name="Endpoint" type="endpoint-no">
<quality nullable="true"/>
<mandatoryConform/>
</field>
<field id="2" name="DeviceType" type="devtype-id">
<quality nullable="true"/>
<mandatoryConform/>
</field>
</struct>
</dataTypes>
<attributes>
<attribute id="0x0000" name="ACL" type="&lt;&lt;ref_DataTypeList&gt;&gt;[AccessControlEntryStruct Type]" default="desc">
<access read="true" write="true" readPrivilege="admin" writePrivilege="operate"/>
<mandatoryConform/>
<constraint type="desc"/>
</attribute>
<attribute id="0x0001" name="Extension" type="&lt;&lt;ref_DataTypeList&gt;&gt;[AccessControlExtensionStruct Type]" default="desc">
<access read="true" write="true" readPrivilege="admin" writePrivilege="operate"/>
<optionalConform/>
<constraint type="desc"/>
</attribute>
<attribute id="0x0002" name="SubjectsPerAccessControlEntry" type="uint16" default="4">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<mandatoryConform/>
<constraint type="min" value="4"/>
</attribute>
<attribute id="0x0003" name="TargetsPerAccessControlEntry" type="uint16" default="3">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<mandatoryConform/>
<constraint type="min" value="3"/>
</attribute>
<attribute id="0x0004" name="AccessControlEntriesPerFabric" type="uint16" default="4">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<mandatoryConform/>
<constraint type="min" value="4"/>
</attribute>
</attributes>
<events>
<event id="0x00" name="AccessControlEntryChanged" priority="info">
<access readPrivilege="admin" fabricSensitive="true"/>
<mandatoryConform/>
<field id="1" name="AdminNodeID" type="node-id">
<quality nullable="true"/>
<mandatoryConform/>
<constraint type="desc"/>
</field>
<field id="2" name="AdminPasscodeID" type="uint16">
<quality nullable="true"/>
<mandatoryConform/>
<constraint type="desc"/>
</field>
<field id="3" name="ChangeType" type="ChangeTypeEnum">
<mandatoryConform/>
</field>
<field id="4" name="LatestValue" type="AccessControlEntryStruct">
<quality nullable="true"/>
<mandatoryConform/>
</field>
</event>
<event id="0x01" name="AccessControlExtensionChanged" priority="info">
<access readPrivilege="admin" fabricSensitive="true"/>
<mandatoryConform/>
<field id="1" name="AdminNodeID" type="node-id">
<quality nullable="true"/>
<mandatoryConform/>
<constraint type="desc"/>
</field>
<field id="2" name="AdminPasscodeID" type="uint16">
<quality nullable="true"/>
<mandatoryConform/>
<constraint type="desc"/>
</field>
<field id="3" name="ChangeType" type="ChangeTypeEnum">
<mandatoryConform/>
</field>
<field id="4" name="LatestValue" type="AccessControlExtensionStruct">
<quality nullable="true"/>
<mandatoryConform/>
</field>
</event>
</events>
</cluster>
Loading

0 comments on commit b358f47

Please sign in to comment.