Skip to content

Commit 302d27d

Browse files
Merge pull request #6 from xshuqun/ameba/matter_support
[eco:matter] add matter support
2 parents 3bd13dc + 9f805d7 commit 302d27d

File tree

31 files changed

+5808
-94
lines changed

31 files changed

+5808
-94
lines changed

README.md

+3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ GitHub `ameba-rtos-z2` repository is the development framework for AmebaZ2 and A
1313
* :books: [Z2 Datasheet](https://github.com/Ameba-AIoT/ameba-rtos-z2/blob/main/doc/RTL8720Cx-VH2_Datasheet_V1.0_20230224.pdf)
1414
* :books: [Z2plus Datasheet](https://github.com/Ameba-AIoT/ameba-rtos-z2/blob/main/doc/Realtek_AmebaZII+_Datasheet_v1.1.pdf)
1515

16+
# Matter Support
17+
Please check out [ameba-rtos-matter](https://github.com/Ameba-AIoT/ameba-rtos-matter) to learn more about Matter support.
18+
1619
# Setup Build Environments
1720

1821
## GCC Environment on Windows

component/common/api/wifi/wifi_conf.c

-13
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
#include <device_lock.h>
1616
#include <wlan_intf.h>
1717

18-
#if defined(CONFIG_MATTER) && CONFIG_MATTER
19-
#include "chip_porting.h"
20-
#endif
21-
2218
#if CONFIG_EXAMPLE_WLAN_FAST_CONNECT
2319
#include "wlan_fast_connect/example_wlan_fast_connect.h"
2420
#if defined(CONFIG_FAST_DHCP) && CONFIG_FAST_DHCP
@@ -196,10 +192,6 @@ extern int rltk_set_mode_posthandle(rtw_mode_t curr_mode, rtw_mode_t next_mode,
196192
#ifdef CONFIG_PMKSA_CACHING
197193
extern int wifi_set_pmk_cache_enable(unsigned char value);
198194
#endif
199-
#if defined(CONFIG_MATTER) && CONFIG_MATTER
200-
extern u8 matter_wifi_trigger;
201-
extern void matter_wifi_autoreconnect_hdl(rtw_security_t security_type, char *ssid, int ssid_len, char *password, int password_len, int key_id);
202-
#endif
203195

204196
//----------------------------------------------------------------------------//
205197
static int wifi_connect_local(rtw_network_info_t *pWifi)
@@ -3604,11 +3596,6 @@ int wifi_config_autoreconnect(__u8 mode, __u8 retry_times, __u16 timeout)
36043596
if (mode == RTW_AUTORECONNECT_DISABLE) {
36053597
p_wlan_autoreconnect_hdl = NULL;
36063598
}
3607-
#if defined(CONFIG_MATTER) && CONFIG_MATTER
3608-
else if (matter_wifi_trigger) {
3609-
p_wlan_autoreconnect_hdl = matter_wifi_autoreconnect_hdl;
3610-
}
3611-
#endif
36123599
else {
36133600
p_wlan_autoreconnect_hdl = wifi_autoreconnect_hdl;
36143601
}

0 commit comments

Comments
 (0)