Merge branch 'nw_split_linux_wip3' into 'master'

esp-hosted-fg: Refactor build system, add Python app support, and enhance networking

See merge request app-frameworks/esp_hosted!576

Author: mantriyogesh

esp_hosted_fg/common/esp_hosted_config.pb-c.c

@@ -7328,20 +7328,22 @@ const ProtobufCEnumDescriptor ctrl__wifi_bw__descriptor =
   ctrl__wifi_bw__value_ranges,
   NULL,NULL,NULL,NULL   /* reserved[1234] */
 };
-static const ProtobufCEnumValue ctrl__wifi_power_save__enum_values_by_number[3] =
+static const ProtobufCEnumValue ctrl__wifi_power_save__enum_values_by_number[4] =
 {
-  { "PS_Invalid", "CTRL__WIFI_POWER_SAVE__PS_Invalid", 0 },
+  { "NO_PS", "CTRL__WIFI_POWER_SAVE__NO_PS", 0 },
   { "MIN_MODEM", "CTRL__WIFI_POWER_SAVE__MIN_MODEM", 1 },
   { "MAX_MODEM", "CTRL__WIFI_POWER_SAVE__MAX_MODEM", 2 },
+  { "PS_Invalid", "CTRL__WIFI_POWER_SAVE__PS_Invalid", 3 },
 };
 static const ProtobufCIntRange ctrl__wifi_power_save__value_ranges[] = {
-{0, 0},{0, 3}
+{0, 0},{0, 4}
 };
