Move wifi defines to Ws_networking

Author: tyeth

src/Wippersnapper.h

@@ -215,12 +215,7 @@ typedef enum {
   FSM_NET_ESTABLISH_MQTT,
 } fsm_net_t;
 
-#ifndef WL_MAC_ADDR_LENGTH
-#define WL_MAC_ADDR_LENGTH 6 // MAC address length - from RP2040 BSP
-#endif
 #define WS_WDT_TIMEOUT 60000       ///< WDT timeout
-#define WS_MAX_SORTED_NETWORKS 15  ///< Maximum number of networks to sort
-#define WS_MAX_ALT_WIFI_NETWORKS 3 ///< Maximum number of alternative networks
 /* MQTT Configuration */
 #define WS_KEEPALIVE_INTERVAL_MS                                               \
   5000 ///< Session keepalive interval time, in milliseconds

src/Wippersnapper_Networking.h

@@ -1,44 +1,51 @@
-/*!
- * @file Wippersnapper_Networking.h
- *
- * This file includes network interfaces at compile-time.
- *
- * Adafruit invests time and resources providing this open source code,
- * please support Adafruit and open-source hardware by purchasing
- * products from Adafruit!
- *
- * Copyright (c) Brent Rubell 2020-2021 for Adafruit Industries.
- *
- * BSD license, all text here must be included in any redistribution.
- *
- */
-
-#ifndef WIPPERSNAPPER_NETWORKING_H
-#define WIPPERSNAPPER_NETWORKING_H
-
-#if defined(ADAFRUIT_METRO_M4_EXPRESS) ||                                      \
-    defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE) || defined(ADAFRUIT_PYPORTAL) ||   \
-    defined(ADAFRUIT_PYPORTAL_M4_TITANO) || defined(USE_AIRLIFT)
-#include "network_interfaces/Wippersnapper_AIRLIFT.h"
-/** Nina-FW (adafruit fork) networking class */
-typedef Wippersnapper_AIRLIFT Wippersnapper_WiFi;
-#elif defined(ARDUINO_ARCH_ESP8266)
-#include "network_interfaces/Wippersnapper_ESP8266.h"
-/** ESP8266's networking class */
-typedef Wippersnapper_ESP8266 Wippersnapper_WiFi;
-#elif defined(ARDUINO_ARCH_ESP32)
-#include "network_interfaces/Wippersnapper_ESP32.h"
-/** ESP32's networking class */
-typedef Wippersnapper_ESP32 Wippersnapper_WiFi;
-#elif defined(ARDUINO_ARCH_RP2040)
-#include "network_interfaces/ws_networking_pico.h"
-typedef ws_networking_pico Wippersnapper_WiFi;
-#elif defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_SAMD_MKRWIFI1010)
-/** Nina-FW (arduino) networking class */
-#include "network_interfaces/Wippersnapper_WIFININA.h"
-typedef Wippersnapper_WIFININA Wippersnapper_WiFi;
-#else
-#warning "Must define network interface in config.h!"
-#endif
-
+/*!
+ * @file Wippersnapper_Networking.h
+ *
+ * This file includes network interfaces at compile-time.
+ *
+ * Adafruit invests time and resources providing this open source code,
+ * please support Adafruit and open-source hardware by purchasing
+ * products from Adafruit!
+ *
+ * Copyright (c) Brent Rubell 2020-2021 for Adafruit Industries.
+ *
+ * BSD license, all text here must be included in any redistribution.
+ *
+ */
+
+#ifndef WIPPERSNAPPER_NETWORKING_H
+#define WIPPERSNAPPER_NETWORKING_H
+
+#ifndef WL_MAC_ADDR_LENGTH
+#define WL_MAC_ADDR_LENGTH 6 // MAC address length - from RP2040 BSP
+#endif
+#define WS_MAX_SORTED_NETWORKS 15  ///< Maximum number of networks to sort
+#define WS_MAX_ALT_WIFI_NETWORKS 3 ///< Maximum number of alternative networks
+
+
+#if defined(ADAFRUIT_METRO_M4_EXPRESS) ||                                      \
+    defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE) || defined(ADAFRUIT_PYPORTAL) ||   \
+    defined(ADAFRUIT_PYPORTAL_M4_TITANO) || defined(USE_AIRLIFT)
+#include "network_interfaces/Wippersnapper_AIRLIFT.h"
+/** Nina-FW (adafruit fork) networking class */
+typedef Wippersnapper_AIRLIFT Wippersnapper_WiFi;
+#elif defined(ARDUINO_ARCH_ESP8266)
+#include "network_interfaces/Wippersnapper_ESP8266.h"
+/** ESP8266's networking class */
+typedef Wippersnapper_ESP8266 Wippersnapper_WiFi;
+#elif defined(ARDUINO_ARCH_ESP32)
+#include "network_interfaces/Wippersnapper_ESP32.h"
+/** ESP32's networking class */
+typedef Wippersnapper_ESP32 Wippersnapper_WiFi;
+#elif defined(ARDUINO_ARCH_RP2040)
+#include "network_interfaces/ws_networking_pico.h"
+typedef ws_networking_pico Wippersnapper_WiFi;
+#elif defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_SAMD_MKRWIFI1010)
+/** Nina-FW (arduino) networking class */
+#include "network_interfaces/Wippersnapper_WIFININA.h"
+typedef Wippersnapper_WIFININA Wippersnapper_WiFi;
+#else
+#warning "Must define network interface in config.h!"
+#endif
+
 #endif // WIPPERSNAPPER_NETWORKING_H