Skip to content

Commit

Permalink
Merge branch 'master' into zephyr_3
Browse files Browse the repository at this point in the history
  • Loading branch information
@s07641069
s07641069 authored May 23, 2023
2 parents c258b66 + 1efbaf6 commit a6b428f
Show file tree
Hide file tree
Showing 318 changed files with 12,281 additions and 17,669 deletions.
1 change: 1 addition & 0 deletions .github/.wordlist.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,7 @@ Jupyter
jupyterlab
KA
kAdminister
kbd
kBusy
kCase
Kconfig
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/tests.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ jobs:
src/app/zap-templates/zcl/data-model/chip/proxy-valid-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/pwm-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/refrigerator-alarm.xml \
src/app/zap-templates/zcl/data-model/chip/relative-humidity-measurement-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/scene.xml \
src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml \
Expand Down
60 changes: 19 additions & 41 deletions .vscode/launch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -430,16 +430,16 @@
"name": "Debug Open IoT SDK example application",
"type": "cortex-debug",
"request": "launch",
"cwd": "${workspaceRoot}/examples/${input:openiotsdkApp}/openiotsdk",
"executable": "./build/chip-openiotsdk-${input:openiotsdkApp}-example.elf",
"cwd": "${workspaceRoot}/examples/${input:openiotsdkExample}/openiotsdk",
"executable": "./build/chip-openiotsdk-${input:openiotsdkExample}-example.elf",
"armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/packages/arm/bin/",
"servertype": "external",
"gdbTarget": "${input:openiotsdkRemoteHost}:31627", //GDBserver port on FVP
"overrideLaunchCommands": [
"-enable-pretty-printing",
"add-symbol-file ./build/bl2.elf 0x10000000",
"add-symbol-file ./build/tfm_s.elf 0x38000400",
"add-symbol-file ./build/chip-openiotsdk-${input:openiotsdkApp}-example_ns.elf 0x28060400",
"add-symbol-file ./build/chip-openiotsdk-${input:openiotsdkExample}-example_ns.elf 0x28060400",
"break main_ns.cpp:main"
],
"runToEntryPoint": "main",
Expand All @@ -451,15 +451,15 @@
"type": "cortex-debug",
"request": "launch",
"cwd": "${workspaceRoot}/src/test_driver/openiotsdk/unit-tests",
"executable": "./build/${input:openiotsdkUnittest}.elf",
"executable": "./build/${input:openiotsdkUnitTest}.elf",
"armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/packages/arm/bin/",
"servertype": "external",
"gdbTarget": ":31627", //GDBserver port on FVP
"overrideLaunchCommands": [
"-enable-pretty-printing",
"add-symbol-file ./build/bl2.elf 0x10000000",
"add-symbol-file ./build/tfm_s.elf 0x38000400",
"add-symbol-file ./build/${input:openiotsdkUnittest}_ns.elf 0x28060400",
"add-symbol-file ./build/${input:openiotsdkUnitTest}_ns.elf 0x28060400",
"break main_ns.cpp:main"
],
"runToEntryPoint": "main",
Expand Down Expand Up @@ -522,11 +522,13 @@
"default": "CY8CPROTO_062_4343W"
},
{
"type": "pickString",
"id": "openiotsdkApp",
"description": "What Open IoT SDK example do you want to use?",
"options": ["shell", "lock-app"],
"default": "shell"
"type": "command",
"id": "openiotsdkExample",
"command": "shellCommand.execute",
"args": {
"command": "cat examples/platform/openiotsdk/supported_examples.txt",
"description": "What Open IoT SDK example application do you want to use?"
}
},
{
"type": "promptString",
Expand All @@ -535,37 +537,13 @@
"default": ""
},
{
"type": "pickString",
"id": "openiotsdkUnittest",
"description": "What Open IoT SDK unit test do you want to use?",
"options": [
"accesstest",
"AppTests",
"ASN1Tests",
"BDXTests",
"ChipCryptoTests",
"ControllerTests",
"CoreTests",
"CredentialsTest",
"DataModelTests",
"InetLayerTests",
"MdnsTests",
"MessagingLayerTests",
"MinimalMdnsCoreTests",
"MinimalMdnsRecordsTests",
"MinimalMdnsRespondersTests",
"PlatformTests",
"RawTransportTests",
"RetransmitTests",
"SecureChannelTests",
"SetupPayloadTests",
"SupportTests",
"SystemLayerTests",
"TestShell",
"TransportLayerTests",
"UserDirectedCommissioningTests"
],
"default": "accesstest"
"type": "command",
"id": "openiotsdkUnitTest",
"command": "shellCommand.execute",
"args": {
"command": "cat src/test_driver/openiotsdk/unit-tests/test_components.txt",
"description": "What Open IoT SDK unit test application do you want to use?"
}
}
]
}
84 changes: 44 additions & 40 deletions .vscode/tasks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,19 @@
"clear": true
}
},
{
"label": "Setup Open IoT SDK network",
"type": "shell",
"command": "sudo scripts/setup/openiotsdk/network_setup.sh -n${input:openiotsdkNetworkSetupName} ${input:openiotsdkNetworkSetupCmd}",
"problemMatcher": {
"pattern": {
"regexp": "^(.*):(\\d+):(\\d+):\\s+(warning|error):\\s+(.*)$",
"file": 1,
"line": 2,
"message": 5
}
}
},
{
"label": "Build Open IoT SDK example",
"type": "shell",
Expand Down Expand Up @@ -453,6 +466,19 @@
"options": ["simple", "boot", "upgrade"],
"default": "simple"
},
{
"type": "pickString",
"id": "openiotsdkNetworkSetupCmd",
"description": "Which command do you wish to use?",
"options": ["up", "down", "restart"],
"default": "up"
},
{
"type": "promptString",
"id": "openiotsdkNetworkSetupName",
"description": "Type the network namespace name that you want to use.",
"default": "ARM"
},
{
"type": "pickString",
"id": "openiotsdkDebugMode",
Expand All @@ -468,44 +494,22 @@
"default": "false"
},
{
"type": "pickString",
"type": "command",
"id": "openiotsdkExample",
"description": "What Open IoT SDK example application do you want to use?",
"options": ["shell", "lock-app"],
"default": "shell"
"command": "shellCommand.execute",
"args": {
"command": "cat examples/platform/openiotsdk/supported_examples.txt",
"description": "What Open IoT SDK example application do you want to use?"
}
},
{
"type": "pickString",
"type": "command",
"id": "openiotsdkUnitTest",
"description": "What unit test do you want to use?",
"options": [
"accesstest",
"AppTests",
"ASN1Tests",
"BDXTests",
"ChipCryptoTests",
"ControllerTests",
"CoreTests",
"CredentialsTest",
"DataModelTests",
"InetLayerTests",
"MdnsTests",
"MessagingLayerTests",
"MinimalMdnsCoreTests",
"MinimalMdnsRecordsTests",
"MinimalMdnsRespondersTests",
"PlatformTests",
"RawTransportTests",
"RetransmitTests",
"SecureChannelTests",
"SetupPayloadTests",
"SupportTests",
"SystemLayerTests",
"TestShell",
"TransportLayerTests",
"UserDirectedCommissioningTests"
],
"default": "accesstest"
"command": "shellCommand.execute",
"args": {
"command": "cat src/test_driver/openiotsdk/unit-tests/test_components.txt",
"description": "What Open IoT SDK unit test application do you want to use?"
}
},
{
"type": "promptString",
Expand Down Expand Up @@ -654,12 +658,12 @@
"nrf-nrf52840dk-pump",
"nrf-nrf52840dk-pump-controller",
"nrf-nrf52840dk-shell",
"nrf-nrf5340-light",
"nrf-nrf5340-light-rpc",
"nrf-nrf5340-lock",
"nrf-nrf5340-pump",
"nrf-nrf5340-pump-controller",
"nrf-nrf5340-shell",
"nrf-nrf5340dk-light",
"nrf-nrf5340dk-light-rpc",
"nrf-nrf5340dk-lock",
"nrf-nrf5340dk-pump",
"nrf-nrf5340dk-pump-controller",
"nrf-nrf5340dk-shell",
"openiotsdk-lock",
"openiotsdk-shell",
"qpg-qpg6100-lock",
Expand Down
6 changes: 3 additions & 3 deletions config/openiotsdk/cmake/sdk.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,11 +194,11 @@ if(TARGET mcu-driver-hal)
DOMAIN_NS=$<IF:$<BOOL:${TFM_SUPPORT}>,1,0>
)

# Fixing the optimization issue for mcu-driver-hal target in the no-debug build.
# The default -Og optimization causes performance issues for the application.
# Fixing the optimization issue for mcu-driver-hal target in the release build.
# The default -Os optimization causes performance issues for the application.
# We need to replace it with -O2 which is suitable for performance.
# This fix can be removed in the future when the issue will be fixed in SDK directly.
if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
target_compile_options(mcu-driver-hal INTERFACE $<$<COMPILE_LANGUAGE:CXX>:-O2>)
target_compile_options(mcu-driver-hal INTERFACE $<$<COMPILE_LANGUAGE:C>:-O2>)
endif()
Expand Down
9 changes: 0 additions & 9 deletions docs/examples/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,15 +134,6 @@ log-source-app/**/README
minimal-mdns/README
```

## Open IoT SDK examples

```{toctree}
:glob:
:maxdepth: 1
openiotsdk_examples
```

## OTA Provider example

```{toctree}
Expand Down
Loading

0 comments on commit a6b428f

Please sign in to comment.