add basic wifi to app

CMakeLists.txt

@@ -95,6 +95,7 @@ target_sources(gadget PUBLIC
     src/state_value.c
     src/textbox.c
     src/state_volcano_conf.c
+    src/wifi.c
     src/venty.c
     src/state_venty.c
 
@@ -156,17 +157,12 @@ target_link_libraries(gadget
     hardware_pwm
     pico_btstack_ble
     pico_btstack_cyw43
-    pico_cyw43_arch_threadsafe_background
+    pico_cyw43_arch_lwip_threadsafe_background
     hardware_flash
     pico_flash
     picowota_reboot
 )
 
-target_compile_definitions(gadget PUBLIC
-    RUNNING_AS_CLIENT=1
-    CYW43_LWIP=0
-)
-
 pico_set_linker_script(gadget ${CMAKE_CURRENT_SOURCE_DIR}/src/memmap_custom.ld)
 
 # fix for Errata RP2040-E5 (the fix requires use of GPIO 15)
@@ -176,5 +172,11 @@ set(PICOWOTA_WIFI_SSID "WIFI_SSID_HERE")
 set(PICOWOTA_WIFI_PASS "WIFI_PASS_HERE")
 set(PICOWOTA_WIFI_AP 0)
 
+target_compile_definitions(gadget PUBLIC
+    RUNNING_AS_CLIENT=1
+    DEFAULT_WIFI_SSID="${PICOWOTA_WIFI_SSID}"
+    DEFAULT_WIFI_PASS="${PICOWOTA_WIFI_PASS}"
+)
+
 add_subdirectory(picowota)
 picowota_build_combined(gadget)

flash_ota.sh

@@ -18,7 +18,12 @@
 
 set -euo pipefail
 
-# TODO wait for device to be ready
+#echo -n Waiting for target to appear
+#while ! nc -z $1 4242; do
+#    echo -n .
+#    sleep 1
+#done
+#echo
 
 echo Copying binary
 ~/go/bin/serial-flash tcp:$1:4242 $2

include/config.h

@@ -48,11 +48,13 @@
 #define DISK_BLOCK_SIZE 512
 
 #ifdef DEBUG_DISK_WRITE_SOURCES
-#define DISK_BLOCK_COUNT (256 + 128)
+#define DISK_ADD_BLOCKS_SOURCES 90 //128
 #else // DEBUG_DISK_WRITE_SOURCES
-#define DISK_BLOCK_COUNT 256
+#define DISK_ADD_BLOCKS_SOURCES 0
 #endif // DEBUG_DISK_WRITE_SOURCES
 
+#define DISK_BLOCK_COUNT (256 + DISK_ADD_BLOCKS_SOURCES)
+
 //#define TEST_VOLCANO_AUTO_CONNECT "xx:xx:xx:xx:xx:xx 1"
 //#define TEST_CRAFTY_AUTO_CONNECT "xx:xx:xx:xx:xx:xx 0"
 

include/lwipopts.h

@@ -0,0 +1,76 @@
+#ifndef _LWIPOPTS_H
+#define _LWIPOPTS_H
+
+// see https://www.nongnu.org/lwip/2_1_x/group__lwip__opts.html for details
+
+#define NO_SYS                      1
+#define LWIP_SOCKET                 0
+#define MEM_LIBC_MALLOC             0
+#define MEM_ALIGNMENT               4
+#define MEM_SIZE                    4000
+#define MEMP_NUM_TCP_SEG            32
+#define MEMP_NUM_ARP_QUEUE          10
+#define PBUF_POOL_SIZE              24
+#define LWIP_ARP                    1
+#define LWIP_ETHERNET               1
+#define LWIP_ICMP                   1
+#define LWIP_RAW                    1
+#define TCP_WND                     (8 * TCP_MSS)
+#define TCP_MSS                     1460
+#define TCP_SND_BUF                 (8 * TCP_MSS)
+#define TCP_SND_QUEUELEN            ((4 * (TCP_SND_BUF) + (TCP_MSS - 1)) / (TCP_MSS))
+#define LWIP_NETIF_STATUS_CALLBACK  1
+#define LWIP_NETIF_LINK_CALLBACK    1
+#define LWIP_NETIF_HOSTNAME         1
+#define LWIP_NETCONN                0
+#define MEM_STATS                   0
+#define SYS_STATS                   0
+#define MEMP_STATS                  0
+#define LINK_STATS                  0
+#define LWIP_CHKSUM_ALGORITHM       3
+#define LWIP_DHCP                   1
+#define LWIP_IPV4                   1
+#define LWIP_TCP                    1
+#define LWIP_UDP                    1
+#define LWIP_DNS                    1
+#define LWIP_TCP_KEEPALIVE          1
+#define LWIP_NETIF_TX_SINGLE_PBUF   1
+#define DHCP_DOES_ARP_CHECK         0
+#define LWIP_DHCP_DOES_ACD_CHECK    0
+
+#ifndef NDEBUG
+#define LWIP_DEBUG                  1
+#define LWIP_STATS                  1
+#define LWIP_STATS_DISPLAY          1
+#endif
+
+#define ETHARP_DEBUG                LWIP_DBG_OFF
+#define NETIF_DEBUG                 LWIP_DBG_OFF
+#define PBUF_DEBUG                  LWIP_DBG_OFF
+#define API_LIB_DEBUG               LWIP_DBG_OFF
+#define API_MSG_DEBUG               LWIP_DBG_OFF
+#define SOCKETS_DEBUG               LWIP_DBG_OFF
+#define ICMP_DEBUG                  LWIP_DBG_OFF
+#define INET_DEBUG                  LWIP_DBG_OFF
+#define IP_DEBUG                    LWIP_DBG_OFF
+#define IP_REASS_DEBUG              LWIP_DBG_OFF
+#define RAW_DEBUG                   LWIP_DBG_OFF
+#define MEM_DEBUG                   LWIP_DBG_OFF
+#define MEMP_DEBUG                  LWIP_DBG_OFF
+#define SYS_DEBUG                   LWIP_DBG_OFF
+#define TCP_DEBUG                   LWIP_DBG_OFF
+#define TCP_INPUT_DEBUG             LWIP_DBG_OFF
+#define TCP_OUTPUT_DEBUG            LWIP_DBG_OFF
+#define TCP_RTO_DEBUG               LWIP_DBG_OFF
+#define TCP_CWND_DEBUG              LWIP_DBG_OFF
+#define TCP_WND_DEBUG               LWIP_DBG_OFF
+#define TCP_FR_DEBUG                LWIP_DBG_OFF
+#define TCP_QLEN_DEBUG              LWIP_DBG_OFF
+#define TCP_RST_DEBUG               LWIP_DBG_OFF
+#define UDP_DEBUG                   LWIP_DBG_OFF
+#define TCPIP_DEBUG                 LWIP_DBG_OFF
+#define PPP_DEBUG                   LWIP_DBG_OFF
+#define SLIP_DEBUG                  LWIP_DBG_OFF
+#define DHCP_DEBUG                  LWIP_DBG_OFF
+
+#endif /* __LWIPOPTS_H__ */

include/mem.h

@@ -23,25 +23,37 @@
 #include <stdbool.h>
 
 #include "workflow.h"
+#include "wifi.h"
 
 // to migrate settings when struct changes between releases
 #define MEM_VERSION 0
 
 struct mem_data {
+    // wifi networks
+    // should stay at beginning, for bootloader
+    uint16_t net_count;
+    struct net_credentials net[WIFI_MAX_NET_COUNT];
+
+    // settings
     uint16_t backlight;
     bool wf_auto_connect;
+    bool enable_wifi;
 
+    // workflows
     uint16_t wf_count;
     struct workflow wf[WF_MAX_FLOWS];
 };
 
-// wf and wf_count are assigned in mem_init()
+// workflows are assigned in mem_init()
 #define MEM_DATA_INIT {           \
     .backlight = (0xFF00 >> 1),   \
     .wf_auto_connect = false,     \
+    .enable_wifi = false,         \
+    .wf_count = 0,                \
+    .net_count = 0,               \
 }
 
