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

[EFR32]Added retry logic for rs911x and enabling IPv6 by default for EFR32 wifi #20747

Merged
merged 1 commit into from
Jul 15, 2022
Merged

[EFR32]Added retry logic for rs911x and enabling IPv6 by default for EFR32 wifi #20747

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
6 changes: 3 additions & 3 deletions examples/light-switch-app/efr32/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ declare_args() {
disable_lcd = false

# Argument to Disable IPv4 for wifi(rs911)
chip_disable_wifi_ipv4 = false
chip_enable_wifi_ipv4 = false
}

declare_args() {
Expand Down Expand Up @@ -222,8 +222,8 @@ efr32_executable("light_switch_app") {
sources += [ "${examples_plat_dir}/OTAConfig.cpp" ]
}

if (chip_disable_wifi_ipv4) {
defines += [ "WIFI_IPV4_DISABLED" ]
if (chip_enable_wifi_ipv4) {
defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ]
}

# WiFi Settings
Expand Down
6 changes: 3 additions & 3 deletions examples/lighting-app/efr32/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ declare_args() {
disable_lcd = false

# Argument to Disable IPv4 for wifi(rs911)
chip_disable_wifi_ipv4 = false
chip_enable_wifi_ipv4 = false
}

declare_args() {
Expand Down Expand Up @@ -217,8 +217,8 @@ efr32_executable("lighting_app") {
sources += [ "${examples_plat_dir}/OTAConfig.cpp" ]
}

if (chip_disable_wifi_ipv4) {
defines += [ "WIFI_IPV4_DISABLED" ]
if (chip_enable_wifi_ipv4) {
defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ]
}

# WiFi Settings
Expand Down
6 changes: 3 additions & 3 deletions examples/lock-app/efr32/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ declare_args() {
disable_lcd = false

# Argument to Disable IPv4 for wifi(rs911)
chip_disable_wifi_ipv4 = false
chip_enable_wifi_ipv4 = false
}

declare_args() {
Expand Down Expand Up @@ -219,8 +219,8 @@ efr32_executable("lock_app") {
sources += [ "${examples_plat_dir}/OTAConfig.cpp" ]
}

if (chip_disable_wifi_ipv4) {
defines += [ "WIFI_IPV4_DISABLED" ]
if (chip_enable_wifi_ipv4) {
defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ]
}

# WiFi Settings
Expand Down
6 changes: 3 additions & 3 deletions examples/window-app/efr32/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ declare_args() {
disable_lcd = false

# Argument to Disable IPv4 for wifi(rs911)
chip_disable_wifi_ipv4 = false
chip_enable_wifi_ipv4 = false
}

declare_args() {
Expand Down Expand Up @@ -206,8 +206,8 @@ efr32_executable("window_app") {
sources += [ "${examples_plat_dir}/OTAConfig.cpp" ]
}

if (chip_disable_wifi_ipv4) {
defines += [ "WIFI_IPV4_DISABLED" ]
if (chip_enable_wifi_ipv4) {
defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ]
}

# WiFi Settings
Expand Down
4 changes: 2 additions & 2 deletions scripts/examples/gn_efr32_example.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ else
optArgs+="enable_sleepy_device=true chip_openthread_ftd=false "
shift
;;
--chip_disable_wifi_ipv4)
optArgs+="chip_disable_wifi_ipv4=true "
--chip_enable_wifi_ipv4)
optArgs+="chip_enable_wifi_ipv4=true "
shift
;;
*)
Expand Down
6 changes: 2 additions & 4 deletions src/platform/EFR32/CHIPDevicePlatformConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,9 @@

#if defined(SL_WIFI)

#if defined(WIFI_IPV4_DISABLED)
#ifndef CHIP_DEVICE_CONFIG_ENABLE_IPV4
#define CHIP_DEVICE_CONFIG_ENABLE_IPV4 0
#else /* !WIFI_IPV4_DISABLED */
#define CHIP_DEVICE_CONFIG_ENABLE_IPV4 1
#endif /* WIFI_IPV4_DISABLED */
#endif /* CHIP_DEVICE_CONFIG_ENABLE_IPV4 */

#endif /* SL_WIFI */

Expand Down
2 changes: 1 addition & 1 deletion third_party/silabs/matter_support
Open in desktop
Submodule matter_support updated 2 files
+15 −9 matter/wifi/rs911x/rsi_if.c
+3 −3 matter/wifi/rs911x/rsi_wlan_config.h