recover from rebase mistakes

examples/net/webserver/main.go

@@ -28,11 +28,6 @@ var (
 	port string = ":80"
 )
 
-var (
-	// this is the ESP chip that has the WIFININA firmware flashed on it
-	adaptor *wifinina.Device
-)
-
 var led = machine.LED
 
 func main() {
@@ -182,43 +177,3 @@ func cnt(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set(`Content-Type`, `application/json`)
 	fmt.Fprintf(w, `{"cnt": %d}`, counter)
 }
-
-const retriesBeforeFailure = 3
-
-// connect to access point
-func connectToAP() {
-	time.Sleep(2 * time.Second)
-	var err error
-	for i := 0; i < retriesBeforeFailure; i++ {
-		println("Connecting to " + ssid)
-		err = adaptor.ConnectToAccessPoint(ssid, pass, 10*time.Second)
-		if err == nil {
-			println("Connected.")
-
-			return
-		}
-	}
-
-	// error connecting to AP
-	failMessage(err.Error())
-}
-
-func displayIP() {
-	ip, _, _, err := adaptor.GetIP()
-	for ; err != nil; ip, _, _, err = adaptor.GetIP() {
-		message(err.Error())
-		time.Sleep(1 * time.Second)
-	}
-	message("IP address: " + ip.String())
-}
-
-func message(msg string) {
-	println(msg, "\r")
-}
-
-func failMessage(msg string) {
-	for {
-		println(msg)
-		time.Sleep(1 * time.Second)
-	}
-}

netlink/probe/mrkwifi1010.go

@@ -4,7 +4,6 @@ package probe
 
 import (
 	"machine"
-	"time"
 
 	"tinygo.org/x/drivers/netdev"
 	"tinygo.org/x/drivers/netlink"

smoketest.sh

@@ -24,9 +24,6 @@ tinygo build -size short -o ./build/test.hex -target=bluepill ./examples/ds1307/
 tinygo build -size short -o ./build/test.hex -target=bluepill ./examples/ds1307/time/main.go
 tinygo build -size short -o ./build/test.hex -target=itsybitsy-m0 ./examples/ds3231/main.go
 tinygo build -size short -o ./build/test.hex -target=microbit ./examples/easystepper/main.go
-tinygo build -size short -o ./build/test.hex -target=arduino-nano33 ./examples/espat/espconsole/main.go
-tinygo build -size short -o ./build/test.hex -target=arduino-nano33 ./examples/espat/esphub/main.go
-tinygo build -size short -o ./build/test.hex -target=arduino-nano33 ./examples/espat/espstation/main.go
 tinygo build -size short -o ./build/test.hex -target=itsybitsy-m0 ./examples/flash/console/spi
 tinygo build -size short -o ./build/test.hex -target=pyportal ./examples/flash/console/qspi
 tinygo build -size short -o ./build/test.hex -target=microbit ./examples/gc9a01/main.go
@@ -81,10 +78,6 @@ tinygo build -size short -o ./build/test.hex -target=itsybitsy-m0 ./examples/vl6
 tinygo build -size short -o ./build/test.hex -target=microbit ./examples/waveshare-epd/epd2in13/main.go
 tinygo build -size short -o ./build/test.hex -target=microbit ./examples/waveshare-epd/epd2in13x/main.go
 tinygo build -size short -o ./build/test.hex -target=microbit ./examples/waveshare-epd/epd4in2/main.go
-tinygo build -size short -o ./build/test.hex -target=arduino-nano33 ./examples/wifinina/ntpclient/main.go
-tinygo build -size short -o ./build/test.hex -target=arduino-nano33 ./examples/wifinina/udpstation/main.go
-tinygo build -size short -o ./build/test.hex -target=arduino-nano33 ./examples/wifinina/tcpclient/main.go
-tinygo build -size short -o ./build/test.hex -target=arduino-nano33 ./examples/wifinina/webclient/main.go
 tinygo build -size short -o ./build/test.hex -target=circuitplay-express ./examples/ws2812
 tinygo build -size short -o ./build/test.bin -target=m5stamp-c3          ./examples/ws2812
 tinygo build -size short -o ./build/test.hex -target=feather-nrf52840 ./examples/is31fl3731/main.go
@@ -113,9 +106,6 @@ tinygo build -size short -o ./build/test.hex -target=pico ./examples/qmi8658c/ma
 tinygo build -size short -o ./build/test.hex -target=feather-m0 ./examples/ina260/main.go
 tinygo build -size short -o ./build/test.hex -target=nucleo-l432kc ./examples/aht20/main.go
 tinygo build -size short -o ./build/test.hex -target=feather-m4 ./examples/sdcard/console/
-tinygo build -size short -o ./build/test.hex -target=wioterminal ./examples/rtl8720dn/webclient/
-tinygo build -size short -o ./build/test.hex -target=wioterminal ./examples/rtl8720dn/webserver/
-tinygo build -size short -o ./build/test.hex -target=wioterminal ./examples/rtl8720dn/mqttsub/
 tinygo build -size short -o ./build/test.hex -target=feather-m4 ./examples/i2csoft/adt7410/
 tinygo build -size short -o ./build/test.elf -target=wioterminal ./examples/axp192/m5stack-core2-blinky/
 tinygo build -size short -o ./build/test.uf2 -target=pico ./examples/xpt2046/main.go
@@ -137,3 +127,17 @@ tinygo build -size short -o ./build/test.hex -target=microbit ./examples/ndir/ma
 tinygo build -size short -o ./build/test.hex -target=arduino-nano33 ./examples/ndir/main_ndir.go
 tinygo build -size short -o ./build/test.uf2 -target=pico ./examples/mpu9150/main.go
 tinygo build -size short -o ./build/test.hex -target=macropad-rp2040 ./examples/sh1106/macropad_spi
+# network examples (espat)
+tinygo build -size short -o ./build/test.hex -target=challenger-rp2040 ./examples/net/ntpclient/
+# network examples (wifinina)
+tinygo build -size short -o ./build/test.hex -target=pyportal ./examples/net/http-get/
+tinygo build -size short -o ./build/test.hex -target=arduino-nano33 ./examples/net/tcpclient/
+tinygo build -size short -o ./build/test.hex -target=nano-rp2040 ./examples/net/websocket/dial/
+tinygo build -size short -o ./build/test.hex -target=metro-m4-airlift ./examples/net/socket/
+tinygo build -size short -o ./build/test.hex -target=matrixportal-m4 ./examples/net/webstatic/
+tinygo build -size short -o ./build/test.hex -target=arduino-mkrwifi1010 ./examples/net/tlsclient/
+tinygo build -size short -o ./build/test.hex -target=nano-rp2040 ./examples/net/mqttclient/natiu/
+# network examples (rtl8720dn)
+tinygo build -size short -o ./build/test.hex -target=wioterminal ./examples/net/webclient/
+tinygo build -size short -o ./build/test.hex -target=wioterminal ./examples/net/webserver/
+tinygo build -size short -o ./build/test.hex -target=wioterminal ./examples/net/mqttclient/paho/