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.

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

[Cherry-Pick] Update WiseConnect-wifi-bt-sdk to 2.10.3 for RS9116 (#36117) #36203

Open
wants to merge 1 commit into
base: v1.4-branch
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/examples-efr32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-efr32:81
image: ghcr.io/project-chip/chip-build-efr32:84
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_artifacts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: ghcr.io/project-chip/chip-build-efr32:81
image: ghcr.io/project-chip/chip-build-efr32:84
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@
[submodule "third_party/silabs/wiseconnect-wifi-bt-sdk"]
path = third_party/silabs/wiseconnect-wifi-bt-sdk
url = https://github.com/SiliconLabs/wiseconnect-wifi-bt-sdk.git
branch = 2.10.0
branch = 2.10.3
platforms = silabs
[submodule "third_party/silabs/wifi_sdk"]
path = third_party/silabs/wifi_sdk
Expand Down
4 changes: 4 additions & 0 deletions examples/platform/silabs/efr32/rs911x/rsi_if.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,9 @@ static void wfx_rsi_save_ap_info(void) // translation
case SME_WPA2_ENTERPRISE:
wfx_rsi.sec.security = WFX_SEC_WPA2;
break;
case SME_WPA_WPA2_MIXED_MODE:
wfx_rsi.sec.security = WFX_SEC_WPA_WPA2_MIXED;
break;
case SME_WEP:
wfx_rsi.sec.security = WFX_SEC_WEP;
break;
Expand Down Expand Up @@ -551,6 +554,7 @@ static void wfx_rsi_do_join(void)
break;
case WFX_SEC_WPA:
case WFX_SEC_WPA2:
case WFX_SEC_WPA_WPA2_MIXED:
connect_security_mode = RSI_WPA_WPA2_MIXED;
break;
#if WIFI_ENABLE_SECURITY_WPA3_TRANSITION
Expand Down
14 changes: 7 additions & 7 deletions integrations/cloudbuild/smoke-test.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
steps:
- name: "ghcr.io/project-chip/chip-build-vscode:81"
- name: "ghcr.io/project-chip/chip-build-vscode:84"
entrypoint: "bash"
args:
- "-c"
- |
git config --global --add safe.directory "*"
python scripts/checkout_submodules.py --shallow --recursive --platform esp32 nrfconnect silabs linux android
id: Submodules
- name: "ghcr.io/project-chip/chip-build-vscode:81"
- name: "ghcr.io/project-chip/chip-build-vscode:84"
# NOTE: silabs boostrap is NOT done with the rest as it requests a conflicting
# jinja2 version (asks for 3.1.3 when constraints.txt asks for 3.0.3)
env:
Expand All @@ -24,7 +24,7 @@ steps:
path: /pwenv
timeout: 900s

- name: "ghcr.io/project-chip/chip-build-vscode:81"
- name: "ghcr.io/project-chip/chip-build-vscode:84"
id: ESP32
env:
- PW_ENVIRONMENT_ROOT=/pwenv
Expand All @@ -45,7 +45,7 @@ steps:
volumes:
- name: pwenv
path: /pwenv
- name: "ghcr.io/project-chip/chip-build-vscode:81"
- name: "ghcr.io/project-chip/chip-build-vscode:84"
id: NRFConnect
env:
- PW_ENVIRONMENT_ROOT=/pwenv
Expand All @@ -66,7 +66,7 @@ steps:
- name: pwenv
path: /pwenv

- name: "ghcr.io/project-chip/chip-build-vscode:81"
- name: "ghcr.io/project-chip/chip-build-vscode:84"
id: EFR32
env:
- PW_ENVIRONMENT_ROOT=/pwenv
Expand All @@ -88,7 +88,7 @@ steps:
- name: pwenv
path: /pwenv

- name: "ghcr.io/project-chip/chip-build-vscode:81"
- name: "ghcr.io/project-chip/chip-build-vscode:84"
id: Linux
env:
- PW_ENVIRONMENT_ROOT=/pwenv
Expand Down Expand Up @@ -141,7 +141,7 @@ steps:
- name: pwenv
path: /pwenv

- name: "ghcr.io/project-chip/chip-build-vscode:81"
- name: "ghcr.io/project-chip/chip-build-vscode:84"
id: Android
env:
- PW_ENVIRONMENT_ROOT=/pwenv
Expand Down
13 changes: 7 additions & 6 deletions src/platform/silabs/wifi/wfx_host_events.h
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,13 @@ typedef enum
/* Note that these are same as RSI_security */
typedef enum
{
WFX_SEC_UNSPECIFIED = 0,
WFX_SEC_NONE = 1,
WFX_SEC_WEP = 2,
WFX_SEC_WPA = 3,
WFX_SEC_WPA2 = 4,
WFX_SEC_WPA3 = 5,
WFX_SEC_UNSPECIFIED = 0,
WFX_SEC_NONE = 1,
WFX_SEC_WEP = 2,
WFX_SEC_WPA = 3,
WFX_SEC_WPA2 = 4,
WFX_SEC_WPA3 = 5,
WFX_SEC_WPA_WPA2_MIXED = 6,
} wfx_sec_t;

typedef struct
Expand Down
2 changes: 1 addition & 1 deletion third_party/silabs/wiseconnect-wifi-bt-sdk
Loading