Skip to content

Commit

Permalink
Merge branch 'master' into feature/enable-all-attributes-chiptool
Browse files Browse the repository at this point in the history
  • Loading branch information
andersbangGF committed Oct 19, 2021
2 parents 87cf0dc + 4c7f664 commit 9154e4f
Show file tree
Hide file tree
Showing 331 changed files with 21,186 additions and 9,087 deletions.
21 changes: 15 additions & 6 deletions .github/.wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ AE
aef
algs
alloc
Ameba
ameba
amebad
amebaiot
AnnounceOTAProvider
APIs
apk
Expand All @@ -44,6 +48,7 @@ args
argv
armeabi
armv
asdk
ASYNC
att
attId
Expand All @@ -52,6 +57,7 @@ attrListName
attrMask
attSizeBytes
attType
ATW
AudioOutput
auth
autoconnect
Expand Down Expand Up @@ -113,7 +119,6 @@ CAfile
cancelled
CBB
cbd
CMD
CCMP
CCS
CCSTUDIO
Expand All @@ -139,8 +144,8 @@ ChipImInitiator
ChipImResponder
ChipLight
ChipMessageLayer
CHIPTool
CHIPTest
CHIPTool
chmod
chrpath
cipd
Expand All @@ -160,6 +165,7 @@ clusterListName
ClusterRevision
ClusterTestGeneration
cmake
CMD
CMSIS
CMVH
cn
Expand Down Expand Up @@ -269,6 +275,7 @@ DISTRO
Distutils
DK
DL
DM
DMG
DNS
Dnsmasq
Expand Down Expand Up @@ -659,6 +666,7 @@ PacketBuffer
PAI
PairDevice
PAKE
pankore
param
params
PartNumber
Expand All @@ -679,9 +687,9 @@ PID
Pigweed
PinCode
pkgconfig
plaintext
PlatformManager
PlatformManagerImpl
plaintext
plt
png
polymorphism
Expand Down Expand Up @@ -768,6 +776,7 @@ RPi
rsn
RSSI
rsync
RTL
rtld
RTOS
RTT
Expand All @@ -785,9 +794,9 @@ ScriptBinding
SDC
SDHC
SDK
SDK's
sdkconfig
SDKs
SDK's
SDKTARGETSYSROOT
sdl
segger
Expand All @@ -798,8 +807,8 @@ SERIALDEVICE
SerialNumber
ServiceId
SetDns
SetUpPINCode
SetpointRaiseLower
SetUpPINCode
SetupQRCode
sexualized
SIGINT
Expand Down Expand Up @@ -910,8 +919,8 @@ ttyUSB
TvChannel
txt
uart
udhcpc
UART
udhcpc
UDP
UDPEndPoint
udpPort
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,7 @@ jobs:
- name: Build chip-tool
timeout-minutes: 5
run: |
# config_pair_with_random_id=false so CI runs faster.
scripts/examples/gn_build_example.sh examples/chip-tool out/debug/standalone/ is_tsan=${USE_TSAN} config_use_separate_eventloop=${USE_SEPARATE_EVENTLOOP} config_pair_with_random_id=false
scripts/examples/gn_build_example.sh examples/chip-tool out/debug/standalone/ is_tsan=${USE_TSAN} config_use_separate_eventloop=${USE_SEPARATE_EVENTLOOP}
- name: Copy objdir
run: |
# The idea is to not upload our objdir unless builds have
Expand Down Expand Up @@ -162,8 +161,7 @@ jobs:
- name: Build chip-tool
timeout-minutes: 10
run: |
# config_pair_with_random_id=false so CI runs faster.
scripts/examples/gn_build_example.sh examples/chip-tool out/debug/standalone/ is_tsan=${USE_TSAN} config_use_separate_eventloop=${USE_SEPARATE_EVENTLOOP} config_pair_with_random_id=false
scripts/examples/gn_build_example.sh examples/chip-tool out/debug/standalone/ is_tsan=${USE_TSAN} config_use_separate_eventloop=${USE_SEPARATE_EVENTLOOP}
- name: Copy objdir
run: |
# The idea is to not upload our objdir unless builds have
Expand Down
24 changes: 12 additions & 12 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,12 @@
"request": "launch",
"cwd": "${workspaceRoot}/examples/${input:mbedApp}/mbed",
"executable": "./build-${input:mbedTarget}/${input:mbedDebugProfile}/chip-mbed-${input:mbedApp}-example.elf",
"servertype": "openocd",
"armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/pigweed/bin/", // Pigweed environment bootstraping required
"openocdPath": "${env:OPENOCD_PATH/bin}",
"armToolchainPath": "${env:MBED_GCC_ARM_PATH}",
"servertype": "openocd",
"searchDir": [
"${workspaceRoot}/config/mbed/scripts",
"${env:OPENOCD_PATH/scripts}"
"${env:OPENOCD_PATH}/scripts"
],
"configFiles": ["${input:mbedTarget}.tcl"],
"overrideLaunchCommands": [
Expand Down Expand Up @@ -124,8 +124,8 @@
"request": "launch",
"cwd": "${workspaceRoot}/examples/${input:mbedApp}/mbed",
"executable": "./build-${input:mbedTarget}/${input:mbedDebugProfile}/chip-mbed-${input:mbedApp}-example.elf",
"armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/pigweed/bin/", // Pigweed environment bootstraping required
"servertype": "external",
"armToolchainPath": "${env:MBED_GCC_ARM_PATH}",
"gdbTarget": "host.docker.internal:3334", //port 3333 for the CM0+, 3334 for the CM4
"overrideLaunchCommands": [
"-enable-pretty-printing",
Expand All @@ -151,12 +151,12 @@
"request": "launch",
"cwd": "${workspaceRoot}/examples/${input:mbedApp}/mbed",
"executable": "./build-${input:mbedTarget}/${input:mbedFlashProfile}/chip-mbed-${input:mbedApp}-example.elf",
"servertype": "openocd",
"armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/pigweed/bin/", // Pigweed environment bootstraping required
"openocdPath": "${env:OPENOCD_PATH/bin}",
"armToolchainPath": "${env:MBED_GCC_ARM_PATH}",
"servertype": "openocd",
"searchDir": [
"${workspaceRoot}/config/mbed/scripts",
"${env:OPENOCD_PATH/scripts}"
"${env:OPENOCD_PATH}/scripts"
],
"configFiles": ["${input:mbedTarget}.tcl"],
"overrideLaunchCommands": [
Expand All @@ -176,8 +176,8 @@
"request": "launch",
"cwd": "${workspaceRoot}/examples/${input:mbedApp}/mbed",
"executable": "./build-${input:mbedTarget}/${input:mbedFlashProfile}/chip-mbed-${input:mbedApp}-example.elf",
"armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/pigweed/bin/", // Pigweed environment bootstraping required
"servertype": "external",
"armToolchainPath": "${env:MBED_GCC_ARM_PATH}",
"gdbTarget": "host.docker.internal:3334", //port 3333 for the CM0+, 3334 for the CM4
"overrideLaunchCommands": [
"monitor reset halt",
Expand All @@ -194,9 +194,9 @@
"request": "launch",
"cwd": "${workspaceRoot}/src/test_driver/mbed",
"executable": "./build-${input:mbedTarget}/${input:mbedDebugProfile}/chip-mbed-unit-tests.elf",
"armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/pigweed/bin/", // Pigweed environment bootstraping required
"servertype": "openocd",
"openocdPath": "${env:OPENOCD_PATH/bin}",
"armToolchainPath": "${env:MBED_GCC_ARM_PATH}",
"searchDir": [
"${workspaceRoot}/config/mbed/scripts",
"${env:OPENOCD_PATH}/scripts"
Expand Down Expand Up @@ -227,8 +227,8 @@
"request": "launch",
"cwd": "${workspaceRoot}/src/test_driver/mbed",
"executable": "./build-${input:mbedTarget}/${input:mbedDebugProfile}/chip-mbed-unit-tests.elf",
"armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/pigweed/bin/", // Pigweed environment bootstraping required
"servertype": "external",
"armToolchainPath": "${env:MBED_GCC_ARM_PATH}",
"gdbTarget": "host.docker.internal:3334", //port 3333 for the CM0+, 3334 for the CM4
"overrideLaunchCommands": [
"-enable-pretty-printing",
Expand All @@ -254,9 +254,9 @@
"request": "launch",
"cwd": "${workspaceRoot}/src/test_driver/mbed",
"executable": "./build-${input:mbedTarget}/${input:mbedFlashProfile}/chip-mbed-unit-tests.elf",
"armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/pigweed/bin/", // Pigweed environment bootstraping required
"servertype": "openocd",
"openocdPath": "${env:OPENOCD_PATH/bin}",
"armToolchainPath": "${env:MBED_GCC_ARM_PATH}",
"searchDir": [
"${workspaceRoot}/config/mbed/scripts",
"${env:OPENOCD_PATH/scripts}"
Expand All @@ -279,8 +279,8 @@
"request": "launch",
"cwd": "${workspaceRoot}/src/test_driver/mbed",
"executable": "./build-${input:mbedTarget}/${input:mbedFlashProfile}/chip-mbed-unit-tests.elf",
"armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/pigweed/bin/", // Pigweed environment bootstraping required
"servertype": "external",
"armToolchainPath": "${env:MBED_GCC_ARM_PATH}",
"gdbTarget": "host.docker.internal:3334", //port 3333 for the CM0+, 3334 for the CM4
"overrideLaunchCommands": [
"monitor reset halt",
Expand Down
1 change: 1 addition & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@
"id": "exampleTarget",
"description": "What target to build",
"options": [
"ameba-amebad-all-clusters",
"android-arm-chip-tool",
"android-arm64-chip-test",
"android-arm64-chip-tool",
Expand Down
28 changes: 28 additions & 0 deletions config/ameba/.gn
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Copyright (c) 2020 Project CHIP Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import("//build_overrides/build.gni")

# The location of the build configuration file.
buildconfig = "${build_root}/config/BUILDCONFIG.gn"

# CHIP uses angle bracket includes.
check_system_includes = true

default_args = {
target_cpu = "arm"
target_os = "freertos"

import("//args.gni")
}
37 changes: 37 additions & 0 deletions config/ameba/BUILD.gn
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Copyright (c) 2020 Project CHIP Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# Options from standalone-chip.mk that differ from configure defaults. These
# options are used from examples/.

import("//build_overrides/build.gni")
import("//build_overrides/chip.gni")

import("${chip_root}/build/chip/tests.gni")

declare_args() {
chip_build_pw_rpc_lib = false
}

group("ameba") {
deps = [ "${chip_root}/src/lib" ]

if (chip_build_pw_rpc_lib) {
deps += [ "//lib/pw_rpc" ]
}

if (chip_build_tests) {
deps += [ "${chip_root}/src:tests" ]
}
}
36 changes: 36 additions & 0 deletions config/ameba/args.gni
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# Copyright (c) 2020 Project CHIP Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# Options from standalone-chip.mk that differ from configure defaults. These
# options are used from examples/.

chip_device_platform = "ameba"

chip_project_config_include = ""
chip_system_project_config_include = ""
chip_ble_project_config_include = ""

mbedtls_target = "//mbedtls:mbedtls"
lwip_platform = "external"

chip_build_tests = true
chip_inet_config_enable_dns_resolver = false

chip_inet_config_enable_tcp_endpoint = true
chip_inet_config_enable_udp_endpoint = true

chip_bypass_rendezvous = true
chip_config_network_layer_ble = false

custom_toolchain = "//third_party/connectedhomeip/config/ameba/toolchain:ameba"
1 change: 1 addition & 0 deletions config/ameba/build
1 change: 1 addition & 0 deletions config/ameba/build_overrides
Loading

0 comments on commit 9154e4f

Please sign in to comment.