From a09ec31e7a07d7e1d63487969368e85740b5db94 Mon Sep 17 00:00:00 2001
From: Yurii Soldak <ysoldak@gmail.com>
Date: Wed, 26 May 2021 23:10:31 +0200
Subject: [PATCH] Fix RSSI command for WiFiNINA + Print current SSID + Wait for
 correct time before printing it out + Cleanup

---
 examples/wifinina/connect/main.go | 54 +++++++++++++++++++++++--------
 wifinina/wifinina.go              |  2 +-
 2 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/examples/wifinina/connect/main.go b/examples/wifinina/connect/main.go
index 97814c9..f4bc49a 100644
--- a/examples/wifinina/connect/main.go
+++ b/examples/wifinina/connect/main.go
@@ -52,15 +52,37 @@ func main() {
 	connectToAP()
 
 	for {
-		println("---------------------------------")
+		println("----------------------------------------")
+		printSSID()
+		printRSSI()
+		printMac()
 		printIPs()
 		printTime()
-		printMacAddress()
 		time.Sleep(10 * time.Second)
 	}
 
 }
 
+func printSSID() {
+	print("SSID: ")
+	ssid, err := adaptor.GetCurrentSSID()
+	if err != nil {
+		println("Unknown (error: ", err.Error(), ")")
+		return
+	}
+	println(ssid)
+}
+
+func printRSSI() {
+	print("RSSI: ")
+	rssi, err := adaptor.GetCurrentRSSI()
+	if err != nil {
+		println("Unknown (error: ", err.Error(), ")")
+		return
+	}
+	println(fmt.Sprintf("%d", rssi))
+}
+
 func printIPs() {
 	ip, subnet, gateway, err := adaptor.GetIP()
 	if err != nil {
@@ -69,20 +91,28 @@ func printIPs() {
 	}
 	println("IP: ", ip.String())
 	println("Subnet: ", subnet.String())
-	println("Gateway IP: ", gateway.String())
+	println("Gateway: ", gateway.String())
 }
 
 func printTime() {
 	print("Time: ")
 	t, err := adaptor.GetTime()
-	if err != nil {
-		println("Unknown (error: ", err.Error(), ")")
+	for {
+		if err != nil {
+			println("Unknown (error: ", err.Error(), ")")
+			return
+		}
+		if t != 0 {
+			break
+		}
+		time.Sleep(time.Second)
+		t, err = adaptor.GetTime()
 	}
 	println(time.Unix(int64(t), 0).String())
 }
 
-func printMacAddress() {
-	print("MAC Address: ")
+func printMac() {
+	print("MAC: ")
 	b := make([]byte, 8)
 	mac, err := adaptor.GetMACAddress()
 	if err != nil {
@@ -115,16 +145,12 @@ func connectToAP() {
 		}
 	}
 	time.Sleep(2 * time.Second)
-	message("Connecting to " + ssid)
+	println("Connecting to " + ssid)
 	adaptor.SetPassphrase(ssid, pass)
 	for st, _ := adaptor.GetConnectionStatus(); st != wifinina.StatusConnected; {
-		message("Connection status: " + st.String())
+		println("Connection status: " + st.String())
 		time.Sleep(1 * time.Second)
 		st, _ = adaptor.GetConnectionStatus()
 	}
-	message("Connected.")
-}
-
-func message(msg string) {
-	println(msg, "\r")
+	println("Connected.")
 }
diff --git a/wifinina/wifinina.go b/wifinina/wifinina.go
index cc84d3f..e7fb926 100644
--- a/wifinina/wifinina.go
+++ b/wifinina/wifinina.go
@@ -484,7 +484,7 @@ func (d *Device) GetCurrentBSSID() (MACAddress, error) {
 }
 
 func (d *Device) GetCurrentRSSI() (int32, error) {
-	return d.getInt32(d.req1(CmdGetCurrBSSID))
+	return d.getInt32(d.req1(CmdGetCurrRSSI))
 }
 
 func (d *Device) GetCurrentSSID() (string, error) {