fix(events): FG: Always allow wifi events to host

Fixed the power save incorrect condition while setting
Removed the C2 wifi only sdkconfig, as default also uses same values.
Fix build issues for C2 and C3, to not include lwip hook file in building

Author: mantriyogesh

esp_hosted_fg/esp/esp_driver/network_adapter/main/Kconfig.projbuild

@@ -638,7 +638,7 @@ menu "Example Configuration"
 
 	choice "Wi-Fi control"
 		prompt "Wi-Fi control"
-		default BOTH_MANAGES_WIFI
+		default SLAVE_MANAGES_WIFI
 
 		config SLAVE_MANAGES_WIFI
 			bool "Slave manages Wi-Fi"

esp_hosted_fg/esp/esp_driver/network_adapter/main/slave_control.c

@@ -145,9 +145,7 @@ void vTimerCallback( TimerHandle_t xTimer )
 
 static void send_wifi_event_data_to_host(int event, void *event_data, int event_size)
 {
-#ifndef CONFIG_SLAVE_MANAGES_WIFI
-		send_event_data_to_host(event, event_data, event_size);
-#endif
+	send_event_data_to_host(event, event_data, event_size);
 }
 
 static bool wifi_is_provisioned(wifi_config_t *wifi_cfg)
@@ -407,15 +405,13 @@ static void station_event_handler(void *arg, esp_event_base_t event_base,
 		station_got_ip = 0;
 	#endif
 
-	#ifndef CONFIG_SLAVE_MANAGES_WIFI
-		wifi_event_sta_disconnected_t * disconnected_event =
-			(wifi_event_sta_disconnected_t *) event_data;
+	wifi_event_sta_disconnected_t * disconnected_event =
+		(wifi_event_sta_disconnected_t *) event_data;
 
-		send_wifi_event_data_to_host(CTRL_MSG_ID__Event_StationDisconnectFromAP,
-				disconnected_event, sizeof(wifi_event_sta_disconnected_t));
-		ESP_LOGI(TAG, "Station disconnected, reason[%u]",
-				disconnected_event->reason);
-	#endif
+	send_wifi_event_data_to_host(CTRL_MSG_ID__Event_StationDisconnectFromAP,
+			disconnected_event, sizeof(wifi_event_sta_disconnected_t));
+	ESP_LOGI(TAG, "Station disconnected, reason[%u]",
+			disconnected_event->reason);
 
 #ifdef CONFIG_NETWORK_SPLIT_ENABLED
 		send_dhcp_dns_info_to_host(0, 0);
@@ -464,13 +460,12 @@ static void station_event_handler(void *arg, esp_event_base_t event_base,
 		}
 		sta_connect_retry = 0;
 		prev_wifi_config_valid = true;
-		#ifndef CONFIG_SLAVE_MANAGES_WIFI
-			/* Event should not be triggered if event handler is
-			 * called as part of host triggered procedure like sta_disconnect etc
-			 **/
-			send_wifi_event_data_to_host(CTRL_MSG_ID__Event_StationConnectedToAP,
-					connected_event, sizeof(wifi_event_sta_connected_t));
-		#endif
+
+		/* Event should not be triggered if event handler is
+		 * called as part of host triggered procedure like sta_disconnect etc
+		 **/
+		send_wifi_event_data_to_host(CTRL_MSG_ID__Event_StationConnectedToAP,
+				connected_event, sizeof(wifi_event_sta_connected_t));
 
 		memcpy(&lkg_sta_connected_event, connected_event, sizeof(wifi_event_sta_connected_t));
 

esp_hosted_fg/esp/esp_driver/network_adapter/sdkconfig.defaults.esp32c2

@@ -8,11 +8,11 @@ CONFIG_BT_ENABLED=n
 CONFIG_BT_CONTROLLER_ONLY=y
 CONFIG_BT_LE_SLEEP_ENABLE=y
 
-# 3.1 BLE over SPI/SDIO
+# 2.1 BLE over SPI/SDIO
 #-----------------------
 CONFIG_BT_LE_HCI_INTERFACE_USE_RAM=y
 
-# 3.2 BLE over UART
+# 2.2 BLE over UART
 #-------------------
 #UART pins, Enable below config, delete sdkconfig and rebuild
 #CONFIG_BT_LE_HCI_INTERFACE_USE_UART=y
@@ -21,43 +21,23 @@ CONFIG_BT_LE_HCI_INTERFACE_USE_RAM=y
 #CONFIG_BT_LE_HCI_UART_RX_PIN=18
 
 
-# 4. Partition Table
+# 3. Partition Table
 #--------------------
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.esp32c2.csv"
 
-# 5. Mempool
+# 4. Mempool
 #------------
 CONFIG_ESP_CACHE_MALLOC=y
 
 
-# 6.1 LWIP split
+# 5 LWIP split
 #---------------
 
 CONFIG_NETWORK_SPLIT_ENABLED=n
-#CONFIG_LWIP_TCP_LOCAL_PORT_RANGE_START=61440
-#CONFIG_LWIP_TCP_LOCAL_PORT_RANGE_END=65535
-#CONFIG_LWIP_UDP_LOCAL_PORT_RANGE_START=61440
-#CONFIG_LWIP_UDP_LOCAL_PORT_RANGE_END=65535
 
-#CONFIG_ESP_DEFAULT_LWIP_SLAVE=y
 
-# 6.2 LWIP split examples
-#-------------------------
-CONFIG_ESP_HOSTED_COPROCESSOR_EXAMPLE_MQTT=n
-
-
-# 7. Transport config
-#---------------------
-# CONFIG_ESP_SDIO_NSEND_PSAMPLE=y
-# CONFIG_ESP_SDIO_DEFAULT_SPEED=y
-# CONFIG_ESP_SDIO_STREAMING_MODE=n
-
-# For SPI Full duplex C6 on ESP32-P4-Function-EV-Board, please uncomment below
-#CONFIG_C6_SPI_WITH_P4=y
-
-
-# 8. Wifi config
+# 6. Wifi config
 #----------------
 #CONFIG_WIFI_CMD_BASIC_ONLY=y
 
@@ -66,64 +46,44 @@ CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=16
 CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=16
 CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
 CONFIG_ESP_WIFI_TX_BA_WIN=8
+#CONFIG_ESP_WIFI_TX_BA_WIN=16
 CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
 CONFIG_ESP_WIFI_RX_BA_WIN=8
+#CONFIG_ESP_WIFI_RX_BA_WIN=14
 
 CONFIG_ESP_WIFI_RX_IRAM_OPT=y
 CONFIG_ESP_WIFI_IRAM_OPT=y
 
-# 9. LWIP config
-#----------------
-#CONFIG_LWIP_TCP_SND_BUF_DEFAULT=11520
-#CONFIG_LWIP_TCP_WND_DEFAULT=11520
-#CONFIG_LWIP_TCP_RECVMBOX_SIZE=16
-#CONFIG_LWIP_UDP_RECVMBOX_SIZE=16
-#CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32
-#CONFIG_LWIP_TCP_SACK_OUT=y
-#CONFIG_LWIP_TCPIP_CORE_LOCKING=y
-#CONFIG_LWIP_TCPIP_CORE_LOCKING_INPUT=y
-
 
-# 10. Optimizations
+# 7. Optimizations
 #-------------------
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 #CONFIG_COMPILER_OPTIMIZATION_PERF=y
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
-#CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 
 
-# 11. Stats
+# 8. Stats
 #-----------
-#CONFIG_ESP_HOSTED_FUNCTION_PROFILING=y
 CONFIG_ESP_PKT_STATS=y
 
-# 12. Priorities
-#----------------
-#CONFIG_IPERF_TRAFFIC_TASK_PRIORITY=18
-#CONFIG_IPERF_REPORT_TASK_PRIORITY=18
-#CONFIG_ESP_DEFAULT_TASK_PRIO=18
-
 
-#13. Mem optimizations
+# 9. Mem optimizations
 #---------------------
 CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
 CONFIG_ESP32_DEFAULT_CPU_FREQ_120=y
 CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=120
 CONFIG_FREERTOS_UNICORE=y
 
-#14. C2 specific opts
+#10. C2 specific opts
 #---------------------
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=n
 CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y
 
 CONFIG_ESP_DEFAULT_TASK_STACK_SIZE=2048
-#CONFIG_C2_C5_MODULE_SUB_BOARD=y
 
-#15. C2 26 MHz XTAL chips
+#11. C2 26 MHz XTAL chips
 # C2 generally in MP has 26MHz.
 # If your C2 has 40MHz, just comment below lines
 #---------------------------------
 CONFIG_SOC_XTAL_SUPPORT_26M=y
 CONFIG_XTAL_FREQ_26=y
-
-

esp_hosted_fg/esp/esp_driver/network_adapter/sdkconfig.defaults.esp32c2.wifionly

@@ -1593,7 +1593,6 @@ int ctrl_app_send_req(ctrl_cmd_t *app_req)
 			CTRL_ALLOC_ASSIGN(CtrlMsgReqSetMode, req_set_power_save_mode);
 
 			if ((p->ps_mode < WIFI_PS_NONE) ||
-			    (p->ps_mode < WIFI_PS_MIN_MODEM) ||
 			    (p->ps_mode >= WIFI_PS_INVALID)) {
 				command_log("Invalid power save mode\n");
 				failure_status = CTRL_ERR_INCORRECT_ARG;

esp_hosted_fg/host/control_lib/src/ctrl_core.c

@@ -182,17 +182,16 @@ def ctrl_app_event_callback(app_event):
 
 		if not is_network_split_on():
 			print(" Network " + STA_INTERFACE + " is up. starting dhclient")
-			nw_helper_func.run_dhclient_on_connected()
+			nw_helper_func.run_dhcp_on_connected()
 
 
 	elif app_event.contents.msg_id == CTRL_MSGID.CTRL_EVENT_STATION_DISCONNECT_FROM_AP.value:
 		ssid = app_event.contents.control_data.e_sta_disconn.ssid
-		print(" Station disconnected from AP: ssid[" + get_str(ssid) + "]")
+		if not g_network_down_printed:
+			print(" Station disconnected from AP: ssid[" + get_str(ssid) + "]")
+			g_network_down_printed = True
 
 		if not is_network_split_on():
-			if not g_network_down_printed:
-				print(" Network " + STA_INTERFACE + " is down. stopping dhclient")
-				g_network_down_printed = True
 			nw_helper_func.stop_dhclient_on_disconnected()
 
 		nw_helper_func.down_sta_netdev();
@@ -250,7 +249,7 @@ def ctrl_app_event_callback(app_event):
 				else:
 					nw_helper_func.down_sta_netdev()
 					if not g_network_down_printed:
-						print("Network " + STA_INTERFACE + " brought down")
+						print("Network " + STA_INTERFACE + " brought down!")
 						g_network_down_printed = True
 			else:
 				print("MAC address invalid, skip DHCP/DNS event.")
@@ -1220,7 +1219,7 @@ def test_sync_set_wifi_power_save_mode(psmode):
 
 
 def test_sync_set_wifi_power_save_mode_none():
-	return test_sync_set_wifi_power_save_mode(WIFI_PS_MODE.WIFI_PS_NONE_MODEM.value)
+	return test_sync_set_wifi_power_save_mode(WIFI_PS_MODE.WIFI_PS_NONE.value)
 
 
 def test_sync_set_wifi_power_save_mode_max():

esp_hosted_fg/host/linux/host_control/python_support/commands_lib.py

@@ -89,7 +89,7 @@ class WIFI_BW(Enum):
 
 
 class WIFI_PS_MODE(Enum):
-	WIFI_PS_MODE_NONE = 0
+	WIFI_PS_NONE = 0
 	WIFI_PS_MIN_MODEM = 1
 	WIFI_PS_MAX_MODEM = 2
 	WIFI_PS_INVALID = 3