-void mem_init(void);
+void mem_load(void);
 void mem_write(void);
 struct mem_data *mem_data(void);
 void mem_load_defaults(void);

include/wifi.h

@@ -0,0 +1,39 @@
+/*
+ * wifi.h
+ *
+ * Copyright (c) 2023 Thomas Buck (thomas@xythobuz.de)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * See <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __WIFI_H__
+#define __WIFI_H__
+
+#define WIFI_MAX_NET_COUNT 5
+#define WIFI_MAX_NAME_LEN 32
+#define WIFI_MAX_PASS_LEN 32
+
+struct net_credentials {
+    char name[WIFI_MAX_NAME_LEN];
+    char pass[WIFI_MAX_PASS_LEN];
+};
+
+void wifi_init(void);
+void wifi_deinit(void);
+
+bool wifi_initialized(void);
+const char *wifi_state(void);
+
+void wifi_run(void);
+
+#endif // __WIFI_H__

src/image.c

@@ -24,6 +24,7 @@
 #include "text.h"
 #include "lipo.h"
 #include "util.h"
+#include "wifi.h"
 #include "image.h"
 
 #pragma GCC diagnostic push
@@ -136,7 +137,42 @@ void draw_battery_indicator(void) {
         .height = 240,
         .margin = 2,
         .fg = c,
-        .bg = RGB_565(0x00, 0x00, 0x00),
+        .bg = LCD_BLACK,
+        .font = &font,
+    };
+    text_draw(&text);
+}
+
+void draw_wifi_indicator(void) {
+    static char prev_s[30] = {0};
+    char s[30] = {0};
+
+    snprintf(s, sizeof(s), "WiFi: %17s", wifi_state());
+
+    if (strcmp(s, prev_s) == 0) {
+        return;
+    }
+    strcpy(prev_s, s);
+
+    static struct text_font font = {
+        .fontname = "fixed_10x20",
+        .font = NULL,
+    };
+    if (font.font == NULL) {
+        text_prepare_font(&font);
+    }
+
+    struct text_conf text = {
+        .text = s,
+        .x = 0,
+        .y = 219 - 50,
+        .justify = false,
+        .alignment = MF_ALIGN_CENTER,
+        .width = 240,
+        .height = 240,
+        .margin = 2,
+        .fg = LCD_WHITE,
+        .bg = LCD_BLACK,
         .font = &font,
     };
     text_draw(&text);
@@ -148,5 +184,6 @@ void battery_run(void) {
     if ((now >= (last_run + BATT_INTERVAL_MS)) || (last_run == 0)) {
         last_run = now;
         draw_battery_indicator();
+        draw_wifi_indicator();
     }
 }

src/main.c

@@ -38,6 +38,7 @@
 #include "state.h"
 #include "serial.h"
 #include "workflow.h"
+#include "wifi.h"
 
 void main_loop_hw(void) {
     watchdog_update();
@@ -48,6 +49,8 @@ void main_loop_hw(void) {
     if (lcd_get_backlight() != mem_data()->backlight) {
         lcd_set_backlight(mem_data()->backlight);
     }
+
+    wifi_run();
 }
 
 int main(void) {
@@ -60,8 +63,8 @@ int main(void) {
 #endif
     usb_init();
 
-    debug("mem_init");
-    mem_init();
+    debug("mem_load");
+    mem_load();
 
     debug("lcd_init");
     lcd_init();
@@ -120,6 +123,13 @@ int main(void) {
         sleep_ms(1);
     }
 
+    if (mem_data()->enable_wifi) {
+        debug("wifi_init");
+        wifi_init();
+    } else {
+        debug("wifi not enabled");
+    }
+
     debug("starting app");
     state_switch(STATE_SCAN);
 

src/mem.c

@@ -82,9 +82,14 @@ void mem_load_defaults(void) {
     for (uint16_t i = 0; i < wf_default_count; i++) {
         data_ram.data.wf[i] = wf_default_data[i];
     }
+
+    // TODO
+    data_ram.data.net_count = 1;
+    strcpy(data_ram.data.net[0].name, DEFAULT_WIFI_SSID);
+    strcpy(data_ram.data.net[0].pass, DEFAULT_WIFI_PASS);
 }
 
-void mem_init(void) {
+void mem_load(void) {
     mem_load_defaults();
 
     if (!flash_safe_execute_core_init()) {

src/state_settings.c

@@ -59,11 +59,21 @@ static void enter_cb(int selection) {
         break;
 
     case 3:
+        // Enable WiFi
+        state_value_set(&mem_data()->enable_wifi,
+                        sizeof(mem_data()->enable_wifi),
+                        0, 1, VAL_STEP_INCREMENT, 1,
+                        "Enable WiFi");
+        state_value_return(STATE_SETTINGS);
+        state_switch(STATE_VALUE);
+        break;
+
+    case 4:
         // Factory Reset
         mem_load_defaults();
         break;
 
-    case 4:
+    case 5:
         // OTA Update
         picowota_reboot(true);
         break;
@@ -81,6 +91,17 @@ void state_settings_enter(void) {
 void state_settings_exit(void) {
     menu_deinit();
     mem_write();
+
+    // apply changed wifi state
+    if (mem_data()->enable_wifi) {
+        if (!wifi_initialized()) {
+            wifi_init();
+        }
+    } else {
+        if (wifi_initialized()) {
+            wifi_deinit();
+        }
+    }
 }
 
 static void draw(struct menu_state *menu) {
@@ -90,6 +111,7 @@ static void draw(struct menu_state *menu) {
     ADD_STATIC_ELEMENT("Auto Connect (%d)", mem_data()->wf_auto_connect);
     ADD_STATIC_ELEMENT("Brightness (%d)", __builtin_ffs(mem_data()->backlight));
     ADD_STATIC_ELEMENT("Edit Workflows");
+    ADD_STATIC_ELEMENT("Enable WiFi (%d)", mem_data()->enable_wifi);
     ADD_STATIC_ELEMENT("Factory Reset");
     ADD_STATIC_ELEMENT("OTA Update");
 

src/wifi.c

@@ -0,0 +1,145 @@
+/*
+ * wifi.c
+ *
+ * https://github.com/raspberrypi/pico-examples/blob/master/adc/read_vsys/power_status.c
+ *
+ * Copyright (c) 2023 Thomas Buck (thomas@xythobuz.de)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * See <http://www.gnu.org/licenses/>.
+ */
+
+#include "pico/cyw43_arch.h"
+#include "lwip/netif.h"
+#include "lwip/ip4_addr.h"
+
+#include "config.h"
+#include "log.h"
+#include "mem.h"
+#include "wifi.h"
+
+enum wifi_state {
+    WS_IDLE = 0,
+    WS_SCAN,
+    WS_CONNECT,
+    WS_READY,
+};
+
+static enum wifi_state state = WS_IDLE;
+
+static void wifi_connect(const char *ssid, const char *pw, uint32_t auth) {
+    debug("connecting to '%s'", ssid);
+
+    // https://github.com/raspberrypi/pico-sdk/issues/1413
+    uint32_t a = 0;
+    if (auth & 4) {
+        a = CYW43_AUTH_WPA2_AES_PSK;
+    } else if (auth & 2) {
+        a = CYW43_AUTH_WPA_TKIP_PSK;
+    }
+
+    int r = cyw43_arch_wifi_connect_async(ssid, pw, a);
+    if (r != 0) {
+        debug("failed to connect %d", r);
+    } else {
+        state = WS_CONNECT;
+    }
+}
+
+static int scan_result(void *env, const cyw43_ev_scan_result_t *result) {
+    (void)env;
+    cyw43_thread_enter();
+
+    if (result && (state == WS_SCAN)) {
+        for (int i = 0; i < mem_data()->net_count; i++) {
+            if ((strlen(mem_data()->net[i].name) == result->ssid_len)
+                 && (memcmp(mem_data()->net[i].name, result->ssid, result->ssid_len) == 0)) {
+                wifi_connect(mem_data()->net[i].name,
+                             mem_data()->net[i].pass,
+                             result->auth_mode);
+                break;
+            }
+        }
+    }
+
+    cyw43_thread_exit();
+    return 0;
+}
+
+static void wifi_scan(void) {
+    debug("starting scan");
+    cyw43_wifi_scan_options_t scan_options = {0};
+    int err = cyw43_wifi_scan(&cyw43_state, &scan_options, NULL, scan_result);
+    if (err != 0) {
+        debug("error %d", err);
+    }
+    state = WS_SCAN;
+}
+
+void wifi_init(void) {
+    if (state != WS_IDLE) {
+        debug("invalid state %d", state);
+        return;
+    }
+
+    cyw43_thread_enter();
+    cyw43_arch_enable_sta_mode();
+    wifi_scan();
+    cyw43_thread_exit();
+}
+
+void wifi_deinit(void) {
+    cyw43_thread_enter();
+    cyw43_arch_disable_sta_mode();
+    state = WS_IDLE;
+    cyw43_thread_exit();
+}
+
+bool wifi_initialized(void) {
+    return (state != WS_IDLE);
+}
+
+const char *wifi_state(void) {
+    switch (state) {
+    case WS_IDLE:
+        return "Disabled";
+
+    case WS_SCAN:
+        return "Scanning";
+
+    case WS_CONNECT:
+        return "Connecting";
+
+    case WS_READY:
+        return "Connected";
+    }
+
+    return NULL;
+}
+
+void wifi_run(void) {
+    cyw43_thread_enter();
+
+    if (state == WS_SCAN) {
+        if (!cyw43_wifi_scan_active(&cyw43_state)) {
+            debug("restarting scan");
+            wifi_scan();
+        }
+    } else if (state == WS_CONNECT) {
+        if (cyw43_wifi_link_status(&cyw43_state, CYW43_ITF_STA) == CYW43_LINK_JOIN) {
+            debug("joined network");
+            state = WS_READY;
+        }
+    }
+
+    cyw43_thread_exit();
+}