ctxlink/wifi: Remove unwanted monitor wifi options.

blackmagic-debug · Jan 20, 2025 · 791891e · 791891e
1 parent ac6b1f2
commit 791891e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 36 deletions.
diff --git a/src/command.c b/src/command.c
@@ -113,7 +113,7 @@ const command_s cmd_list[] = {
 	{"battery", cmd_target_battery, "Reads the battery state"},
 #endif
 #ifdef PLATFORM_HAS_WIFI
-	{"wifi", cmd_wifi, "Show/Set Wi-Fi connection [-forget] [AP name,passphrase]"},
+	{"wifi", cmd_wifi, "Show/Set Wi-Fi connection [AP name,passphrase]"},
 #endif
 #ifdef ENABLE_RTT
 	{"rtt", cmd_rtt,

diff --git a/src/platforms/ctxlink/WiFi_Server.c b/src/platforms/ctxlink/WiFi_Server.c
@@ -698,7 +698,7 @@ void app_task_wait_spin(void)
 //
 // Using the passed arguments, attempt to connect to a Wi-Fi AP
 //
-void wifi_connect(int argc, const char **argv, char *buffer, uint32_t size, bool save)
+void wifi_connect(int argc, const char **argv, char *buffer, uint32_t size)
 {
 	char ssid[64] = {0};
 	char pass_phrase[64] = {0};
@@ -767,21 +767,18 @@ void wifi_connect(int argc, const char **argv, char *buffer, uint32_t size, bool
 		//
 		app_state = app_state_wait_for_wifi_connect;
 		m2m_wifi_connect_sc(ssid, strlen(ssid), M2M_WIFI_SEC_WPA_PSK, &pass_phrase, M2M_WIFI_CH_ALL);
-		//
-		// For now lets spin here calling app_tasks
-		//
-		uint32_t wait_timeout = 2000U;
-		while (1) {
-			platform_tasks();
-			if (app_state == app_state_spin)
-				break;
-			platform_delay(1);
-			if (wait_timeout-- == 0)
-				break;
-		}
 	}
 }
 
+//
+// Disconnect from network
+//
+void wifi_disconnect(void)
+{
+	app_state = app_state_wait_for_disconnect;
+	m2m_wifi_disconnect();
+}
+
 void handle_socket_bind_event(SOCKET *sock, bool *running_state)
 {
 	if (m2m_wifi_get_socket_event_data()->bindStatus == 0)

diff --git a/src/platforms/ctxlink/WiFi_Server.h b/src/platforms/ctxlink/WiFi_Server.h
@@ -46,7 +46,7 @@ uint8_t wifi_get_next(void);
 uint8_t wifi_get_next_to(uint32_t timeout);
 
 void wifi_get_ip_address(char *buffer, uint32_t size);
-void wifi_connect(int argc, const char **argv, char *buffer, uint32_t size, bool save);
+void wifi_connect(int argc, const char **argv, char *buffer, uint32_t size);
 void app_task_wait_spin(void);
 void wifi_disconnect(void);
 #ifdef __cplusplus

diff --git a/src/platforms/ctxlink/platform.c b/src/platforms/ctxlink/platform.c
@@ -163,27 +163,7 @@ const char *platform_wifi_state(int argc, const char **argv)
 	(void)argv;
 	memset(parameters, 0x00, sizeof(parameters));
 	if (argc > 1) {
-		bool forget = false;
-		bool save = false;
-		//
-		// Check for an option
-		//
-		if (argv[1][0] == '-') {
-			//
-			// two options are support:
-			//	-forget <- forget the current Wi-Fi connection
-			//  -save <- Save the parameters in NVM (Passed to the wifi_connect call)
-			//
-			if (argv[1][1] == 's')
-				save = true;
-			else if (argv[1][1] == 'f')
-				forget = true;
-		}
-		if (forget)
-			wifi_disconnect() ;
-		else
-			wifi_connect(argc, argv, parameters, sizeof(parameters), save);
-
+		wifi_connect(argc, argv, parameters, sizeof(parameters));
 		app_task_wait_spin();
 	}
 	wifi_get_ip_address(parameters, sizeof(parameters));