Fix SPI. Check for Ethernet up

Author: cpq

step-7-webserver/pico-w5500/Makefile

@@ -31,10 +31,12 @@ firmware.uf2: firmware.bin $(BIN2UF2)
 
 # Requires env variable VCON_API_KEY set
 DEVICE_URL ?= https://dash.vcon.io/api/v3/devices/1
-test: build
-	curl --fail -su :$(VCON_API_KEY) $(DEVICE_URL)/ota?uf2=1 --data-binary @firmware.uf2
+test: update
 	curl --fail -su :$(VCON_API_KEY) $(DEVICE_URL)/tx?t=5 | tee /tmp/output.txt
-	grep 'Ethernet: ' /tmp/output.txt
+	grep 'Ethernet: up' /tmp/output.txt
+
+update: build
+	curl --fail -su :$(VCON_API_KEY) $(DEVICE_URL)/ota?uf2=1 --data-binary @firmware.uf2
 
 clean:
 	$(RM) firmware.* bin2uf2

step-7-webserver/pico-w5500/main.c

@@ -4,21 +4,14 @@
 #include "mcu.h"
 #include "mongoose.h"
 
-enum { LED = 25, UART_TX = 0, UART_RX = 1 };                   // Pins
+enum { LED = 25 };                                             // LED pins
+enum { UART_TX = 0, UART_RX = 1 };                             // UART pins
 enum { SPI_CS = 17, SPI_CLK = 18, SPI_TX = 19, SPI_RX = 16 };  // SPI pins
 enum { STATUS_TIMER_MS = 1000, BLINK_TIMER_MS = 500 };         // Timeouts
 
