Basic WiFi scan menu done

main/menus/wifi.c

@@ -19,6 +19,7 @@
 #include "system_wrapper.h"
 #include "bootscreen.h"
 #include "wifi_connect.h"
+#include "wifi_connection.h"
 #include "wifi_ota.h"
 #include "graphics_wrapper.h"
 
@@ -40,6 +41,7 @@ void render_wifi_help(pax_buf_t* pax_buffer) {
 
 void wifi_show(xQueueHandle buttonQueue, pax_buf_t* pax_buffer, ILI9341* ili9341);
 void wifi_setup(xQueueHandle buttonQueue, pax_buf_t* pax_buffer, ILI9341* ili9341, bool scan);
+wifi_ap_record_t *wifi_scan_results(xQueueHandle buttonQueue, pax_buf_t* pax_buffer, ILI9341* ili9341, size_t num_aps, wifi_ap_record_t *aps);
 
 void menu_wifi(xQueueHandle buttonQueue, pax_buf_t* pax_buffer, ILI9341* ili9341) {
     menu_t* menu = menu_alloc("WiFi configuration");
@@ -137,10 +139,8 @@ void wifi_show(xQueueHandle buttonQueue, pax_buf_t* pax_buffer, ILI9341* ili9341
     char buffer[300];
     pax_noclip(pax_buffer);
     pax_background(pax_buffer, 0xFFFFFF);
-    snprintf(buffer, sizeof(buffer), "SSID is %s", ssid);
+    snprintf(buffer, sizeof(buffer), "WiFi SSID:\n%s\nWiFi password:\n%s", ssid, password);
-    pax_draw_text(pax_buffer, 0xFF000000, NULL, 18, 0, 20*0, buffer);
+    pax_draw_text(pax_buffer, 0xFF000000, NULL, 18, 0, 0, buffer);
-    snprintf(buffer, sizeof(buffer), "Password is %s", password);
-    pax_draw_text(pax_buffer, 0xFF000000, NULL, 18, 0, 20*1, buffer);
     ili9341_write(ili9341, pax_buffer->buf);
 
     bool quit = false;
@@ -165,11 +165,126 @@ void wifi_show(xQueueHandle buttonQueue, pax_buf_t* pax_buffer, ILI9341* ili9341
     }
 }
 
+wifi_ap_record_t *wifi_scan_results(xQueueHandle buttonQueue, pax_buf_t* pax_buffer, ILI9341* ili9341, size_t num_aps, wifi_ap_record_t *aps) {
+    menu_t *menu = menu_alloc("Select network");
+    wifi_ap_record_t *picked = NULL;
+    
+    render_wifi_help(pax_buffer);
+    
+    for (size_t i = 0; i < num_aps; i++) {
+        menu_insert_item(menu, (const char*) aps[i].ssid, NULL, (void *) (i + 1), -1);
+    }
+    
+    bool render = true;
+    size_t selection = 0;
+    while (1) {
+        rp2040_input_message_t buttonMessage = {0};
+        selection = -1;
+        if (xQueueReceive(buttonQueue, &buttonMessage, 16 / portTICK_PERIOD_MS) == pdTRUE) {
+            uint8_t pin = buttonMessage.input;
+            bool value = buttonMessage.state;
+            switch(pin) {
+                case RP2040_INPUT_JOYSTICK_DOWN:
+                    if (value) {
+                        menu_navigate_next(menu);
+                        render = true;
+                    }
+                    break;
+                case RP2040_INPUT_JOYSTICK_UP:
+                    if (value) {
+                        menu_navigate_previous(menu);
+                        render = true;
+                    }
+                    break;
+                case RP2040_INPUT_BUTTON_HOME:
+                case RP2040_INPUT_BUTTON_BACK:
+                    if (value) {
+                        selection = 0;
+                    }
+                    break;
+                case RP2040_INPUT_BUTTON_ACCEPT:
+                case RP2040_INPUT_JOYSTICK_PRESS:
+                case RP2040_INPUT_BUTTON_SELECT:
+                case RP2040_INPUT_BUTTON_START:
+                    if (value) {
+                        selection = (size_t) menu_get_callback_args(menu, menu_get_position(menu));
+                    }
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        if (render) {
+            menu_render(pax_buffer, menu, 0, 0, 320, 220, 0xFF2f55a8);
+            ili9341_write(ili9341, pax_buffer->buf);
+            render = false;
+        }
+
+        if (selection != (size_t) -1) {
+            if (selection == 0) {
+                break;
+            } else {
+                // You picked one, yay!
+                picked = &aps[selection-1];
+                break;
+            }
+            render = true;
+            selection = -1;
+            render_wifi_help(pax_buffer);
+        }
+    }
+    
+    menu_free(menu);
+    return picked;
+}
+
+// Sorts WiFi APs by RSSI (best RSSI first in the list).
+static int wifi_ap_sorter(const void *a0, const void *b0) {
+    const wifi_ap_record_t *a = a0;
+    const wifi_ap_record_t *b = b0;
+    return b->rssi - a->rssi;
+}
+
 void wifi_setup(xQueueHandle buttonQueue, pax_buf_t* pax_buffer, ILI9341* ili9341, bool scan) {
+    
+    char ssid[33] = {0};
+    char password[33] = {0};
     nvs_handle_t handle;
     nvs_open("system", NVS_READWRITE, &handle);
-    char ssid[33];
+    bool accepted = true;
-    char password[33];
+    
+    /* ==== scanning phase ==== */
+    if (scan) {
+        // Scan for networks.
+        wifi_ap_record_t *aps;
+        size_t n_aps = wifi_scan(&aps);
+        
+        // Sort them by RSSI.
+        qsort(aps, n_aps, sizeof(wifi_ap_record_t), wifi_ap_sorter);
+        
+        // Make a de-duplicated list.
+        wifi_ap_record_t *dedup = malloc(sizeof(wifi_ap_record_t) * n_aps);
+        size_t n_dedup = 0;
+        for (size_t i = 0; i < n_aps; ) {
+            for (size_t x = 0; x < n_dedup; x++) {
+                if (!strcmp((const char *) aps[i].ssid, (const char *) dedup[x].ssid)) goto cont;
+            }
+            dedup[n_dedup] = aps[i];
+            n_dedup ++;
+            cont:
+            i++;
+        }
+        
+        // Open a little menu for picking a network.
+        wifi_ap_record_t *pick = wifi_scan_results(buttonQueue, pax_buffer, ili9341, n_dedup, dedup);
+        if (!pick) {
+            nvs_close(handle);
+            return;
+        }
+        // Copy the SSID in.
+        memcpy(ssid, pick->ssid, 33);
+    } else {
         size_t requiredSize;
         esp_err_t res = nvs_get_str(handle, "wifi.ssid", NULL, &requiredSize);
         if (res != ESP_OK) {
@@ -186,7 +301,10 @@ void wifi_setup(xQueueHandle buttonQueue, pax_buf_t* pax_buffer, ILI9341* ili934
                 if (res != ESP_OK) strcpy(password, "");
             }
         }
-    bool accepted = keyboard(buttonQueue, pax_buffer, ili9341, 30, 30, pax_buffer->width - 60, pax_buffer->height - 60, "WiFi SSID", "Press HOME to exit", ssid, sizeof(ssid));
+        accepted = keyboard(buttonQueue, pax_buffer, ili9341, 30, 30, pax_buffer->width - 60, pax_buffer->height - 60, "WiFi SSID", "Press HOME to exit", ssid, sizeof(ssid));
+    }
+    
+    /* ==== manual entering phase ==== */
     if (accepted) {
         accepted = keyboard(buttonQueue, pax_buffer, ili9341, 30, 30, pax_buffer->width - 60, pax_buffer->height - 60, "WiFi password", "Press HOME to exit", password, sizeof(password));
     }