[Ardrivo] Properly stub WiFiClass and WiFiClient

Signed-off-by: AeroStun <[email protected]>

Author: AeroStun

CMakeLists.txt

@@ -102,7 +102,8 @@ target_sources (Ardrivo PRIVATE
 
     include/Ardrivo/WiFi.h
     src/Ardrivo/WiFi.cpp
-)
+    include/Ardrivo/WiFiClient.h
+    )
 if (SMCE_ARDRIVO_MQTT)
   target_sources (Ardrivo PRIVATE include/Ardrivo/MQTT.h src/Ardrivo/MQTT.cpp)
   target_link_libraries(Ardrivo PRIVATE SMCE_mosquitto)

include/Ardrivo/IPAddress.h

@@ -19,6 +19,8 @@
 #ifndef IPAddress_h
 #define IPAddress_h
 
-struct IPAddress {};
+class IPAddress {
+    std::uint8_t m_bytes[4]{0, 0, 0, 0};
+};
 
 #endif // IPAddress_h

include/Ardrivo/WiFi.h

@@ -20,25 +20,74 @@
 #define WiFi_h
 
 #include <cstdint>
-#include "Client.h"
 #include "IPAddress.h"
 #include "SMCE_dll.hpp"
+#include "WiFiClient.h"
 
-struct WiFiClass : Client {
-    inline int connect([[maybe_unused]] IPAddress ip, [[maybe_unused]] std::uint16_t port) override { return 0; }
-    int connect([[maybe_unused]] const char* host, [[maybe_unused]] std::uint16_t port) override { return 0; }
-    std::size_t write([[maybe_unused]] std::uint8_t) override { return 0; }
-    std::size_t write([[maybe_unused]] const std::uint8_t* buf, [[maybe_unused]] std::size_t size) override {
-        return 0;
+enum {
+    WL_SSID_MAX_LENGTH = 32,
+    WL_WPA_KEY_MAX_LENGTH = 63,
+    WL_WEP_KEY_MAX_LENGTH = 13,
+    WL_MAC_ADDR_LENGTH = 6,
+    WL_IPV4_LENGTH = 4,
+    WL_NETWORKS_LIST_MAXNUM = 10,
+    MAX_SOCK_NUM = 4,
+    SOCK_NOT_AVAIL = 255,
+    NA_STATE = -1,
+    WL_MAX_ATTEMPT_CONNECTION = 10,
+};
+
+enum wl_status_t {
+    WL_NO_SHIELD = 255, // for compatibility with WiFi Shield library
+    WL_IDLE_STATUS = 0,
+    WL_NO_SSID_AVAIL = 1,
+    WL_SCAN_COMPLETED = 2,
+    WL_CONNECTED = 3,
+    WL_CONNECT_FAILED = 4,
+    WL_CONNECTION_LOST = 5,
+    WL_DISCONNECTED = 6,
+};
+
+enum wl_enc_type {
+    ENC_TYPE_WEP = 5,
+    ENC_TYPE_TKIP = 2,
+    ENC_TYPE_CCMP = 4,
+    ENC_TYPE_NONE = 7,
+    ENC_TYPE_AUTO = 8,
+};
+
+struct WiFiClass {
+    int begin() { return 0; }
+    int begin([[maybe_unused]] const char* ssid) { return WL_NO_SHIELD; }
+    int begin([[maybe_unused]] const char* ssid, [[maybe_unused]] const char* pass) { return WL_NO_SHIELD; }
+    int begin([[maybe_unused]] const char* ssid, [[maybe_unused]] std::uint8_t key_idx,
+              [[maybe_unused]] const char* key) {
+        return WL_NO_SHIELD;
     }
-    int available() override { return 0; }
-    int read() override { return -1; }
-    int read([[maybe_unused]] std::uint8_t* buf, [[maybe_unused]] std::size_t size) override { return 0; }
-    int peek() override { return -1; }
-    void flush() override {}
-    void stop() override {}
-    std::uint8_t connected() override { return 0; }
-    operator bool() override { return false; }
+    int disconnect() { return WL_NO_SHIELD; }
+    void config([[maybe_unused]] IPAddress local_ip) {}
+    void config([[maybe_unused]] IPAddress local_ip, [[maybe_unused]] IPAddress dns_server) {}
+    void config([[maybe_unused]] IPAddress local_ip, [[maybe_unused]] IPAddress dns_server,
+                [[maybe_unused]] IPAddress gateway) {}
+    void config([[maybe_unused]] IPAddress local_ip, [[maybe_unused]] IPAddress dns_server,
+                [[maybe_unused]] IPAddress gateway, [[maybe_unused]] IPAddress subnet) {}
+    void setDNS([[maybe_unused]] IPAddress dns_server1) {}
+    void setDNS([[maybe_unused]] IPAddress dns_server1, [[maybe_unused]] IPAddress dns_server2) {}
+    /*[[nodiscard]]*/ char* SSID() const { return nullptr; }
+    /*[[nodiscard]]*/ char* SSID([[maybe_unused]] std::uint8_t networkItem) const { return nullptr; }
+    std::uint8_t* BSSID(std::uint8_t* bssid);
+    /*[[nodiscard]]*/ std::int32_t RSSI() { return 0; }
+    /*[[nodiscard]]*/ std::int32_t RSSI([[maybe_unused]] std::uint8_t networkItem) { return 0; }
+    /*[[nodiscard]]*/ std::uint8_t encryptionType() { return ENC_TYPE_AUTO; }
+    /*[[nodiscard]]*/ std::uint8_t encryptionType([[maybe_unused]] std::uint8_t networkItem) { return ENC_TYPE_AUTO; }
+    std::int8_t scanNetworks() { return 0; }
+    /*[[nodiscard]]*/ static std::uint8_t getSocket() { return 0; }
+    std::uint8_t* macAddress(std::uint8_t* mac) const;
+    /*[[nodiscard]]*/ int status() const { return WL_NO_SHIELD; }
+
+    /*[[nodiscard]]*/ IPAddress localIP() { return {}; }
+    /*[[nodiscard]]*/ IPAddress subnetMask() { return {}; }
+    /*[[nodiscard]]*/ IPAddress gatewayIP() { return {}; }
 };
 
 SMCE__DLL_RT_API

include/Ardrivo/WiFiClient.h

@@ -0,0 +1,45 @@
+/*
+ *  WiFiClient.h
+ *  Copyright 2022 ItJustWorksTM
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+#ifndef wificlient_h
+#define wificlient_h
+
+#include <cstdint>
+#include "Client.h"
+#include "IPAddress.h"
+
+struct WiFiClient : Client {
+    inline int connect([[maybe_unused]] IPAddress ip, [[maybe_unused]] std::uint16_t port) override { return 0; }
+    int connect([[maybe_unused]] const char* host, [[maybe_unused]] std::uint16_t port) override { return 0; }
+    std::size_t write([[maybe_unused]] std::uint8_t) override { return 0; }
+    std::size_t write([[maybe_unused]] const std::uint8_t* buf, [[maybe_unused]] std::size_t size) override {
+        return 0;
+    }
+    int available() override { return 0; }
+    int read() override { return -1; }
+    int read([[maybe_unused]] std::uint8_t* buf, [[maybe_unused]] std::size_t size) override { return 0; }
+    int peek() override { return -1; }
+    void flush() override {}
+    void stop() override {}
+    /*[[nodiscard]]*/ std::uint8_t connected() override { return 0; }
+    operator bool() override { return false; }
+
+    using Print::write;
+};
+
+#endif // wificlient_h

src/Ardrivo/WiFi.cpp

@@ -16,7 +16,18 @@
  *
  */
 
+#include <algorithm>
 #include "SMCE_dll.hpp"
 #include "WiFi.h"
 
 SMCE__DLL_API WiFiClass WiFi;
+
+std::uint8_t* WiFiClass::BSSID(std::uint8_t* bssid) {
+    std::fill_n(bssid, WL_MAC_ADDR_LENGTH, 0);
+    return bssid;
+}
+
+std::uint8_t* WiFiClass::macAddress(std::uint8_t* mac) const {
+    std::fill_n(mac, WL_MAC_ADDR_LENGTH, 0);
+    return mac;
+}

test/sketches/wifi/wifi.ino

@@ -2,11 +2,10 @@
 #include <WiFi.h>
 
 void setup() {
-#ifndef __SMCE__
     WiFi.begin("foo", "bar");
-#endif
     MQTTClient clt;
-    clt.begin(WiFi);
+    WiFiClient net;
+    clt.begin(net);
 }
 
 void loop() { delay(1); }