Skip to content

Commit f32d005

Browse files
[Silabs] Update WiseConnect-wifi-bt-sdk to 2.10.3 for RS9116 (project-chip#36117)
* Updated wiseconnect pointer to 2.10.3 and added changes for wpa_wpa2_mixed security type for rs9116 board * updated example-efr32.yaml and release_artifacts.yaml with docker build version * Updated docker version in release_artifacts,smoke_test.yaml and .gitmodules with 2.10.3
1 parent 9041169 commit f32d005

File tree

7 files changed

+22
-17
lines changed

7 files changed

+22
-17
lines changed

.github/workflows/examples-efr32.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
if: github.actor != 'restyled-io[bot]'
4242

4343
container:
44-
image: ghcr.io/project-chip/chip-build-efr32:83
44+
image: ghcr.io/project-chip/chip-build-efr32:84
4545
volumes:
4646
- "/tmp/bloat_reports:/tmp/bloat_reports"
4747
steps:

.github/workflows/release_artifacts.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
runs-on: ubuntu-latest
6565

6666
container:
67-
image: ghcr.io/project-chip/chip-build-efr32:83
67+
image: ghcr.io/project-chip/chip-build-efr32:84
6868
steps:
6969
- name: Checkout
7070
uses: actions/checkout@v4

.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@
218218
[submodule "third_party/silabs/wiseconnect-wifi-bt-sdk"]
219219
path = third_party/silabs/wiseconnect-wifi-bt-sdk
220220
url = https://github.com/SiliconLabs/wiseconnect-wifi-bt-sdk.git
221-
branch = 2.10.0
221+
branch = 2.10.3
222222
platforms = silabs
223223
[submodule "third_party/silabs/wifi_sdk"]
224224
path = third_party/silabs/wifi_sdk

examples/platform/silabs/efr32/rs911x/rsi_if.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,9 @@ static void wfx_rsi_save_ap_info(void) // translation
506506
case SME_WPA2_ENTERPRISE:
507507
wfx_rsi.sec.security = WFX_SEC_WPA2;
508508
break;
509+
case SME_WPA_WPA2_MIXED_MODE:
510+
wfx_rsi.sec.security = WFX_SEC_WPA_WPA2_MIXED;
511+
break;
509512
case SME_WEP:
510513
wfx_rsi.sec.security = WFX_SEC_WEP;
511514
break;
@@ -551,6 +554,7 @@ static void wfx_rsi_do_join(void)
551554
break;
552555
case WFX_SEC_WPA:
553556
case WFX_SEC_WPA2:
557+
case WFX_SEC_WPA_WPA2_MIXED:
554558
connect_security_mode = RSI_WPA_WPA2_MIXED;
555559
break;
556560
#if WIFI_ENABLE_SECURITY_WPA3_TRANSITION

integrations/cloudbuild/smoke-test.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
steps:
2-
- name: "ghcr.io/project-chip/chip-build-vscode:83"
2+
- name: "ghcr.io/project-chip/chip-build-vscode:84"
33
entrypoint: "bash"
44
args:
55
- "-c"
66
- |
77
git config --global --add safe.directory "*"
88
python scripts/checkout_submodules.py --shallow --recursive --platform esp32 nrfconnect silabs linux android
99
id: Submodules
10-
- name: "ghcr.io/project-chip/chip-build-vscode:83"
10+
- name: "ghcr.io/project-chip/chip-build-vscode:84"
1111
# NOTE: silabs boostrap is NOT done with the rest as it requests a conflicting
1212
# jinja2 version (asks for 3.1.3 when constraints.txt asks for 3.0.3)
1313
env:
@@ -24,7 +24,7 @@ steps:
2424
path: /pwenv
2525
timeout: 900s
2626

27-
- name: "ghcr.io/project-chip/chip-build-vscode:83"
27+
- name: "ghcr.io/project-chip/chip-build-vscode:84"
2828
id: ESP32
2929
env:
3030
- PW_ENVIRONMENT_ROOT=/pwenv
@@ -45,7 +45,7 @@ steps:
4545
volumes:
4646
- name: pwenv
4747
path: /pwenv
48-
- name: "ghcr.io/project-chip/chip-build-vscode:83"
48+
- name: "ghcr.io/project-chip/chip-build-vscode:84"
4949
id: NRFConnect
5050
env:
5151
- PW_ENVIRONMENT_ROOT=/pwenv
@@ -66,7 +66,7 @@ steps:
6666
- name: pwenv
6767
path: /pwenv
6868

69-
- name: "ghcr.io/project-chip/chip-build-vscode:83"
69+
- name: "ghcr.io/project-chip/chip-build-vscode:84"
7070
id: EFR32
7171
env:
7272
- PW_ENVIRONMENT_ROOT=/pwenv
@@ -88,7 +88,7 @@ steps:
8888
- name: pwenv
8989
path: /pwenv
9090

91-
- name: "ghcr.io/project-chip/chip-build-vscode:83"
91+
- name: "ghcr.io/project-chip/chip-build-vscode:84"
9292
id: Linux
9393
env:
9494
- PW_ENVIRONMENT_ROOT=/pwenv
@@ -141,7 +141,7 @@ steps:
141141
- name: pwenv
142142
path: /pwenv
143143

144-
- name: "ghcr.io/project-chip/chip-build-vscode:83"
144+
- name: "ghcr.io/project-chip/chip-build-vscode:84"
145145
id: Android
146146
env:
147147
- PW_ENVIRONMENT_ROOT=/pwenv

src/platform/silabs/wifi/wfx_host_events.h

+7-6
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,13 @@ typedef enum
147147
/* Note that these are same as RSI_security */
148148
typedef enum
149149
{
150-
WFX_SEC_UNSPECIFIED = 0,
151-
WFX_SEC_NONE = 1,
152-
WFX_SEC_WEP = 2,
153-
WFX_SEC_WPA = 3,
154-
WFX_SEC_WPA2 = 4,
155-
WFX_SEC_WPA3 = 5,
150+
WFX_SEC_UNSPECIFIED = 0,
151+
WFX_SEC_NONE = 1,
152+
WFX_SEC_WEP = 2,
153+
WFX_SEC_WPA = 3,
154+
WFX_SEC_WPA2 = 4,
155+
WFX_SEC_WPA3 = 5,
156+
WFX_SEC_WPA_WPA2_MIXED = 6,
156157
} wfx_sec_t;
157158

158159
typedef struct

0 commit comments

Comments
 (0)