Skip to content

Commit

Permalink
Merge pull request #6 from xshuqun/ameba/matter_support
Browse files Browse the repository at this point in the history
[eco:matter] add matter support
  • Loading branch information
renpeipei-realtek authored Nov 29, 2024
2 parents 3bd13dc + 9f805d7 commit 302d27d
Show file tree
Hide file tree
Showing 31 changed files with 5,808 additions and 94 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ GitHub `ameba-rtos-z2` repository is the development framework for AmebaZ2 and A
* :books: [Z2 Datasheet](https://github.com/Ameba-AIoT/ameba-rtos-z2/blob/main/doc/RTL8720Cx-VH2_Datasheet_V1.0_20230224.pdf)
* :books: [Z2plus Datasheet](https://github.com/Ameba-AIoT/ameba-rtos-z2/blob/main/doc/Realtek_AmebaZII+_Datasheet_v1.1.pdf)

# Matter Support
Please check out [ameba-rtos-matter](https://github.com/Ameba-AIoT/ameba-rtos-matter) to learn more about Matter support.

# Setup Build Environments

## GCC Environment on Windows
Expand Down
13 changes: 0 additions & 13 deletions component/common/api/wifi/wifi_conf.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@
#include <device_lock.h>
#include <wlan_intf.h>

#if defined(CONFIG_MATTER) && CONFIG_MATTER
#include "chip_porting.h"
#endif

#if CONFIG_EXAMPLE_WLAN_FAST_CONNECT
#include "wlan_fast_connect/example_wlan_fast_connect.h"
#if defined(CONFIG_FAST_DHCP) && CONFIG_FAST_DHCP
Expand Down Expand Up @@ -196,10 +192,6 @@ extern int rltk_set_mode_posthandle(rtw_mode_t curr_mode, rtw_mode_t next_mode,
#ifdef CONFIG_PMKSA_CACHING
extern int wifi_set_pmk_cache_enable(unsigned char value);
#endif
#if defined(CONFIG_MATTER) && CONFIG_MATTER
extern u8 matter_wifi_trigger;
extern void matter_wifi_autoreconnect_hdl(rtw_security_t security_type, char *ssid, int ssid_len, char *password, int password_len, int key_id);
#endif

//----------------------------------------------------------------------------//
static int wifi_connect_local(rtw_network_info_t *pWifi)
Expand Down Expand Up @@ -3604,11 +3596,6 @@ int wifi_config_autoreconnect(__u8 mode, __u8 retry_times, __u16 timeout)
if (mode == RTW_AUTORECONNECT_DISABLE) {
p_wlan_autoreconnect_hdl = NULL;
}
#if defined(CONFIG_MATTER) && CONFIG_MATTER
else if (matter_wifi_trigger) {
p_wlan_autoreconnect_hdl = matter_wifi_autoreconnect_hdl;
}
#endif
else {
p_wlan_autoreconnect_hdl = wifi_autoreconnect_hdl;
}
Expand Down
Loading

0 comments on commit 302d27d

Please sign in to comment.