Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use docker image 0.6.03 and change BLE notification to indication #23494

Merged
merged 1 commit into from
Nov 4, 2022
Merged

use docker image 0.6.03 and change BLE notification to indication #23494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .github/workflows/examples-ameba.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-ameba:0.5.99
image: connectedhomeip/chip-build-ameba:0.6.03
options: --user root

steps:
Expand All @@ -47,4 +47,12 @@ jobs:
- name: Checkout submodules
run: scripts/checkout_submodules.py --shallow --platform ameba
- name: Build example Ameba All Clusters App
run: scripts/run_in_build_env.sh "./scripts/build/build_examples.py --target-glob 'ameba-*' build"
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py \
--target ameba-amebad-all-clusters \
--target ameba-amebad-all-clusters-minimal \
--target ameba-amebad-light \
--target ameba-amebad-pigweed \
build \
"
2 changes: 1 addition & 1 deletion integrations/docker/images/chip-build-ameba/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM connectedhomeip/chip-build:${VERSION}

# Setup Ameba
ARG AMEBA_DIR=/opt/ameba
ARG TAG_NAME=ameba_update_2022_07_25
ARG TAG_NAME=ameba_update_2022_10_03
RUN set -x \
&& apt-get update \
&& mkdir ${AMEBA_DIR} \
Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/chip-build/version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.5.99 Version bump reason: fix IMX SDK root in vscode dockerfile
0.6.03 Version bump reason: [Ameba] Replace C2 notify with indicate as required by Matter spec
6 changes: 3 additions & 3 deletions src/platform/Ameba/BLEManagerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,8 +567,8 @@ bool BLEManagerImpl::SendIndication(BLE_CONNECTION_OBJECT conId, const ChipBleUU
CHIP_ERROR err = CHIP_NO_ERROR;

VerifyOrExit(IsSubscribed(conId), err = CHIP_ERROR_INVALID_ARGUMENT);
server_send_data(conId, bt_matter_adapter_service_id, BT_MATTER_ADAPTER_SERVICE_CHAR_NOTIFY_CCCD_INDEX - 1, data->Start(),
data->DataLength(), GATT_PDU_TYPE_NOTIFICATION);
server_send_data(conId, bt_matter_adapter_service_id, BT_MATTER_ADAPTER_SERVICE_CHAR_INDICATE_CCCD_INDEX - 1, data->Start(),
data->DataLength(), GATT_PDU_TYPE_INDICATION);

exit:
if (err != CHIP_NO_ERROR)
Expand Down Expand Up @@ -922,7 +922,7 @@ CHIP_ERROR BLEManagerImpl::gatt_svr_chr_access(void * param, T_SERVER_ID service
switch (pp_data->msg_data.notification_indification_index)
{
case SIMP_NOTIFY_INDICATE_V3_ENABLE: {
sInstance.HandleTXCharCCCDWrite(conn_id, 0, 1);
sInstance.HandleTXCharCCCDWrite(conn_id, 1, 0);
}
break;

Expand Down