-static const ProtobufCEnumValueIndex ctrl__wifi_power_save__enum_values_by_name[3] =
+static const ProtobufCEnumValueIndex ctrl__wifi_power_save__enum_values_by_name[4] =
 {
   { "MAX_MODEM", 2 },
   { "MIN_MODEM", 1 },
-  { "PS_Invalid", 0 },
+  { "NO_PS", 0 },
+  { "PS_Invalid", 3 },
 };
 const ProtobufCEnumDescriptor ctrl__wifi_power_save__descriptor =
 {
@@ -7350,9 +7352,9 @@ const ProtobufCEnumDescriptor ctrl__wifi_power_save__descriptor =
   "Ctrl_WifiPowerSave",
   "CtrlWifiPowerSave",
   "",
-  3,
+  4,
   ctrl__wifi_power_save__enum_values_by_number,
-  3,
+  4,
   ctrl__wifi_power_save__enum_values_by_name,
   1,
   ctrl__wifi_power_save__value_ranges,

esp_hosted_fg/common/include/esp_hosted_config.pb-c.h

@@ -25,7 +25,4 @@ enum custom_rpc_event_id {
 	/* Add more event IDs as needed */
 };
 
-/* Maximum size for RPC data */
-#define RPC_USER_SPECIFIC_EVENT_DATA_SIZE                1024
-
 #endif /* __ESP_HOSTED_RPC_H__ */

esp_hosted_fg/common/include/esp_hosted_custom_rpc.h

@@ -31,9 +31,10 @@ enum Ctrl_WifiBw {
 }
 
 enum Ctrl_WifiPowerSave {
-	PS_Invalid = 0;
+	NO_PS = 0;
 	MIN_MODEM = 1;
 	MAX_MODEM = 2;
+	PS_Invalid = 3;
 }
 
 enum Ctrl_WifiSecProt {

esp_hosted_fg/common/proto/esp_hosted_config.proto

@@ -455,10 +455,10 @@ int esp_cli_register_cmds()
 #ifdef CONFIG_ESP_HOSTED_COPROCESSOR
 #ifdef CONFIG_SLAVE_MANAGES_WIFI
 	app_register_all_wifi_commands();
-#endif
 	app_register_iperf_commands();
 	app_register_ping_commands();
 	app_register_iperf_hook_func(iperf_hook_show_wifi_stats);
+#endif
 #endif
 	return 0;
 }

esp_hosted_fg/common/utils/esp_hosted_cli.c

@@ -248,6 +248,7 @@ $ sudo ./hosted_daemon.out -f
 - Shows how to handle custom responses and events
 
 > [!NOTE]
+>
 > 1. Provides APIs for sending packed data between host and ESP device.
 > 2. User is responsible for serializing data before sending and deserializing after receiving.
 
@@ -288,10 +289,12 @@ It uses underlying control path API for reliable communication.
 - Host
   - Add your custom `requests` or `events` in [app_custom_rpc.c](../../host/linux/host_control/c_support/app_custom_rpc.c) and [app_custom_rpc.h](../../host/linux/host_control/c_support/app_custom_rpc.h).
   - Optionally, add your own Request and Message ID handling functions similar to the existing demo functions
-  > [!CAUTION]
+
+  > [!CAUTION] Custom RPC Request - Response
   >
   > 1. The handlers in these requests should be as concise as possible.
   > 2. Although it is not interrupt context, try not to have blocking calls in the response handler, as this function is called as callback.
+
 - Slave
   - In [slave_control.c](../../esp/esp_driver/network_adapter/main/slave_control.c), the default response handler for underlying RPC request handler is called with:
   ```c
@@ -302,9 +305,13 @@ It uses underlying control path API for reliable communication.
   register_custom_rpc_unserialised_req_handler(handle_custom_unserialised_rpc_request);
   ```
   - For your own message IDs, add cases in `handle_custom_unserialised_rpc_request()`
-  > [!CAUTION]
+
+  > [!CAUTION] Custom RPC events
   >
   > 1. The handlers in these requests should be as concise as possible.
   > 2. Although it is not interrupt context, try not to have blocking calls in the response handler, as this function is called as callback.
+  > 3. Refrain sending any synchronous RPC request as this would make it dead block (RPC Request `without` a response function callback registered - > `Sync RPC Req`)
+  > 4. Sending any 'asynchronous' RPC request is supported (RPC Request `with` a response function callback registered - > `Async RPC Req`)
+
   - You can also trigger events instead of immediate responses as demonstrated in `CUSTOM_RPC_REQ_ID__ECHO_BACK_AS_EVENT`
   - To add your own event, you can re-use `create_and_send_custom_rpc_unserialised_event()`

esp_hosted_fg/docs/common/c_demo.md

@@ -150,18 +150,21 @@ static void send_wifi_event_data_to_host(int event, void *event_data, int event_
 #endif
 }
 
-static bool wifi_is_provisioned(void)
+static bool wifi_is_provisioned(wifi_config_t *wifi_cfg)
 {
-	wifi_config_t wifi_cfg = {0};
+	if (!wifi_cfg) {
+		ESP_LOGI(TAG, "NULL wifi cfg passed, ignore");
+		return false;
+	}
 
-	if (esp_wifi_get_config(WIFI_IF_STA, &wifi_cfg) != ESP_OK) {
+	if (esp_wifi_get_config(WIFI_IF_STA, wifi_cfg) != ESP_OK) {
 		ESP_LOGI(TAG, "Wifi get config failed");
 		return false;
 	}
 
-	ESP_LOGI(TAG, "SSID: %s", wifi_cfg.sta.ssid);
+	ESP_LOGI(TAG, "SSID: %s", wifi_cfg->sta.ssid);
 
-	if (strlen((const char *) wifi_cfg.sta.ssid)) {
+	if (strlen((const char *) wifi_cfg->sta.ssid)) {
 		ESP_LOGI(TAG, "Wifi provisioned");
 		return true;
 	}
@@ -174,13 +177,14 @@ esp_err_t esp_hosted_set_sta_config(wifi_interface_t iface, wifi_config_t *cfg)
 {
 
 	wifi_config_t current_config = {0};
-	if (!wifi_is_provisioned()) {
-		ESP_LOGI(TAG, "Provisoning new Wi-Fi config");
+	if (!wifi_is_provisioned(&current_config)) {
 		if (esp_wifi_set_config(WIFI_IF_STA, cfg) != ESP_OK) {
 			ESP_LOGW(TAG, "not provisioned and failed to set wifi config");
+		} else {
+			ESP_LOGI(TAG, "Provisioned new Wi-Fi config");
+			prev_wifi_config_valid = false;
 		}
 	}
-	prev_wifi_config_valid = false;
 
 	if (!is_wifi_config_equal(cfg, &current_config)) {
 		new_config_recvd = 1;
@@ -1890,11 +1894,8 @@ static esp_err_t req_set_power_save_mode_handler (CtrlMsg *req,
 	resp->payload_case = CTRL_MSG__PAYLOAD_RESP_SET_POWER_SAVE_MODE;
 	resp->resp_set_power_save_mode = resp_payload;
 
-	/*
-	 * WIFI_PS_NONE mode can not use in case of coex i.e. Wi-Fi+BT/BLE.
-	 * By default ESP has WIFI_PS_MIN_MODEM power save mode
-	 */
-	if ((req->req_set_power_save_mode->mode == WIFI_PS_MIN_MODEM) ||
+	if ((req->req_set_power_save_mode->mode == WIFI_PS_NONE) ||
+	    (req->req_set_power_save_mode->mode == WIFI_PS_MIN_MODEM) ||
 	    (req->req_set_power_save_mode->mode == WIFI_PS_MAX_MODEM)) {
 		ret = esp_wifi_set_ps(req->req_set_power_save_mode->mode);
 		if (ret) {
@@ -2373,7 +2374,9 @@ static esp_err_t req_get_country_code_handler (CtrlMsg *req,
 
 	ret = esp_wifi_get_country_code(country_code);
 	if (ret == ESP_OK) {
+		country_code[COUNTRY_CODE_LEN-1] = '\0';
 		resp_payload->country.data = (uint8_t *)country_code;
+		ESP_LOGI(TAG,"Returning %s", country_code);
 		resp_payload->country.len = COUNTRY_CODE_LEN;
 		resp_payload->resp = SUCCESS;
 	} else {

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

@@ -44,20 +44,6 @@
 #define MAC_LEN                 6
 #define VENDOR_OUI_BUF          3
 
-/* Define max allowed bytes for the user RPC event data */
-#define RPC_USER_SPECIFIC_EVENT_DATA_SIZE 1024
-
-/* Structure for the user-specific RPC events */
-struct rpc_user_specific_event_t {
-	int32_t resp;
-	int32_t int_1;
-	int32_t int_2;
-	uint32_t uint_1;
-	uint32_t uint_2;
-	uint16_t data_len;
-	uint8_t data[RPC_USER_SPECIFIC_EVENT_DATA_SIZE];
-};
-
 typedef struct {
 	uint8_t ssid[SSID_LENGTH];
 	uint8_t pwd[PASSWORD_LENGTH];

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

@@ -0,0 +1,63 @@
+CC = gcc
+
+# Compiler and linker flags
+CROSS_COMPILE :=
+CFLAGS = -Wall -g -fPIC
+LDFLAGS = -lpthread -lrt
+
+# Directory paths
+DIR_ROOT = $(CURDIR)/../..
+DIR_COMMON = $(DIR_ROOT)/common
+DIR_COMPONENTS = $(DIR_ROOT)/host/components
+DIR_SERIAL = $(DIR_ROOT)/host/virtual_serial_if
+DIR_LINUX_PORT = $(DIR_ROOT)/host/linux/port
+DIR_CONTROL_LIB = $(DIR_ROOT)/host/control_lib
+
+# Include paths
+INCLUDE += -I$(DIR_COMMON)/protobuf-c
+INCLUDE += -I$(DIR_COMMON)/include
+INCLUDE += -I$(DIR_CONTROL_LIB)/include
+INCLUDE += -I$(DIR_CONTROL_LIB)/src/include
+INCLUDE += -I$(DIR_SERIAL)/include
+INCLUDE += -I$(DIR_COMPONENTS)/include
+INCLUDE += -I$(DIR_LINUX_PORT)/include
+
+# Source files for the core library
+CORE_SRC = $(DIR_COMMON)/protobuf-c/protobuf-c/protobuf-c.c
+CORE_SRC += $(DIR_COMMON)/esp_hosted_config.pb-c.c
+CORE_SRC += $(DIR_CONTROL_LIB)/src/ctrl_core.c
+CORE_SRC += $(DIR_CONTROL_LIB)/src/ctrl_api.c
+CORE_SRC += $(DIR_SERIAL)/src/serial_if.c
+CORE_SRC += $(DIR_COMPONENTS)/src/esp_queue.c
+CORE_SRC += $(DIR_LINUX_PORT)/src/platform_wrapper.c
+
+# Target library
+LIBCONTROL = libesp_hosted_rpc.so
+LIBCONTROL_STATIC = libesp_hosted_rpc.a
+
+.PHONY: all clean shared static
+
+all: shared static
+
+shared: $(LIBCONTROL)
+
+static: $(LIBCONTROL_STATIC)
+
+# Build the shared library
+$(LIBCONTROL): $(CORE_SRC)
+	$(CROSS_COMPILE)$(CC) $(CFLAGS) $(INCLUDE) -shared -o $@ $^ $(LDFLAGS)
+
+# Build the static library
+$(LIBCONTROL_STATIC): $(CORE_SRC:.c=.o)
+	ar rcs $@ $^
+
+%.o: %.c
+	$(CROSS_COMPILE)$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
+
+install: all
+	@mkdir -p $(DIR_ROOT)/lib
+	@cp -f $(LIBCONTROL) $(LIBCONTROL_STATIC) $(DIR_ROOT)/lib/
+
+clean:
+	rm -f $(LIBCONTROL) $(LIBCONTROL_STATIC) $(CORE_SRC:.c=.o) 
+	

esp_hosted_fg/host/control_lib/Makefile

@@ -242,6 +242,7 @@ typedef enum {
 } wifi_bandwidth_e;
 
 typedef enum {
+	WIFI_PS_NONE = CTRL__WIFI_POWER_SAVE__NO_PS,
 	WIFI_PS_MIN_MODEM = CTRL__WIFI_POWER_SAVE__MIN_MODEM,
 	WIFI_PS_MAX_MODEM = CTRL__WIFI_POWER_SAVE__MAX_MODEM,
 	WIFI_PS_INVALID,