Эх сурвалжийг харах

[Improve][Moduralization][Module_Wifi]

2021.03.15 / Folus Wen

Actions:
1. Wpa.conf add bgscan configuration.
2. wpa_supplicant recompile for roam function.

Files:
1. As follow commit history

Image version: V0.17
Image checksum: XXXXXXXX

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX
FolusWen 4 жил өмнө
parent
commit
55e0af692b

+ 1 - 1
EVSE/GPL/Makefile

@@ -77,7 +77,7 @@ WPA :
 	cp wpa_supplicant-2.6/wpa_supplicant/wpa_supplicant.conf ../rootfs/root/
 	cd hostapd-2.6/hostapd;make CC=$(CROSS_COMPILE)gcc
 	cd hostapd-2.6/hostapd;make install DESTDIR=$(shell pwd)/hostapd-2.6/release
-	cp hostapd-2.6/release/release/usr/local/bin/hostapd ../rootfs/usr/bin/
+	cp hostapd-2.6/release/usr/local/bin/hostapd ../rootfs/usr/bin/
 
 WirelessTool :
 	echo "wireless_tools.29"

+ 2 - 2
EVSE/GPL/libnl-1.1.4/config.log

@@ -12,9 +12,9 @@ generated by GNU Autoconf 2.68.  Invocation command line was
 
 hostname = am335x_ide
 uname -m = x86_64
-uname -r = 4.15.0-88-generic
+uname -r = 4.15.0-136-generic
 uname -s = Linux
-uname -v = #88-Ubuntu SMP Tue Feb 11 20:11:34 UTC 2020
+uname -v = #140-Ubuntu SMP Thu Jan 28 05:20:47 UTC 2021
 
 /usr/bin/uname -p = unknown
 /bin/uname -X     = unknown

BIN
EVSE/GPL/wpa_supplicant-2.6/release/usr/local/sbin/wpa_passphrase


BIN
EVSE/GPL/wpa_supplicant-2.6/release/usr/local/sbin/wpa_supplicant


+ 2 - 0
EVSE/GPL/wpa_supplicant-2.6/wpa_supplicant/.config

@@ -548,3 +548,5 @@ CONFIG_PEERKEY=y
 
 # Support Multi Band Operation
 #CONFIG_MBO=y
+CONFIG_BGSCAN_SIMPLE=y
+CONFIG_BGSCAN_LEARN=y

+ 20 - 0
EVSE/GPL/wpa_supplicant-2.6/wpa_supplicant/bgscan.d

@@ -0,0 +1,20 @@
+bgscan.o: bgscan.c \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/utils/includes.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/utils/build_config.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/utils/common.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/utils/os.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/utils/wpa_debug.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/utils/wpabuf.h \
+ wpa_supplicant_i.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/utils/list.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/common/defs.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/common/sae.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/common/wpa_ctrl.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/wps/wps_defs.h \
+ config_ssid.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/eap_peer/eap_config.h \
+ wmm_ac.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/common/ieee802_11_defs.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/utils/common.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/drivers/driver.h \
+ bgscan.h

+ 21 - 0
EVSE/GPL/wpa_supplicant-2.6/wpa_supplicant/bgscan_learn.d

@@ -0,0 +1,21 @@
+bgscan_learn.o: bgscan_learn.c \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/utils/includes.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/utils/build_config.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/utils/common.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/utils/os.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/utils/wpa_debug.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/utils/wpabuf.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/utils/eloop.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/utils/list.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/common/ieee802_11_defs.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/utils/common.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/drivers/driver.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/common/defs.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/utils/list.h \
+ config_ssid.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/eap_peer/eap_config.h \
+ wpa_supplicant_i.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/common/sae.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/common/wpa_ctrl.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/wps/wps_defs.h \
+ wmm_ac.h driver_i.h scan.h bgscan.h

+ 20 - 0
EVSE/GPL/wpa_supplicant-2.6/wpa_supplicant/bgscan_simple.d

@@ -0,0 +1,20 @@
+bgscan_simple.o: bgscan_simple.c \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/utils/includes.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/utils/build_config.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/utils/common.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/utils/os.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/utils/wpa_debug.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/utils/wpabuf.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/utils/eloop.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/drivers/driver.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/common/defs.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/common/ieee802_11_defs.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/utils/common.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/utils/list.h \
+ config_ssid.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/eap_peer/eap_config.h \
+ wpa_supplicant_i.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/common/sae.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/common/wpa_ctrl.h \
+ /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/GPL/wpa_supplicant-2.6/src/wps/wps_defs.h \
+ wmm_ac.h driver_i.h scan.h bgscan.h

