wifi/espat, rtl8720dn, wifinina: move towards standard common interfa…

…ce for wifi adaptors Signed-off-by: deadprogram <[email protected]>
tinygo-org · Jan 24, 2022 · d8c813d · d8c813d
1 parent 905fc6f
commit d8c813d
Show file tree

Hide file tree

Showing 28 changed files with 187 additions and 102 deletions.
diff --git a/espat/wifidriver.go b/espat/wifidriver.go
@@ -0,0 +1,19 @@
+package espat
+
+import (
+	"time"
+
+	"tinygo.org/x/drivers"
+)
+
+func (d *Device) ConnectToAccessPoint(ssid, pass string, timeout time.Duration) error {
+	if len(ssid) == 0 {
+		return drivers.ErrWiFiMissingSSID
+	}
+
+	return d.ConnectToAP(ssid, pass, 10)
+}
+
+func (d *Device) Disconnect() error {
+	return d.DisconnectFromAP()
+}
diff --git a/examples/espat/espconsole/main.go b/examples/espat/espconsole/main.go
@@ -114,7 +114,9 @@ func connectToAP() {
 	println("Connecting to wifi network '" + ssid + "'")
 
 	adaptor.SetWifiMode(espat.WifiModeClient)
-	adaptor.ConnectToAP(ssid, pass, 10)
+	if err := adaptor.ConnectToAccessPoint(ssid, pass, 10*time.Second); err != nil {
+		failMessage(err.Error())
+	}
 
 	println("Connected.")
 	ip, err := adaptor.GetClientIP()

diff --git a/examples/espat/esphub/main.go b/examples/espat/esphub/main.go
@@ -100,7 +100,9 @@ func connectToAP() {
 	println("Connecting to wifi network '" + ssid + "'")
 
 	adaptor.SetWifiMode(espat.WifiModeClient)
-	adaptor.ConnectToAP(ssid, pass, 10)
+	if err := adaptor.ConnectToAccessPoint(ssid, pass, 10*time.Second); err != nil {
+		failMessage(err.Error())
+	}
 
 	println("Connected.")
 	ip, err := adaptor.GetClientIP()

diff --git a/examples/espat/espstation/main.go b/examples/espat/espstation/main.go
@@ -89,7 +89,9 @@ func connectToAP() {
 	println("Connecting to wifi network '" + ssid + "'")
 
 	adaptor.SetWifiMode(espat.WifiModeClient)
-	adaptor.ConnectToAP(ssid, pass, 10)
+	if err := adaptor.ConnectToAccessPoint(ssid, pass, 10*time.Second); err != nil {
+		failMessage(err.Error())
+	}
 
 	println("Connected.")
 	ip, err := adaptor.GetClientIP()

diff --git a/examples/espat/mqttclient/main.go b/examples/espat/mqttclient/main.go
@@ -109,7 +109,9 @@ func connectToAP() {
 	println("Connecting to wifi network '" + ssid + "'")
 
 	adaptor.SetWifiMode(espat.WifiModeClient)
-	adaptor.ConnectToAP(ssid, pass, 10)
+	if err := adaptor.ConnectToAccessPoint(ssid, pass, 10*time.Second); err != nil {
+		failMessage(err.Error())
+	}
 
 	println("Connected.")
 	ip, err := adaptor.GetClientIP()

diff --git a/examples/espat/mqttsub/main.go b/examples/espat/mqttsub/main.go
@@ -130,7 +130,9 @@ func connectToAP() {
 	println("Connecting to wifi network '" + ssid + "'")
 
 	adaptor.SetWifiMode(espat.WifiModeClient)
-	adaptor.ConnectToAP(ssid, pass, 10)
+	if err := adaptor.ConnectToAccessPoint(ssid, pass, 10*time.Second); err != nil {
+		failMessage(err.Error())
+	}
 
 	println("Connected.")
 	ip, err := adaptor.GetClientIP()

diff --git a/examples/espat/tcpclient/main.go b/examples/espat/tcpclient/main.go
@@ -92,7 +92,9 @@ func connectToAP() {
 	println("Connecting to wifi network '" + ssid + "'")
 
 	adaptor.SetWifiMode(espat.WifiModeClient)
-	adaptor.ConnectToAP(ssid, pass, 10)
+	if err := adaptor.ConnectToAccessPoint(ssid, pass, 10*time.Second); err != nil {
+		failMessage(err.Error())
+	}
 
 	println("Connected.")
 	ip, err := adaptor.GetClientIP()

diff --git a/examples/rtl8720dn/mqttclient/main.go b/examples/rtl8720dn/mqttclient/main.go
@@ -65,7 +65,7 @@ func run() error {
 	}
 	net.UseDriver(rtl)
 
-	err = rtl.ConnectToAP(ssid, password)
+	err = rtl.ConnectToAccessPoint(ssid, password, 10*time.Second)
 	if err != nil {
 		return err
 	}

diff --git a/examples/rtl8720dn/mqttsub/main.go b/examples/rtl8720dn/mqttsub/main.go
@@ -74,7 +74,7 @@ func run() error {
 	}
 	net.UseDriver(rtl)
 
-	err = rtl.ConnectToAP(ssid, password)
+	err = rtl.ConnectToAccessPoint(ssid, password, 10*time.Second)
 	if err != nil {
 		return err
 	}

diff --git a/examples/rtl8720dn/ntpclient/main.go b/examples/rtl8720dn/ntpclient/main.go
@@ -47,7 +47,7 @@ func run() error {
 	}
 	net.UseDriver(rtl)
 
-	err = rtl.ConnectToAP(ssid, password)
+	err = rtl.ConnectToAccessPoint(ssid, password, 10*time.Second)
 	if err != nil {
 		return err
 	}

diff --git a/examples/rtl8720dn/tcpclient/main.go b/examples/rtl8720dn/tcpclient/main.go
@@ -47,7 +47,7 @@ func run() error {
 	}
 	net.UseDriver(rtl)
 
-	err = rtl.ConnectToAP(ssid, password)
+	err = rtl.ConnectToAccessPoint(ssid, password, 10*time.Second)
 	if err != nil {
 		return err
 	}

diff --git a/examples/rtl8720dn/tlsclient/main.go b/examples/rtl8720dn/tlsclient/main.go
@@ -76,7 +76,7 @@ func run() error {
 	net.UseDriver(rtl)
 	http.SetBuf(buf[:])
 
-	err = rtl.ConnectToAP(ssid, password)
+	err = rtl.ConnectToAccessPoint(ssid, password, 10*time.Second)
 	if err != nil {
 		return err
 	}

diff --git a/examples/rtl8720dn/udpstation/main.go b/examples/rtl8720dn/udpstation/main.go
@@ -43,7 +43,7 @@ func run() error {
 	net.UseDriver(rtl)
 	http.SetBuf(buf[:])
 
-	err = rtl.ConnectToAP(ssid, password)
+	err = rtl.ConnectToAccessPoint(ssid, password, 10*time.Second)
 	if err != nil {
 		return err
 	}

diff --git a/examples/rtl8720dn/webclient-tinyterm/main.go b/examples/rtl8720dn/webclient-tinyterm/main.go
@@ -74,7 +74,7 @@ func run() error {
 	http.SetBuf(buf[:])
 
 	fmt.Fprintf(terminal, "ConnectToAP()\r\n")
-	err = rtl.ConnectToAP(ssid, password)
+	err = rtl.ConnectToAccessPoint(ssid, password, 10*time.Second)
 	if err != nil {
 		return err
 	}

diff --git a/examples/rtl8720dn/webclient/main.go b/examples/rtl8720dn/webclient/main.go
@@ -43,7 +43,7 @@ func run() error {
 	net.UseDriver(rtl)
 	http.SetBuf(buf[:])
 
-	err = rtl.ConnectToAP(ssid, password)
+	err = rtl.ConnectToAccessPoint(ssid, password, 10*time.Second)
 	if err != nil {
 		return err
 	}

diff --git a/examples/rtl8720dn/webserver/main.go b/examples/rtl8720dn/webserver/main.go
@@ -43,7 +43,7 @@ func run() error {
 	}
 	http.UseDriver(rtl)
 
-	err = rtl.ConnectToAP(ssid, password)
+	err = rtl.ConnectToAccessPoint(ssid, password, 10*time.Second)
 	if err != nil {
 		return err
 	}

diff --git a/examples/wifinina/connect/main.go b/examples/wifinina/connect/main.go
@@ -128,19 +128,15 @@ func waitSerial() {
 
 // connect to access point
 func connectToAP() {
-	if len(ssid) == 0 || len(pass) == 0 {
-		for {
-			println("Connection failed: Either ssid or password not set")
-			time.Sleep(10 * time.Second)
-		}
-	}
 	time.Sleep(2 * time.Second)
 	println("Connecting to " + ssid)
-	adaptor.SetPassphrase(ssid, pass)
-	for st, _ := adaptor.GetConnectionStatus(); st != wifinina.StatusConnected; {
-		println("Connection status: " + st.String())
-		time.Sleep(1 * time.Second)
-		st, _ = adaptor.GetConnectionStatus()
+	err := adaptor.ConnectToAccessPoint(ssid, pass, 10*time.Second)
+	if err != nil { // error connecting to AP
+		for {
+			println(err)
+			time.Sleep(1 * time.Second)
+		}
 	}
+
 	println("Connected.")
 }
diff --git a/examples/wifinina/http-get/main.go b/examples/wifinina/http-get/main.go
@@ -132,22 +132,18 @@ func waitSerial() {
 
 // connect to access point
 func connectToAP() {
-	if len(ssid) == 0 || len(pass) == 0 {
+	time.Sleep(2 * time.Second)
+	println("Connecting to " + ssid)
+	err := adaptor.ConnectToAccessPoint(ssid, pass, 10*time.Second)
+	if err != nil { // error connecting to AP
 		for {
-			println("Connection failed: Either ssid or password not set")
-			time.Sleep(10 * time.Second)
+			println(err)
+			time.Sleep(1 * time.Second)
 		}
 	}
-	time.Sleep(2 * time.Second)
-	message("Connecting to " + ssid)
-	adaptor.SetPassphrase(ssid, pass)
-	for st, _ := adaptor.GetConnectionStatus(); st != wifinina.StatusConnected; {
-		message("Connection status: " + st.String())
-		time.Sleep(1 * time.Second)
-		st, _ = adaptor.GetConnectionStatus()
-	}
-	message("Connected.")
-	time.Sleep(2 * time.Second)
+
+	println("Connected.")
+
 	ip, _, _, err := adaptor.GetIP()
 	for ; err != nil; ip, _, _, err = adaptor.GetIP() {
 		message(err.Error())

diff --git a/examples/wifinina/mqttclient/main.go b/examples/wifinina/mqttclient/main.go
@@ -104,14 +104,16 @@ func main() {
 func connectToAP() {
 	time.Sleep(2 * time.Second)
 	println("Connecting to " + ssid)
-	adaptor.SetPassphrase(ssid, pass)
-	for st, _ := adaptor.GetConnectionStatus(); st != wifinina.StatusConnected; {
-		println("Connection status: " + st.String())
-		time.Sleep(1 * time.Second)
-		st, _ = adaptor.GetConnectionStatus()
+	err := adaptor.ConnectToAccessPoint(ssid, pass, 10*time.Second)
+	if err != nil { // error connecting to AP
+		for {
+			println(err)
+			time.Sleep(1 * time.Second)
+		}
 	}
+
 	println("Connected.")
-	time.Sleep(2 * time.Second)
+
 	ip, _, _, err := adaptor.GetIP()
 	for ; err != nil; ip, _, _, err = adaptor.GetIP() {
 		println(err.Error())

diff --git a/examples/wifinina/mqttsub/main.go b/examples/wifinina/mqttsub/main.go
@@ -116,13 +116,16 @@ func publishing() {
 func connectToAP() {
 	time.Sleep(2 * time.Second)
 	println("Connecting to " + ssid)
-	adaptor.SetPassphrase(ssid, pass)
-	for st, _ := adaptor.GetConnectionStatus(); st != wifinina.StatusConnected; {
-		println("Connection status: " + st.String())
-		time.Sleep(1 * time.Second)
-		st, _ = adaptor.GetConnectionStatus()
+	err := adaptor.ConnectToAccessPoint(ssid, pass, 10*time.Second)
+	if err != nil { // error connecting to AP
+		for {
+			println(err)
+			time.Sleep(1 * time.Second)
+		}
 	}
+
 	println("Connected.")
+
 	time.Sleep(2 * time.Second)
 	ip, _, _, err := adaptor.GetIP()
 	for ; err != nil; ip, _, _, err = adaptor.GetIP() {

diff --git a/examples/wifinina/ntpclient/main.go b/examples/wifinina/ntpclient/main.go
@@ -151,21 +151,18 @@ func clearBuffer() {
 
 // connect to access point
 func connectToAP() {
-	if len(ssid) == 0 || len(pass) == 0 {
+	time.Sleep(2 * time.Second)
+	println("Connecting to " + ssid)
+	err := adaptor.ConnectToAccessPoint(ssid, pass, 10*time.Second)
+	if err != nil { // error connecting to AP
 		for {
-			println("Connection failed: Either ssid or password not set")
-			time.Sleep(10 * time.Second)
+			println(err)
+			time.Sleep(1 * time.Second)
 		}
 	}
-	time.Sleep(2 * time.Second)
-	message("Connecting to " + ssid)
-	adaptor.SetPassphrase(ssid, pass)
-	for st, _ := adaptor.GetConnectionStatus(); st != wifinina.StatusConnected; {
-		message("Connection status: " + st.String())
-		time.Sleep(1 * time.Second)
-		st, _ = adaptor.GetConnectionStatus()
-	}
-	message("Connected.")
+
+	println("Connected.")
+
 	time.Sleep(2 * time.Second)
 	ip, _, _, err := adaptor.GetIP()
 	for ; err != nil; ip, _, _, err = adaptor.GetIP() {

diff --git a/examples/wifinina/tcpclient/main.go b/examples/wifinina/tcpclient/main.go
@@ -113,14 +113,17 @@ func sendBatch() {
 // connect to access point
 func connectToAP() {
 	time.Sleep(2 * time.Second)
-	message("Connecting to " + ssid)
-	adaptor.SetPassphrase(ssid, pass)
-	for st, _ := adaptor.GetConnectionStatus(); st != wifinina.StatusConnected; {
-		message("Connection status: " + st.String())
-		time.Sleep(1 * time.Second)
-		st, _ = adaptor.GetConnectionStatus()
+	println("Connecting to " + ssid)
+	err := adaptor.ConnectToAccessPoint(ssid, pass, 10*time.Second)
+	if err != nil { // error connecting to AP
+		for {
+			println(err)
+			time.Sleep(1 * time.Second)
+		}
 	}
-	message("Connected.")
+
+	println("Connected.")
+
 	time.Sleep(2 * time.Second)
 	ip, _, _, err := adaptor.GetIP()
 	for ; err != nil; ip, _, _, err = adaptor.GetIP() {

diff --git a/examples/wifinina/tlsclient/main.go b/examples/wifinina/tlsclient/main.go
@@ -122,21 +122,18 @@ func makeHTTPSRequest() {
 
 // connect to access point
 func connectToAP() {
-	if len(ssid) == 0 || len(pass) == 0 {
+	time.Sleep(2 * time.Second)
+	println("Connecting to " + ssid)
+	err := adaptor.ConnectToAccessPoint(ssid, pass, 10*time.Second)
+	if err != nil { // error connecting to AP
 		for {
-			println("Connection failed: Either ssid or password not set")
-			time.Sleep(10 * time.Second)
+			println(err)
+			time.Sleep(1 * time.Second)
 		}
 	}
-	time.Sleep(2 * time.Second)
-	message("Connecting to " + ssid)
-	adaptor.SetPassphrase(ssid, pass)
-	for st, _ := adaptor.GetConnectionStatus(); st != wifinina.StatusConnected; {
-		message("Connection status: " + st.String())
-		time.Sleep(1 * time.Second)
-		st, _ = adaptor.GetConnectionStatus()
-	}
-	message("Connected.")
+
+	println("Connected.")
+
 	time.Sleep(2 * time.Second)
 	ip, _, _, err := adaptor.GetIP()
 	for ; err != nil; ip, _, _, err = adaptor.GetIP() {

diff --git a/examples/wifinina/udpstation/main.go b/examples/wifinina/udpstation/main.go
@@ -76,15 +76,17 @@ func main() {
 // connect to access point
 func connectToAP() {
 	time.Sleep(2 * time.Second)
-	message("Connecting to " + ssid)
-	adaptor.SetPassphrase(ssid, pass)
-	for st, _ := adaptor.GetConnectionStatus(); st != wifinina.StatusConnected; {
-		message("Connection status: " + st.String())
-		time.Sleep(1 * time.Second)
-		st, _ = adaptor.GetConnectionStatus()
+	println("Connecting to " + ssid)
+	err := adaptor.ConnectToAccessPoint(ssid, pass, 10*time.Second)
+	if err != nil { // error connecting to AP
+		for {
+			println(err)
+			time.Sleep(1 * time.Second)
+		}
 	}
-	message("Connected.")
-	time.Sleep(2 * time.Second)
+
+	println("Connected.")
+
 	ip, _, _, err := adaptor.GetIP()
 	for ; err != nil; ip, _, _, err = adaptor.GetIP() {
 		message(err.Error())