fix WifiScanner and example

eloquentarduino · eloquentarduino · commit 692de44985cf · 2022-06-25T15:13:38.000+02:00
diff --git a/examples/CameraWebServerExample/CameraWebServerExample.ino b/examples/CameraWebServerExample/CameraWebServerExample.ino
@@ -2,7 +2,7 @@
 #include "eloquent/networking/wifi.h"
 #include "eloquent/vision/camera/esp32/webserver.h"
 // replace according to your own camera
-#include "eloquent/vision/camera/esp32/m5wide/jpeg/vga.h"
+#include "eloquent/vision/camera/esp32/m5wide/jpeg/qqvga.h"
 
 
 
diff --git a/examples/IndoorPositioning/WiFiScannerExample/WiFiScannerExample.ino b/examples/IndoorPositioning/WiFiScannerExample/WiFiScannerExample.ino
@@ -39,6 +39,7 @@ void loop() {
     if (location != "" && location != "stop") {
         Serial.print(location);
         Serial.print(": ");
+        wifiScanner.scan();
         wifiScanner.printAsJson(Serial);
         delay(2000);
     }
diff --git a/src/eloquent/networking/wifi/WifiScanner.h b/src/eloquent/networking/wifi/WifiScanner.h
@@ -91,7 +91,15 @@ namespace Eloquent {
                  * @return
                  */
                 virtual String macAt(uint8_t i) {
-                    return WiFi.BSSIDstr(i);
+                    uint8_t *bssid = WiFi.BSSID(i);
+
+                    return  this->hex(bssid[0]) + ":" +
+                            this->hex(bssid[1]) + ":" +
+                            this->hex(bssid[2]) + ":" +
+                            this->hex(bssid[3]) + ":" +
+                            this->hex(bssid[4]) + ":" +
+                            this->hex(bssid[5]) + ":" +
+                            this->hex(bssid[6]);
                 }
 
                 /**
@@ -114,6 +122,14 @@ namespace Eloquent {
                     return WiFi.RSSI(i);
                 }
 
+                /**
+                 * Get identifier of current network
+                 * @return
+                 */
+                virtual String id() {
+                    return idAt(i);
+                }
+
                 /**
                  * Get identifier of given network
                  * @param i
@@ -129,7 +145,7 @@ namespace Eloquent {
                  * @param stream
                  */
                 template<typename Stream>
-                virtual void printAsJson(Stream& stream) {
+                void printAsJson(Stream& stream) {
                     stream.print('{');
 
                     for (uint8_t i = 0; i < numNetworks; i++) {
@@ -151,6 +167,22 @@ namespace Eloquent {
                 uint8_t i = 0;
                 uint8_t numNetworks;
                 bool useMac = false;
+
+                /**
+                 * Convert byte to hex string
+                 * @param byte
+                 * @return
+                 */
+                String hex(uint8_t byte) {
+                    String alphabet = "0123456789ABCDEF";
+                    char hex[3] = {
+                        alphabet.charAt(byte >> 4),
+                        alphabet.charAt(byte & 0b1111),
+                        '\0'
+                    };
+
+                    return String(hex);
+                }
             };
         }
     }
diff --git a/src/eloquent/vision/image/BaseImage.h b/src/eloquent/vision/image/BaseImage.h
@@ -202,6 +202,17 @@ namespace Eloquent {
                     _copyOnWrite = copy;
                 }
 
+                /**
+                 * Cast to given type
+                 * @tparam T
+                 * @param dest
+                 */
+                template<typename T>
+                void castTo(T* dest) {
+                    for (size_t i = 0; i < getLength(); i++)
+                        dest[i] = (T) buffer[i];
+                }
+
                 /**
                  * Write raw data to image container
                  * @param buffer
@@ -230,6 +241,26 @@ namespace Eloquent {
                 size_t writeTo(Writer writer) {
                     return writer.write(buffer, getLength());
                 }
+
+                /**
+                 *
+                 * @tparam Printer
+                 * @param printer
+                 * @param separator
+                 * @param end
+                 * @return
+                 */
+                template<typename Printer>
+                void printTo(Printer printer, char separator = ',', char end = '\n') {
+                    printer.print(at(0));
+
+                    for (size_t i = 1; i < 30; i++) {
+                        printer.print(separator);
+                        printer.print(at(i));
+                    }
+
+                    printer.print(end);
+                }
                 
                 /**
                  * Print as json

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ void loop() {`
`39`	`39`	`if (location != "" && location != "stop") {`
`40`	`40`	`Serial.print(location);`
`41`	`41`	`Serial.print(": ");`
	`42`	`+ wifiScanner.scan();`
`42`	`43`	`wifiScanner.printAsJson(Serial);`
`43`	`44`	`delay(2000);`
`44`	`45`	`}`