Pico-SDK support fixes and cleanups

examples/pico-sdk/pico-w5500

@@ -1 +1 @@
-w5500-evb-pico-picosdk-builtin
+w5500-evb-pico-picosdk-baremetal-builtin

examples/pico-sdk/w5500-evb-pico-picosdk-baremetal-builtin/main.c

@@ -26,19 +26,10 @@ static uint8_t spi_txn(void *spi, uint8_t byte) {
   return result;
 }
 
-bool mg_random(void *buf, size_t len) {
-  for (size_t n = 0; n < len; n += sizeof(uint32_t)) {
-    uint32_t r = get_rand_32();
-    memcpy((char *) buf + n, &r, n + sizeof(r) > len ? len - n : sizeof(r));
-  }
-  return true;
-}
-
 static void timer_fn(void *arg) {
-  gpio_put(PICO_DEFAULT_LED_PIN,
-           !gpio_get_out_level(PICO_DEFAULT_LED_PIN));   // Blink LED
-  struct mg_tcpip_if *ifp = arg;                         // And show
-  const char *names[] = {"down", "up", "req", "ready"};  // network stats
+  gpio_put(PICO_DEFAULT_LED_PIN, !gpio_get(PICO_DEFAULT_LED_PIN));  // Blink LED
+  struct mg_tcpip_if *ifp = arg;                                    // And show
+  const char *names[] = {"down", "up", "req", "IP", "ready"};  // network stats
   MG_INFO(("Ethernet: %s, IP: %M, rx:%u, tx:%u, dr:%u, er:%u",
            names[ifp->state], mg_print_ip4, &ifp->ip, ifp->nrecv, ifp->nsent,
            ifp->ndrop, ifp->nerr));
@@ -81,7 +72,7 @@ int main(void) {
                             // .ip = mg_htonl(MG_U32(192, 168, 0, 223)),
                             // .mask = mg_htonl(MG_U32(255, 255, 255, 0)),
                             // .gw = mg_htonl(MG_U32(192, 168, 0, 1)),
-                          .driver = &mg_tcpip_driver_w5500,
+                            .driver = &mg_tcpip_driver_w5500,
                             .driver_data = &spi};
   mg_tcpip_init(&mgr, &mif);
   mg_timer_add(&mgr, BLINK_PERIOD_MS, MG_TIMER_REPEAT, timer_fn, &mif);

examples/pico-sdk/w5500-evb-pico-picosdk-baremetal-builtin/mongoose_config.h

@@ -3,6 +3,4 @@
 #define MG_ENABLE_TCPIP 1
 #define MG_ENABLE_TCPIP_DRIVER_INIT 0
 #define MG_ENABLE_DRIVER_W5500 1
-#define MG_ENABLE_CUSTOM_RANDOM 1
 #define MG_ENABLE_PACKED_FS 1
-#define MG_ENABLE_POSIX_FS 0

examples/pico-sdk/w5500-evb-pico2-picosdk-baremetal-builtin/CMakeLists.txt

@@ -0,0 +1,19 @@
+cmake_minimum_required(VERSION 3.13)
+include(pico-sdk/pico_sdk_init.cmake)
+
+project(firmware)
+pico_sdk_init()
+add_executable(firmware main.c mongoose.c net.c packed_fs.c)
+target_include_directories(firmware PUBLIC .)
+
+target_link_libraries(firmware pico_stdlib hardware_spi pico_rand)
+pico_add_extra_outputs(firmware)     # create map/bin/hex file etc.
+
+pico_enable_stdio_usb(firmware 1)    # Route stdio
+pico_enable_stdio_uart(firmware 0)   # to USB
+
+# Mongoose build flags in mongoose_config.h
+
+# Example build options
+add_definitions(-DHTTP_URL="http://0.0.0.0/")
+add_definitions(-DHTTPS_URL="https://0.0.0.0/")

examples/pico-sdk/w5500-evb-pico2-picosdk-baremetal-builtin/Makefile

@@ -0,0 +1,35 @@
+RM = rm -rf
+MKBUILD = test -d build || mkdir build
+ifeq ($(OS),Windows_NT)
+  RM = cmd /C del /Q /F /S
+  MKBUILD = if not exist build mkdir build
+endif
+.PHONY: build
+
+all example:
+	true
+
+build build/firmware.uf2: pico-sdk main.c net.c
+	$(MKBUILD)
+	cd build && cmake -DPICO_BOARD=pico2 -G "Unix Makefiles" .. && make
+
+pico-sdk:
+	git clone --depth 1 -b 2.0.0 https://github.com/raspberrypi/pico-sdk $@
+	cd $@ && git submodule update --init
+
+flash: build/firmware.uf2
+	picotool load $< -f
+
+# Automated remote test. Requires env variable VCON_API_KEY set. See https://vcon.io/automated-firmware-tests/
+DEVICE_URL ?= https://dash.vcon.io/api/v3/devices/??
+# stdio has to be changed from USB to UART in CMakeLists.txt
+update: build/firmware.uf2
+	curl --fail-with-body -su :$(VCON_API_KEY) $(DEVICE_URL)/ota?uf2=1 --data-binary @$<
+
+test: update
+	curl --fail-with-body -su :$(VCON_API_KEY) $(DEVICE_URL)/tx?t=5 | tee /tmp/output.txt
+	grep 'READY, IP:' /tmp/output.txt       # Check for network init
+#	grep 'MQTT connected' /tmp/output.txt   # Check for MQTT connection success
+
+clean:
+	$(RM) pico-sdk build

examples/pico-sdk/w5500-evb-pico2-picosdk-baremetal-builtin/README.md

@@ -0,0 +1,3 @@
+# RP2350 + W5500 Ethernet chip
+
+- See [detailed tutorial](https://mongoose.ws/tutorials/rp2040/pico-w5500/) (including hardware connections)

examples/pico-sdk/w5500-evb-pico2-picosdk-baremetal-builtin/main.c

@@ -0,0 +1,96 @@
+// Copyright (c) 2023 Cesanta Software Limited
+// All rights reserved
+
+#include <stdio.h>
+#include <string.h>
+#include "hardware/spi.h"
+#include "pico/rand.h"
+#include "pico/stdlib.h"
+#include "pico/unique_id.h"
+
+#include "mongoose.h"
+#include "net.h"
+
+enum { BLINK_PERIOD_MS = 1000 };
+// enum { LED = 25, SPI_CS = 17, SPI_CLK = 18, SPI_TX = 19, SPI_RX = 16 };  //
+// Pins
+enum { LED = 25, SPI_CS = 5, SPI_CLK = 2, SPI_TX = 3, SPI_RX = 4 };  // Pins
+
+static void spi_begin(void *spi) {
+  gpio_put(SPI_CS, 0);
+}
+static void spi_end(void *spi) {
+  gpio_put(SPI_CS, 1);
+}
+static uint8_t spi_txn(void *spi, uint8_t byte) {
+  uint8_t result = 0;
+  spi_write_read_blocking(spi0, &byte, &result, 1);
+  return result;
+}
+
+static void timer_fn(void *arg) {
+  gpio_put(PICO_DEFAULT_LED_PIN, !gpio_get(PICO_DEFAULT_LED_PIN));  // Blink LED
+  struct mg_tcpip_if *ifp = arg;                                    // And show
+  const char *names[] = {"down", "up", "req", "IP", "ready"};  // network stats
+  MG_INFO(("Ethernet: %s, IP: %M, rx:%u, tx:%u, dr:%u, er:%u",
+           names[ifp->state], mg_print_ip4, &ifp->ip, ifp->nrecv, ifp->nsent,
+           ifp->ndrop, ifp->nerr));
+}
+
+static void eth_spi_init(void) {
+  // Init SPI pins
+  spi_init(spi0, 500 * 1000);
+  gpio_set_function(SPI_RX, GPIO_FUNC_SPI);   // MISO
+  gpio_set_function(SPI_TX, GPIO_FUNC_SPI);   // MOSI
+  gpio_set_function(SPI_CLK, GPIO_FUNC_SPI);  // CLK
+  gpio_init(SPI_CS);                          // CS
+  gpio_set_dir(SPI_CS, GPIO_OUT);             // Set CS to output
+  gpio_put(SPI_CS, 1);                        // And drive CS high (inactive)
+}
+
+// Helper macro for MAC generation
+#define GENERATE_LOCALLY_ADMINISTERED_MAC(id) \
+  { 2, id[3], id[4], id[5], id[6], id[7] }
+
+int main(void) {
+  stdio_init_all();
+  gpio_init(LED);  // Setup board LED
+  gpio_set_dir(LED, GPIO_OUT);
+  eth_spi_init();  // Initialise SPI pins
+  MG_INFO(("Starting ..."));
+
+  pico_unique_board_id_t board_id;
+  pico_get_unique_board_id(&board_id);
+  uint8_t *id = board_id.id;
+
+  struct mg_mgr mgr;        // Initialise
+  mg_mgr_init(&mgr);        // Mongoose event manager
+  mg_log_set(MG_LL_DEBUG);  // Set log level
+
+  // Initialise Mongoose network stack
+  struct mg_tcpip_spi spi = {NULL, spi_begin, spi_end, spi_txn};
+  struct mg_tcpip_if mif = {.mac = GENERATE_LOCALLY_ADMINISTERED_MAC(id),
+                            // Uncomment below for static configuration:
+                            // .ip = mg_htonl(MG_U32(192, 168, 0, 223)),
+                            // .mask = mg_htonl(MG_U32(255, 255, 255, 0)),
+                            // .gw = mg_htonl(MG_U32(192, 168, 0, 1)),
+                            .driver = &mg_tcpip_driver_w5500,
+                            .driver_data = &spi};
+  mg_tcpip_init(&mgr, &mif);
+  mg_timer_add(&mgr, BLINK_PERIOD_MS, MG_TIMER_REPEAT, timer_fn, &mif);
+
+  MG_INFO(("MAC: %M. Waiting for IP...", mg_print_mac, mif.mac));
+  while (mif.state != MG_TCPIP_STATE_READY) {
+    mg_mgr_poll(&mgr, 0);
+  }
+
+  MG_INFO(("Initialising application..."));
+  web_init(&mgr);
+
+  MG_INFO(("Starting event loop"));
+  for (;;) {
+    mg_mgr_poll(&mgr, 1);
+  }
+
+  return 0;
+}

examples/pico-sdk/w5500-evb-pico2-picosdk-baremetal-builtin/mongoose.c

@@ -0,0 +1 @@
+../../../mongoose.c

examples/pico-sdk/w5500-evb-pico2-picosdk-baremetal-builtin/mongoose.h

@@ -0,0 +1 @@
+../../../mongoose.h

examples/pico-sdk/w5500-evb-pico2-picosdk-baremetal-builtin/mongoose_config.h

@@ -0,0 +1,6 @@
+#define MG_ARCH MG_ARCH_PICOSDK
+
+#define MG_ENABLE_TCPIP 1
+#define MG_ENABLE_TCPIP_DRIVER_INIT 0
+#define MG_ENABLE_DRIVER_W5500 1
+#define MG_ENABLE_PACKED_FS 1

examples/pico-sdk/w5500-evb-pico2-picosdk-baremetal-builtin/net.c

@@ -0,0 +1 @@
+../../device-dashboard/net.c

examples/pico-sdk/w5500-evb-pico2-picosdk-baremetal-builtin/net.h

@@ -0,0 +1 @@
+../../device-dashboard/net.h

examples/pico-sdk/w5500-evb-pico2-picosdk-baremetal-builtin/packed_fs.c

@@ -0,0 +1 @@
+../../device-dashboard/packed_fs.c