From e3e6ff3f47721bfccd236c28e2b31275e17eccec Mon Sep 17 00:00:00 2001 From: brentru Date: Fri, 13 Dec 2024 15:35:13 -0500 Subject: [PATCH] [SD] Complete adapters/ work and build --- .../ws_offline_pico.h} | 12 ++++---- .../ws_offline_pico_v2.h} | 13 +++++---- .../ws_wifi_airlift.h} | 14 +++++----- .../ws_wifi_esp32.h} | 16 +++++------ .../ws_wifi_esp32_v2.h} | 14 +++++----- .../ws_wifi_esp8266.h} | 14 +++++----- .../ws_wifi_ninafw.h} | 14 +++++----- .../ws_wifi_pico.h} | 12 ++++---- .../ws_wifi_pico_v2.h} | 14 +++++----- src/ws_adapters.h | 28 +++++++++---------- src/ws_manager.h | 8 +++--- 11 files changed, 80 insertions(+), 79 deletions(-) rename src/adapters/{network_interfaces/ws_nonet_pico.h => offline/ws_offline_pico.h} (95%) rename src/adapters/{network_interfaces/ws_nonet_pico_v2.h => offline/ws_offline_pico_v2.h} (95%) rename src/adapters/{network_interfaces/Wippersnapper_AIRLIFT.h => wifi/ws_wifi_airlift.h} (97%) rename src/adapters/{network_interfaces/Wippersnapper_ESP32.h => wifi/ws_wifi_esp32.h} (97%) rename src/adapters/{network_interfaces/Wippersnapper_ESP32_V2.h => wifi/ws_wifi_esp32_v2.h} (97%) rename src/adapters/{network_interfaces/Wippersnapper_ESP8266.h => wifi/ws_wifi_esp8266.h} (97%) rename src/adapters/{network_interfaces/Wippersnapper_WIFININA.h => wifi/ws_wifi_ninafw.h} (96%) rename src/adapters/{network_interfaces/ws_networking_pico.h => wifi/ws_wifi_pico.h} (98%) rename src/adapters/{network_interfaces/ws_networking_pico_v2.h => wifi/ws_wifi_pico_v2.h} (98%) diff --git a/src/adapters/network_interfaces/ws_nonet_pico.h b/src/adapters/offline/ws_offline_pico.h similarity index 95% rename from src/adapters/network_interfaces/ws_nonet_pico.h rename to src/adapters/offline/ws_offline_pico.h index 4c248c395..64943ebf2 100644 --- a/src/adapters/network_interfaces/ws_nonet_pico.h +++ b/src/adapters/offline/ws_offline_pico.h @@ -1,5 +1,5 @@ /*! - * @file ws_nonet_pico.h + * @file ws_offline_pico.h * * This is a driver for using the Raspberry Pi Pico/Pico2 * without a network interface with Adafruit IO Wippersnapper. @@ -14,8 +14,8 @@ * */ -#ifndef WS_NONET_PICO_H -#define WS_NONET_PICO_H +#ifndef WS_OFFLINE_PICO_H +#define WS_OFFLINE_PICO_H #if defined(ARDUINO_RASPBERRY_PI_PICO) || defined(ARDUINO_RASPBERRY_PI_PICO_2) @@ -32,7 +32,7 @@ extern Wippersnapper WS; @brief Class for using the Raspberry Pi Pico network interface. */ /****************************************************************************/ -class ws_nonet_pico : public Wippersnapper { +class ws_offline_pico : public Wippersnapper { public: /**************************************************************************/ @@ -40,7 +40,7 @@ class ws_nonet_pico : public Wippersnapper { @brief Initializes the WipperSnapper class for RPi Pico. */ /**************************************************************************/ - ws_nonet_pico() : Wippersnapper() { + ws_offline_pico() : Wippersnapper() { _ssid = 0; _pass = 0; } @@ -50,7 +50,7 @@ class ws_nonet_pico : public Wippersnapper { @brief Destructor */ /**************************************************************************/ - ~ws_nonet_pico() { + ~ws_offline_pico() { // Do nothing } diff --git a/src/adapters/network_interfaces/ws_nonet_pico_v2.h b/src/adapters/offline/ws_offline_pico_v2.h similarity index 95% rename from src/adapters/network_interfaces/ws_nonet_pico_v2.h rename to src/adapters/offline/ws_offline_pico_v2.h index 47681de47..4d030fee6 100644 --- a/src/adapters/network_interfaces/ws_nonet_pico_v2.h +++ b/src/adapters/offline/ws_offline_pico_v2.h @@ -1,5 +1,5 @@ /*! - * @file ws_nonet_pico_v2.h + * @file ws_offline_pico_v2.h * * This is a driver for using the Raspberry Pi Pi Pico/Pico2 * without a network interface with Adafruit IO Wippersnapper. @@ -14,8 +14,8 @@ * */ -#ifndef WS_NONET_PICO_V2_H -#define WS_NONET_PICO_V2_H +#ifndef WS_OFFLINE_PICO_V2_H +#define WS_OFFLINE_PICO_V2_H #if defined(ARDUINO_RASPBERRY_PI_PICO) || defined(ARDUINO_RASPBERRY_PI_PICO_2) @@ -32,7 +32,7 @@ extern Wippersnapper_V2 WsV2; @brief Class for using the Raspberry Pi Pico network interface. */ /****************************************************************************/ -class ws_nonet_pico_v2 : public Wippersnapper_V2 { +class ws_offline_pico_v2 : public Wippersnapper_V2 { public: /**************************************************************************/ @@ -40,7 +40,8 @@ class ws_nonet_pico_v2 : public Wippersnapper_V2 { @brief Initializes the WipperSnapper class for RPi Pico. */ /**************************************************************************/ - ws_nonet_pico_v2() : Wippersnapper_V2() { + ws_offline_pico_v2() : Wippersnapper_V2() { + // No-op } @@ -49,7 +50,7 @@ class ws_nonet_pico_v2 : public Wippersnapper_V2 { @brief Destructor */ /**************************************************************************/ - ~ws_nonet_pico_v2() { + ~ws_offline_pico_v2() { // No-op } diff --git a/src/adapters/network_interfaces/Wippersnapper_AIRLIFT.h b/src/adapters/wifi/ws_wifi_airlift.h similarity index 97% rename from src/adapters/network_interfaces/Wippersnapper_AIRLIFT.h rename to src/adapters/wifi/ws_wifi_airlift.h index 4c564b4e1..1510f0d7b 100644 --- a/src/adapters/network_interfaces/Wippersnapper_AIRLIFT.h +++ b/src/adapters/wifi/ws_wifi_airlift.h @@ -1,5 +1,5 @@ /*! - * @file Wippersnapper_AIRLIFT.h + * @file ws_wifi_airlift.h * * This is a driver for using the Adafruit AirLift * ESP32 Co-Processor's network interface with Wippersnapper. @@ -17,8 +17,8 @@ * */ -#ifndef WIPPERSNAPPER_AIRLIFT_H -#define WIPPERSNAPPER_AIRLIFT_H +#ifndef WS_WIFI_AIRLIFT_H +#define WS_WIFI_AIRLIFT_H #include "Adafruit_MQTT.h" #include "Adafruit_MQTT_Client.h" @@ -40,7 +40,7 @@ extern Wippersnapper WS; @brief Class for using the AirLift Co-Processor network iface. */ /****************************************************************************/ -class Wippersnapper_AIRLIFT : public Wippersnapper { +class ws_wifi_airlift : public Wippersnapper { public: /**************************************************************************/ @@ -48,7 +48,7 @@ class Wippersnapper_AIRLIFT : public Wippersnapper { @brief Initializes the Adafruit IO class for AirLift devices. */ /**************************************************************************/ - Wippersnapper_AIRLIFT() : Wippersnapper() { + ws_wifi_airlift() : Wippersnapper() { _ssPin = SPIWIFI_SS; // 10; _ackPin = SPIWIFI_ACK; // 7; _rstPin = SPIWIFI_RESET; // 5; // should be 7 on PyPortals @@ -71,7 +71,7 @@ class Wippersnapper_AIRLIFT : public Wippersnapper { @brief Destructor for the Adafruit IO AirLift class. */ /**************************************************************************/ - ~Wippersnapper_AIRLIFT() { + ~ws_wifi_airlift() { if (_mqtt) delete _mqtt; } @@ -394,4 +394,4 @@ class Wippersnapper_AIRLIFT : public Wippersnapper { } }; -#endif // WIPPERSNAPPER_AIRLIFT_H \ No newline at end of file +#endif // WS_WIFI_AIRLIFT_H \ No newline at end of file diff --git a/src/adapters/network_interfaces/Wippersnapper_ESP32.h b/src/adapters/wifi/ws_wifi_esp32.h similarity index 97% rename from src/adapters/network_interfaces/Wippersnapper_ESP32.h rename to src/adapters/wifi/ws_wifi_esp32.h index b319ab65f..3ebecf608 100644 --- a/src/adapters/network_interfaces/Wippersnapper_ESP32.h +++ b/src/adapters/wifi/ws_wifi_esp32.h @@ -1,5 +1,5 @@ /*! - * @file Wippersnapper_ESP32.h + * @file ws_wifi_esp32.h * * This is a driver for using the ESP32's network interface * with Adafruit IO Wippersnapper. @@ -14,8 +14,8 @@ * */ -#ifndef Wippersnapper_ESP32_H -#define Wippersnapper_ESP32_H +#ifndef WS_WIFI_ESP32_H +#define WS_WIFI_ESP32_H #ifdef ARDUINO_ARCH_ESP32 #include "Wippersnapper.h" @@ -34,7 +34,7 @@ extern Wippersnapper WS; @brief Class for using the ESP32 network interface. */ /****************************************************************************/ -class Wippersnapper_ESP32 : public Wippersnapper { +class ws_wifi_esp32 : public Wippersnapper { public: /**************************************************************************/ @@ -42,7 +42,7 @@ class Wippersnapper_ESP32 : public Wippersnapper { @brief Initializes the Adafruit IO class for ESP32 devices. */ /**************************************************************************/ - Wippersnapper_ESP32() : Wippersnapper() { + ws_wifi_esp32() : Wippersnapper() { _ssid = 0; _pass = 0; } @@ -52,7 +52,7 @@ class Wippersnapper_ESP32 : public Wippersnapper { @brief Overload for ESP32 devices without filesystem-backed provisioning. */ /**************************************************************************/ - Wippersnapper_ESP32(const char *aioUsername, const char *aioKey, + ws_wifi_esp32(const char *aioUsername, const char *aioKey, const char *netSSID, const char *netPass, const char *brokerURL, uint16_t brokerPort) : Wippersnapper() { @@ -73,7 +73,7 @@ class Wippersnapper_ESP32 : public Wippersnapper { @brief Destructor for the Adafruit IO AirLift class. */ /**************************************************************************/ - ~Wippersnapper_ESP32() { + ~ws_wifi_esp32() { if (_mqtt_client_secure) delete _mqtt_client_secure; if (_mqtt_client_insecure) @@ -365,4 +365,4 @@ class Wippersnapper_ESP32 : public Wippersnapper { }; #endif // ARDUINO_ARCH_ESP32_H -#endif // Wippersnapper_ESP32_H \ No newline at end of file +#endif // WS_WIFI_ESP32_H \ No newline at end of file diff --git a/src/adapters/network_interfaces/Wippersnapper_ESP32_V2.h b/src/adapters/wifi/ws_wifi_esp32_v2.h similarity index 97% rename from src/adapters/network_interfaces/Wippersnapper_ESP32_V2.h rename to src/adapters/wifi/ws_wifi_esp32_v2.h index 17e53868e..2075d7e83 100644 --- a/src/adapters/network_interfaces/Wippersnapper_ESP32_V2.h +++ b/src/adapters/wifi/ws_wifi_esp32_v2.h @@ -14,8 +14,8 @@ * */ -#ifndef Wippersnapper_ESP32_V2_H -#define Wippersnapper_ESP32_V2_H +#ifndef WS_WIFI_ESP32_V2_H +#define WS_WIFI_ESP32_V2_H #ifdef ARDUINO_ARCH_ESP32 #include "Wippersnapper_V2.h" @@ -34,7 +34,7 @@ extern Wippersnapper_V2 WsV2; @brief Class for using the ESP32 network interface. */ /****************************************************************************/ -class Wippersnapper_ESP32V2 : public Wippersnapper_V2 { +class ws_wifi_esp32_v2 : public Wippersnapper_V2 { public: /**************************************************************************/ @@ -42,7 +42,7 @@ class Wippersnapper_ESP32V2 : public Wippersnapper_V2 { @brief Initializes the Adafruit IO class for ESP32 devices. */ /**************************************************************************/ - Wippersnapper_ESP32V2() : Wippersnapper_V2() { + ws_wifi_esp32_v2() : Wippersnapper_V2() { _ssid = 0; _pass = 0; } @@ -52,7 +52,7 @@ class Wippersnapper_ESP32V2 : public Wippersnapper_V2 { @brief Overload for ESP32 devices without filesystem-backed provisioning. */ /**************************************************************************/ - Wippersnapper_ESP32V2(const char *aioUsername, const char *aioKey, + ws_wifi_esp32_v2(const char *aioUsername, const char *aioKey, const char *netSSID, const char *netPass, const char *brokerURL, uint16_t brokerPort) : Wippersnapper_V2() { @@ -73,7 +73,7 @@ class Wippersnapper_ESP32V2 : public Wippersnapper_V2 { @brief Destructor for the Adafruit IO AirLift class. */ /**************************************************************************/ - ~Wippersnapper_ESP32V2() { + ~ws_wifi_esp32_v2() { if (_mqtt_client_secure) delete _mqtt_client_secure; if (_mqtt_client_insecure) @@ -365,4 +365,4 @@ class Wippersnapper_ESP32V2 : public Wippersnapper_V2 { }; #endif // ARDUINO_ARCH_ESP32_H -#endif // Wippersnapper_ESP32_V2_H \ No newline at end of file +#endif // WS_WIFI_ESP32_V2_H \ No newline at end of file diff --git a/src/adapters/network_interfaces/Wippersnapper_ESP8266.h b/src/adapters/wifi/ws_wifi_esp8266.h similarity index 97% rename from src/adapters/network_interfaces/Wippersnapper_ESP8266.h rename to src/adapters/wifi/ws_wifi_esp8266.h index c7fa6b693..0b67d38d5 100644 --- a/src/adapters/network_interfaces/Wippersnapper_ESP8266.h +++ b/src/adapters/wifi/ws_wifi_esp8266.h @@ -1,5 +1,5 @@ /*! - * @file Wippersnapper_ESP8266.h + * @file ws_wifi_esp8266.h * * This is a driver for using the ESP8266's network interface * with Wippersnapper. @@ -14,8 +14,8 @@ * */ -#ifndef WIPPERSNAPPER_ESP8266_H -#define WIPPERSNAPPER_ESP8266_H +#ifndef WS_WIFI_ESP8266_H +#define WS_WIFI_ESP8266_H #ifdef ARDUINO_ARCH_ESP8266 #include "Adafruit_MQTT.h" @@ -45,7 +45,7 @@ extern Wippersnapper WS; interface. */ /******************************************************************************/ -class Wippersnapper_ESP8266 : public Wippersnapper { +class ws_wifi_esp8266 : public Wippersnapper { public: /**************************************************************************/ @@ -61,7 +61,7 @@ class Wippersnapper_ESP8266 : public Wippersnapper { Wireless Network password */ /**************************************************************************/ - Wippersnapper_ESP8266() : Wippersnapper() { + ws_wifi_esp8266() : Wippersnapper() { _ssid = 0; _pass = 0; _wifi_client = new WiFiClient; @@ -74,7 +74,7 @@ class Wippersnapper_ESP8266 : public Wippersnapper { @brief Destructor for the ESP8266's network iface. */ /**************************************************************************/ - ~Wippersnapper_ESP8266() { + ~ws_wifi_esp8266() { if (_wifi_client) delete _wifi_client; if (_mqtt) @@ -322,4 +322,4 @@ class Wippersnapper_ESP8266 : public Wippersnapper { }; #endif // ARDUINO_ARCH_ESP8266 -#endif // WIPPERSNAPPER_ESP8266_H \ No newline at end of file +#endif // WS_WIFI_ESP8266_H \ No newline at end of file diff --git a/src/adapters/network_interfaces/Wippersnapper_WIFININA.h b/src/adapters/wifi/ws_wifi_ninafw.h similarity index 96% rename from src/adapters/network_interfaces/Wippersnapper_WIFININA.h rename to src/adapters/wifi/ws_wifi_ninafw.h index 74f50bffe..f23190775 100644 --- a/src/adapters/network_interfaces/Wippersnapper_WIFININA.h +++ b/src/adapters/wifi/ws_wifi_ninafw.h @@ -1,5 +1,5 @@ /*! - * @file Wippersnapper_WIFININA.h + * @file ws_wifi_ninafw.h * * Network interface for the ublox wifi module on the * Arduino MKR WiFi 1010, Arduino Nano 33 IoT and Arduino UNO WiFi Rev.2. @@ -14,8 +14,8 @@ * */ -#ifndef WIPPERSNAPPER_WIFININA_H -#define WIPPERSNAPPER_WIFININA_H +#ifndef WS_WIFI_NINAFW_H +#define WS_WIFI_NINAFW_H #include #include #include @@ -33,7 +33,7 @@ extern Wippersnapper WS; @brief Class for using the AirLift Co-Processor network iface. */ /****************************************************************************/ -class Wippersnapper_WIFININA : public Wippersnapper { +class ws_wifi_ninafw : public Wippersnapper { public: /**************************************************************************/ @@ -49,7 +49,7 @@ class Wippersnapper_WIFININA : public Wippersnapper { Wireless Network password */ /**************************************************************************/ - Wippersnapper_WIFININA(const char *aioUsername, const char *aioKey, + ws_wifi_ninafw(const char *aioUsername, const char *aioKey, const char *netSSID, const char *netPass) : Wippersnapper() { _ssid = netSSID; @@ -66,7 +66,7 @@ class Wippersnapper_WIFININA : public Wippersnapper { @brief Destructor for the Adafruit IO ublox class. */ /**************************************************************************/ - ~Wippersnapper_WIFININA() { + ~ws_wifi_ninafw() { if (_mqtt) delete _mqtt; } @@ -283,4 +283,4 @@ class Wippersnapper_WIFININA : public Wippersnapper { } }; -#endif // WIPPERSNAPPER_WIFININA_H \ No newline at end of file +#endif // WS_WIFI_NINAFW_H \ No newline at end of file diff --git a/src/adapters/network_interfaces/ws_networking_pico.h b/src/adapters/wifi/ws_wifi_pico.h similarity index 98% rename from src/adapters/network_interfaces/ws_networking_pico.h rename to src/adapters/wifi/ws_wifi_pico.h index f2ec78506..a6dc72138 100644 --- a/src/adapters/network_interfaces/ws_networking_pico.h +++ b/src/adapters/wifi/ws_wifi_pico.h @@ -1,5 +1,5 @@ /*! - * @file ws_networking_pico.h + * @file ws_wifi_pico.h * * This is a driver for using the Raspberry Pi Pico (RP2040) * network interface with Adafruit IO Wippersnapper. @@ -14,8 +14,8 @@ * */ -#ifndef WS_NETWORKING_PICO_H -#define WS_NETWORKING_PICO_H +#ifndef WS_WIFI_PICO_H +#define WS_WIFI_PICO_H #ifdef ARDUINO_RASPBERRY_PI_PICO_W @@ -36,7 +36,7 @@ extern Wippersnapper WS; @brief Class for using the Raspberry Pi Pico network interface. */ /****************************************************************************/ -class ws_networking_pico : public Wippersnapper { +class ws_wifi_pico : public Wippersnapper { public: /**************************************************************************/ @@ -44,7 +44,7 @@ class ws_networking_pico : public Wippersnapper { @brief Initializes the WipperSnapper class for RPi Pico. */ /**************************************************************************/ - ws_networking_pico() : Wippersnapper() { + ws_wifi_pico() : Wippersnapper() { _ssid = 0; _pass = 0; } @@ -54,7 +54,7 @@ class ws_networking_pico : public Wippersnapper { @brief Destructor */ /**************************************************************************/ - ~ws_networking_pico() { + ~ws_wifi_pico() { if (_mqtt_client_secure) delete _mqtt_client_secure; if (_mqtt_client_secure) diff --git a/src/adapters/network_interfaces/ws_networking_pico_v2.h b/src/adapters/wifi/ws_wifi_pico_v2.h similarity index 98% rename from src/adapters/network_interfaces/ws_networking_pico_v2.h rename to src/adapters/wifi/ws_wifi_pico_v2.h index 969eac7f5..920707471 100644 --- a/src/adapters/network_interfaces/ws_networking_pico_v2.h +++ b/src/adapters/wifi/ws_wifi_pico_v2.h @@ -1,5 +1,5 @@ /*! - * @file ws_networking_pico_v2.h + * @file ws_wifi_pico_v2.h * * This is a driver for using the Raspberry Pi Pico (RP2040) * network interface with Adafruit IO Wippersnapper. @@ -14,8 +14,8 @@ * */ -#ifndef WS_NETWORKING_PICO_V2_H -#define WS_NETWORKING_PICO_V2_H +#ifndef WS_WIFI_PICO_V2_H +#define WS_WIFI_PICO_V2_H #ifdef ARDUINO_RASPBERRY_PI_PICO_W @@ -36,7 +36,7 @@ extern Wippersnapper_V2 WsV2; @brief Class for using the Raspberry Pi Pico network interface. */ /****************************************************************************/ -class ws_networking_pico_v2 : public Wippersnapper_V2 { +class ws_wifi_pico_v2 : public Wippersnapper_V2 { public: /**************************************************************************/ @@ -44,7 +44,7 @@ class ws_networking_pico_v2 : public Wippersnapper_V2 { @brief Initializes the WipperSnapper class for RPi Pico. */ /**************************************************************************/ - ws_networking_pico_v2() : Wippersnapper_V2() { + ws_wifi_pico_v2() : Wippersnapper_V2() { _ssid = 0; _pass = 0; } @@ -54,7 +54,7 @@ class ws_networking_pico_v2 : public Wippersnapper_V2 { @brief Destructor */ /**************************************************************************/ - ~ws_networking_pico_v2() { + ~ws_wifi_pico_v2() { if (_mqtt_client_secure) delete _mqtt_client_secure; if (_mqtt_client_secure) @@ -363,4 +363,4 @@ class ws_networking_pico_v2 : public Wippersnapper_V2 { }; #endif // RASPBERRY_PI_PICO_W -#endif // WS_NETWORKING_PICO_V2_H \ No newline at end of file +#endif // WS_WIFI_PICO_V2_H \ No newline at end of file diff --git a/src/ws_adapters.h b/src/ws_adapters.h index 42b051aa0..6477d4f8e 100644 --- a/src/ws_adapters.h +++ b/src/ws_adapters.h @@ -22,32 +22,32 @@ #if defined(ADAFRUIT_METRO_M4_EXPRESS) || \ defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE) || defined(ADAFRUIT_PYPORTAL) || \ defined(ADAFRUIT_PYPORTAL_M4_TITANO) || defined(USE_AIRLIFT) -#include "adapters/network_interfaces/Wippersnapper_AIRLIFT.h" -typedef Wippersnapper_AIRLIFT ws_adapter_wifi; +#include "adapters/wifi/ws_wifi_airlift.h" +typedef ws_wifi_airlift ws_adapter_wifi; // ESP8266 networking adapter #elif defined(ARDUINO_ARCH_ESP8266) -#include "adapters/network_interfaces/Wippersnapper_ESP8266.h" -typedef Wippersnapper_ESP8266 ws_adapter_wifi; +#include "adapters/wifi/ws_wifi_esp8266.h" +typedef ws_wifi_esp8266 ws_adapter_wifi; // ESP32 networking adapter #elif defined(ARDUINO_ARCH_ESP32) -#include "adapters/network_interfaces/Wippersnapper_ESP32.h" -typedef Wippersnapper_ESP32 ws_adapter_wifi; +#include "adapters/wifi/ws_wifi_esp32.h" +typedef ws_wifi_esp32 ws_adapter_wifi; // Networking adapters for Raspberry Pi Pico W-series #elif defined(ARDUINO_RASPBERRY_PI_PICO_W) -#include "adapters/network_interfaces/ws_networking_pico.h" -typedef ws_networking_pico ws_adapter_wifi; +#include "adapters/wifi/ws_wifi_pico.h" +typedef ws_wifi_pico ws_adapter_wifi; // Networking adapter for Arduino Nano 33 IoT and MKR WiFi 1010 #elif defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_SAMD_MKRWIFI1010) -#include "adapters/network_interfaces/Wippersnapper_WIFININA.h" -typedef Wippersnapper_WIFININA ws_adapter_wifi; +#include "adapters/wifi/ws_wifi_ninafw.h" +typedef ws_wifi_ninafw ws_adapter_wifi; /** - * The following are adapters for use with non-networked devices. + * The following are adapters for use without networking functionality. */ #elif defined(RASPBERRY_PI_PICO) || defined(RASPBERRY_PI_PICO_2) -#include "adapters/network_interfaces/ws_nonet_pico.h" -typedef ws_nonet_pico ws_adapter_offline; +#include "adapters/offline/ws_offline_pico.h" +typedef ws_offline_pico ws_adapter_offline; #else -#warning "Must define network interface in config.h!" +#warning "Transport adapter not defined within ws_adapters.h!" #endif #endif // WS_ADAPTERS_H \ No newline at end of file diff --git a/src/ws_manager.h b/src/ws_manager.h index f75a76124..2b7844583 100644 --- a/src/ws_manager.h +++ b/src/ws_manager.h @@ -1,10 +1,10 @@ #ifndef WIPPERSNAPPER_MANAGER_H #define WIPPERSNAPPER_MANAGER_H -#include "adapters/network_interfaces/ws_nonet_pico.h" -typedef ws_nonet_pico ws_adapter_offline; -#include "adapters/network_interfaces/ws_nonet_pico_v2.h" -typedef ws_nonet_pico_v2 ws_adapter_offline_v2; +#include "adapters/offline/ws_offline_pico.h" +typedef ws_offline_pico ws_adapter_offline; +#include "adapters/offline/ws_offline_pico_v2.h" +typedef ws_offline_pico_v2 ws_adapter_offline_v2; /****************************************************************************/ /*!