-void my_spi_begin(void *spi) {
-  spi_begin(spi);
-}
-void my_spi_end(void *spi) {
-  spi_end(spi);
-}
-uint8_t my_spi_txn(void *spi, uint8_t byte) {
-  uint8_t result = spi_txn(spi, byte);
-  // MG_INFO(("%x -> %x", byte, result));
-  return result;
-}
+void my_spi_begin(void *spi) { spi_begin(spi); }
+void my_spi_end(void *spi) { spi_end(spi); }
+uint8_t my_spi_txn(void *spi, uint8_t byte) { return spi_txn(spi, byte); }
 
 void fn(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
   if (ev == MG_EV_HTTP_MSG) {
@@ -27,14 +20,12 @@ void fn(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
   (void) ev_data, (void) fn_data;
 }
 
-static volatile uint32_t s_ticks;
+static volatile uint64_t s_ticks;
 void SysTick_Handler(void) {  // SyStick IRQ handler, triggered every 1ms
   s_ticks++;
 }
 
-uint64_t mg_millis(void) {
-  return s_ticks;
-}
+uint64_t mg_millis(void) { return s_ticks; }
 
 int main(void) {
   clock_init();                                // Init clocks
@@ -45,8 +36,9 @@ int main(void) {
 
   // Init SPI
   struct spi spi0 = {
-      .miso = SPI_TX, .mosi = SPI_RX, .clk = SPI_CLK, .cs = SPI_CS, .spin = 50};
-  spi_init(&spi0);
+      .miso = SPI_RX, .mosi = SPI_TX, .clk = SPI_CLK, .cs = SPI_CS, .spin = 50};
+  bool ok = spi_init(&spi0);
+  MG_INFO(("SPI init: %d", ok));
 
   // Init Mongoose
   struct mip_spi spi = {&spi0, my_spi_begin, my_spi_end, my_spi_txn};
@@ -56,23 +48,23 @@ int main(void) {
   struct mg_mgr mgr;                                 // Declare event manager
   mg_mgr_init(&mgr);                                 // Init event manager
   mg_log_set(MG_LL_DEBUG);                           // Set DEBUG log level
-  //mip_init(&mgr, &mif);                              // Init TCP/IP stack
-  //mg_http_listen(&mgr, "http://0.0.0.0", fn, NULL);  // HTTP listener
+  mip_init(&mgr, &mif);                              // Init TCP/IP stack
+  mg_http_listen(&mgr, "http://0.0.0.0", fn, NULL);  // HTTP listener
 
   bool led_on = false;                         // Initial LED state
-  uint32_t status_timer = 0, blink_timer = 0;  // Initial timer expirations
+  uint64_t status_timer = 0, blink_timer = 0;  // Initial timer expirations
 
   // Infinite event manager loop
   for (;;) {
-    if (timer_expired(&blink_timer, BLINK_TIMER_MS, s_ticks)) {
-      led_on = !led_on;  // Flip LED state
-      // if (mip_driver_w5500.up(&mif)) led_on = true;  // Always on if Eth up
-      gpio_write(LED, led_on);  // Set LED
+    if (mg_timer_expired(&blink_timer, BLINK_TIMER_MS, mg_millis())) {
+      led_on = !led_on;                              // Flip LED state
+      if (mip_driver_w5500.up(&mif)) led_on = true;  // Always on if Eth up
+      gpio_write(LED, led_on);                       // Set LED
     }
-    if (timer_expired(&status_timer, STATUS_TIMER_MS, s_ticks)) {
-      MG_INFO(("Ethernet: %s", mip_driver_w5500.up(&mif) ? "up" : "down"));
+    if (mg_timer_expired(&status_timer, STATUS_TIMER_MS, mg_millis())) {
+      MG_INFO(("Ethernet: %s", mif.driver->up(&mif) ? "up" : "down"));
     }
-    // mg_mgr_poll(&mgr, 1);
+    mg_mgr_poll(&mgr, 1);
   }
 
   return 0;

step-7-webserver/pico-w5500/mcu.h

@@ -40,9 +40,7 @@ static inline void nvic_set_prio(uint8_t irq, uint8_t prio) {
   NVIC->IP[irq >> 2] = ((uint32_t) (NVIC->IP[irq >> 2] & ~(255U << shift)) |
                         (((prio << 6U) & (uint32_t) 255UL) << shift));
 }
-static inline void nvic_enable_irq(uint8_t irq) {
-  NVIC->ISER[0] = BIT(irq);
-}
+static inline void nvic_enable_irq(uint8_t irq) { NVIC->ISER[0] = BIT(irq); }
 
 struct scb {
   volatile uint32_t CPUID, ICSR, VTOR, AIRCR, SCR, CCR;  // Incomplete
@@ -139,9 +137,7 @@ static inline void gpio_write(uint16_t pin, bool val) {
   }
 }
 
-static inline bool gpio_read(uint16_t pin) {
-  return SIO->GPIO_IN & BIT(pin);
-}
+static inline bool gpio_read(uint16_t pin) { return SIO->GPIO_IN & BIT(pin); }
 
 // t: expiration time, prd: period, now: current time. Return true if expired
 static inline bool timer_expired(uint32_t *t, uint32_t prd, uint32_t now) {
@@ -217,19 +213,22 @@ static inline void uart_write_byte(struct uart *uart, uint8_t byte) {
   while (uart->FR & BIT(5)) (void) 0;  // Wait while TX FIFO is full
   uart->DR = byte;
 }
+
 static inline void uart_write_buf(struct uart *uart, char *buf, size_t len) {
   while (len-- > 0) uart_write_byte(uart, *(uint8_t *) buf++);
 }
+
 static inline int uart_read_ready(struct uart *uart) {
   return uart->FR & BIT(4);
 }
+
 static inline uint8_t uart_read_byte(struct uart *uart) {
   return (uint8_t) (uart->DR & 255);
 }
 
 // Bit-bang SPI implementation
 struct spi {
-  int miso, mosi, clk, cs;  // Pins
+  int miso, mosi, clk, cs;  // SPI Pins
   int spin;                 // Number of NOP spins for bitbanging
 };