+ 2 - 0
EVSE/GPL/wpa_supplicant-2.6/wpa_supplicant/defconfig

@@ -548,3 +548,5 @@ CONFIG_PEERKEY=y
 
 # Support Multi Band Operation
 #CONFIG_MBO=y
+CONFIG_BGSCAN_SIMPLE=y
+CONFIG_BGSCAN_LEARN=y

BIN
EVSE/GPL/wpa_supplicant-2.6/wpa_supplicant/events.o


BIN
EVSE/GPL/wpa_supplicant-2.6/wpa_supplicant/wpa_passphrase


BIN
EVSE/GPL/wpa_supplicant-2.6/wpa_supplicant/wpa_supplicant


BIN
EVSE/GPL/wpa_supplicant-2.6/wpa_supplicant/wpa_supplicant.o


+ 10 - 2
EVSE/Modularization/Module_Wifi.c

@@ -260,7 +260,7 @@ int isValidCheckSum(uint8_t *message);
 char *Support_InterfaceSTA[2]	= {"mlan0", "wlan0"};
 char *Support_InterfaceAP[1]	= {"uap0"};
 char *valid_Internet[2]			= {"8.8.8.8", "180.76.76.76"};
-char *Version_And_Date[2]		= {"V0.16","2021-01-13"};
+char *Version_And_Date[2]		= {"V0.17","2021-03-15"};
 int protocol_Version [] 		= {0,7,0};
 
 int StoreLogMsg(const char *fmt, ...)
@@ -782,6 +782,8 @@ int setWPAconf()
 					strcat(buffer, "network={\n    ssid=\"");
 					strcat(buffer, (char*)Wifi_A.ssid);
 					strcat(buffer, "\"\n    key_mgmt=WPA-EAP WPA-PSK \n");
+					strcat(buffer, "    bgscan=\"simple:10:-60:60\" \n");
+					strcat(buffer, "    bgscan=\"learn:10:-60:60:/etc/wpa.bgscan\"\n");
 					strcat(buffer, "    psk=\"");
 					strcat(buffer, (char*)Wifi_A.passwd);
 					strcat(buffer, "\"\n}\n\n");
@@ -795,12 +797,16 @@ int setWPAconf()
 					strcat(buffer, "    wep_key0=\"");
 					strcat(buffer, (char*)Wifi_A.passwd);
 					strcat(buffer, "\"\n    auth_alg=OPEN SHARED\n");
+					strcat(buffer, "    bgscan=\"simple:10:-60:60\"\n");
+					strcat(buffer, "    bgscan=\"learn:10:-60:60:/etc/wpa.bgscan\"");
 					strcat(buffer, "\n}\n\n");
 				}
 
 				strcat(buffer, "network={\n    ssid=\"");
 				strcat(buffer, (char*)Wifi_A.ssid);
 				strcat(buffer, "\"\n    key_mgmt=NONE");
+				strcat(buffer, "\n    bgscan=\"simple:10:-60:60\"");
+				strcat(buffer, "\n    bgscan=\"learn:10:-60:60:/etc/wpa.bgscan\"");
 				strcat(buffer, "\n}");
 			}
 			else
@@ -808,6 +814,8 @@ int setWPAconf()
 				strcat(buffer, "network={\n    ssid=\"");
 				strcat(buffer, (char*)Wifi_A.ssid);
 				strcat(buffer, "\"\n    key_mgmt=NONE");
+				strcat(buffer, "\n    bgscan=\"simple:10:-60:60\"");
+				strcat(buffer, "\n    bgscan=\"learn:10:-60:60:/etc/wpa.bgscan\"");
 				strcat(buffer, "\n}");
 			}
 
@@ -4513,7 +4521,7 @@ void proc_sta()
 				ShmSysConfigAndInfo->SysConfig.AthInterface.WifiNetworkConn=0;
 				cnt_pingDNS_Fail = 0;
 
-				DEBUG_INFO("Ping DNS failed...");
+				DEBUG_INFO("Ping DNS failed...\n");
 				memset(ShmSysConfigAndInfo->SysConfig.AthInterface.WifiSubmaskAddress, 0, sizeof ShmSysConfigAndInfo->SysConfig.AthInterface.WifiSubmaskAddress);
 				memset(ShmSysConfigAndInfo->SysConfig.AthInterface.WifiGatewayAddress, 0, sizeof ShmSysConfigAndInfo->SysConfig.AthInterface.WifiGatewayAddress);
 				memset(ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMacAddress, 0, sizeof ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMacAddress);

+ 0 - 0
EVSE/rootfs/etc/wpa.bgscan


BIN
EVSE/rootfs/root/wpa_supplicant