Merge branch 'master' of ch1p.io:homekit

3 files changed, 95 insertions, 0 deletions

diff --git a/include/pio/libs/wifi/homekit/wifi.cpp b/include/pio/libs/wifi/homekit/wifi.cpp
new file mode 100644
index 0000000..3060dd6
--- /dev/null
+++ b/include/pio/libs/wifi/homekit/wifi.cpp
@@ -0,0 +1,47 @@
+#include <pgmspace.h>
+#include "wifi.h"
+#include <homekit/config.h>
+#include <homekit/logging.h>
+
+namespace homekit::wifi {
+
+using namespace homekit;
+using homekit::config::ConfigData;
+
+const char NODE_ID[] = CONFIG_NODE_ID;
+const char AP_SSID[] = CONFIG_WIFI_AP_SSID;
+const char STA_SSID[] = CONFIG_WIFI_STA_SSID;
+const char STA_PSK[] = CONFIG_WIFI_STA_PSK;
+
+void getConfig(ConfigData &cfg, const char** ssid, const char** psk, const char** hostname) {
+    if (cfg.flags.wifi_configured) {
+        *ssid = cfg.wifi_ssid;
+        *psk = cfg.wifi_psk;
+        *hostname = cfg.node_id;
+    } else {
+        *ssid = STA_SSID;
+        *psk = STA_PSK;
+        *hostname = NODE_ID;
+    }
+}
+
+std::shared_ptr<std::list<ScanResult>> scan() {
+    if (WiFi.getMode() != WIFI_STA) {
+        PRINTLN("wifi::scan: switching mode to STA");
+        WiFi.mode(WIFI_STA);
+    }
+
+    std::shared_ptr<std::list<ScanResult>> results(new std::list<ScanResult>);
+    int count = WiFi.scanNetworks();
+    for (int i = 0; i < count; i++) {
+        results->push_back(ScanResult {
+            .rssi = WiFi.RSSI(i),
+            .ssid = WiFi.SSID(i)
+        });
+    }
+
+    WiFi.scanDelete();
+    return results;
+}
+
+}
\ No newline at end of file
diff --git a/include/pio/libs/wifi/homekit/wifi.h b/include/pio/libs/wifi/homekit/wifi.h
new file mode 100644
index 0000000..3fe77cb
--- /dev/null
+++ b/include/pio/libs/wifi/homekit/wifi.h
@@ -0,0 +1,40 @@
+#ifndef HOMEKIT_TEPMHUM_WIFI_H
+#define HOMEKIT_TEPMHUM_WIFI_H
+
+#include <ESP8266WiFi.h>
+#include <list>
+#include <memory>
+
+#include <homekit/config.h>
+
+namespace homekit::wifi {
+
+using homekit::config::ConfigData;
+
+struct ScanResult {
+    int rssi;
+    String ssid;
+};
+
+void getConfig(ConfigData& cfg, const char** ssid, const char** psk, const char** hostname);
+
+std::shared_ptr<std::list<ScanResult>> scan();
+
+inline uint32_t getIPAsInteger() {
+    if (!WiFi.isConnected())
+        return 0;
+    return WiFi.localIP().v4();
+}
+
+inline int8_t getRSSI() {
+    return WiFi.RSSI();
+}
+
+extern const char AP_SSID[];
+extern const char STA_SSID[];
+extern const char STA_PSK[];
+extern const char NODE_ID[];
+
+}
+
+#endif //HOMEKIT_TEPMHUM_WIFI_H
\ No newline at end of file
diff --git a/include/pio/libs/wifi/library.json b/include/pio/libs/wifi/library.json
new file mode 100644
index 0000000..c7faecd
--- /dev/null
+++ b/include/pio/libs/wifi/library.json
@@ -0,0 +1,8 @@
+{
+  "name": "homekit_wifi",
+  "version": "1.0.1",
+  "build": {
+    "flags": "-I../../include"
+  }
+}
+