From cd13e10f5800e914c914eac1b35b13967cb5540a Mon Sep 17 00:00:00 2001 From: Wang_Weigen Date: Thu, 14 Apr 2022 15:18:45 +0800 Subject: [PATCH] repair the pin read of E18 for zigbee --- APP_Framework/Framework/connection/wifi/adapter_wifi.c | 6 +++--- APP_Framework/Framework/connection/wifi/esp07s_wifi/Kconfig | 2 +- APP_Framework/Framework/connection/zigbee/e18/e18.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/APP_Framework/Framework/connection/wifi/adapter_wifi.c b/APP_Framework/Framework/connection/wifi/adapter_wifi.c index c4fab060a..b1f9f7d1f 100644 --- a/APP_Framework/Framework/connection/wifi/adapter_wifi.c +++ b/APP_Framework/Framework/connection/wifi/adapter_wifi.c @@ -156,14 +156,14 @@ int AdapterWifiTest(void) AdapterDeviceOpen(adapter); - AdapterDeviceControl(adapter, OPE_INT, &baud_rate); + // AdapterDeviceControl(adapter, OPE_INT, &baud_rate); AdapterDeviceSetUp(adapter); - AdapterDeviceSetAddr(adapter, "192.168.66.253", "255.255.255.0", "192.168.66.1"); + AdapterDeviceSetAddr(adapter, "192.168.64.253", "192.168.66.1", "255.255.252.0"); AdapterDevicePing(adapter, "36.152.44.95"); AdapterDeviceNetstat(adapter); - const char *ip = "192.168.66.211"; + const char *ip = "192.168.64.60"; const char *port = "12345"; enum NetRoleType net_role = CLIENT; enum IpType ip_type = IPV4; diff --git a/APP_Framework/Framework/connection/wifi/esp07s_wifi/Kconfig b/APP_Framework/Framework/connection/wifi/esp07s_wifi/Kconfig index 3c2bbfb7e..a54223b9b 100755 --- a/APP_Framework/Framework/connection/wifi/esp07s_wifi/Kconfig +++ b/APP_Framework/Framework/connection/wifi/esp07s_wifi/Kconfig @@ -10,7 +10,7 @@ if ADD_XIZI_FETURES config ADAPTER_ESP07S_DRIVER string "ESP07S device uart driver path" - default "/dev/usart2_dev2" + default "/dev/uart2_dev2" depends on !ADAPTER_ESP07S_DRIVER_EXTUART if ADAPTER_ESP07S_DRIVER_EXTUART diff --git a/APP_Framework/Framework/connection/zigbee/e18/e18.c b/APP_Framework/Framework/connection/zigbee/e18/e18.c index 12a52cf22..6d04f6e94 100644 --- a/APP_Framework/Framework/connection/zigbee/e18/e18.c +++ b/APP_Framework/Framework/connection/zigbee/e18/e18.c @@ -56,7 +56,7 @@ static int E18HardwareModeGet() PrivClose(pin_fd); - if(pin_stat.pin == GPIO_HIGH) { + if(pin_stat.val == GPIO_HIGH) { printf(" E18 as AT mode\n"); return E18_AS_AT_MODE; } else {