Allow any board that declared HAS_ADAFRUIT_AIRLIFT to work, not just the metro m4 airlift lite

Author: alwayslinux2

src/local/BLELocalDevice.cpp

@@ -46,7 +46,7 @@ BLELocalDevice::~BLELocalDevice()
 
 int BLELocalDevice::begin()
 {
-#if defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_NANO_RP2040_CONNECT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
+#if defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_NANO_RP2040_CONNECT) || defined(HAS_ADAFRUIT_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   // reset the NINA in BLE mode
   pinMode(SPIWIFI_SS, OUTPUT);
   pinMode(NINA_RESETN, OUTPUT);
@@ -61,7 +61,7 @@ int BLELocalDevice::begin()
   delay(100);
   digitalWrite(NINA_RESETN, LOW);
   delay(750);
-#elif defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_NANO_RP2040_CONNECT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
+#elif defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_NANO_RP2040_CONNECT) || defined(HAS_ADAFRUIT_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   // inverted reset
   digitalWrite(NINA_RESETN, LOW);
   delay(100);
@@ -74,7 +74,7 @@ int BLELocalDevice::begin()
 #endif
 
 
-#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
+#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(HAS_ADAFRUIT_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   // set SS HIGH
   digitalWrite(SPIWIFI_SS, HIGH);
 
@@ -195,7 +195,7 @@ void BLELocalDevice::end()
 #if defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_AVR_UNO_WIFI_REV2)
   // disable the NINA
   digitalWrite(NINA_RESETN, HIGH);
-#elif defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_NANO_RP2040_CONNECT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
+#elif defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_NANO_RP2040_CONNECT) || defined(HAS_ADAFRUIT_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   // disable the NINA
   digitalWrite(NINA_RESETN, LOW);
 #elif defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION)

src/utility/HCI.cpp

@@ -127,7 +127,7 @@ void HCIClass::poll()
 
 void HCIClass::poll(unsigned long timeout)
 {
-#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
+#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(HAS_ADAFRUIT_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   digitalWrite(NINA_RTS, LOW);
 #endif
 
@@ -152,15 +152,15 @@ void HCIClass::poll(unsigned long timeout)
         if (_debug) {
           dumpPkt("HCI ACLDATA RX <- ", _recvIndex, _recvBuffer);
         }
-#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
+#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(HAS_ADAFRUIT_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
         digitalWrite(NINA_RTS, HIGH);
 #endif
         int pktLen = _recvIndex - 1;
         _recvIndex = 0;
 
         handleAclDataPkt(pktLen, &_recvBuffer[1]);
 
-#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
+#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(HAS_ADAFRUIT_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
         digitalWrite(NINA_RTS, LOW);  
 #endif
       }
@@ -169,7 +169,7 @@ void HCIClass::poll(unsigned long timeout)
         if (_debug) {
           dumpPkt("HCI EVENT RX <- ", _recvIndex, _recvBuffer);
         }
-#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
+#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(HAS_ADAFRUIT_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
         digitalWrite(NINA_RTS, HIGH);
 #endif
         // received full event
@@ -178,7 +178,7 @@ void HCIClass::poll(unsigned long timeout)
 
         handleEventPkt(pktLen, &_recvBuffer[1]);
 
-#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
+#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(HAS_ADAFRUIT_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
         digitalWrite(NINA_RTS, LOW);
 #endif
       }
@@ -191,7 +191,7 @@ void HCIClass::poll(unsigned long timeout)
     }
   }
 
-#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
+#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(HAS_ADAFRUIT_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   digitalWrite(NINA_RTS, HIGH);
 #endif
 }

src/utility/HCIUartTransport.cpp

@@ -29,7 +29,7 @@
 // SerialHCI is already defined in the variant
 #elif defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION)
 #define SerialHCI Serial2
-#elif defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
+#elif defined(HAS_ADAFRUIT_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
 #define SerialHCI SerialESP32
 #else
 #define SerialHCI Serial1
@@ -84,7 +84,7 @@ int HCIUartTransportClass::read()
 
 size_t HCIUartTransportClass::write(const uint8_t* data, size_t length)
 {
-#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
+#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(HAS_ADAFRUIT_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
   // wait while the CTS pin is low
   while (digitalRead(NINA_CTS) == HIGH);
 #endif
@@ -98,7 +98,7 @@ size_t HCIUartTransportClass::write(const uint8_t* data, size_t length)
 
 #if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(ARDUINO_NANO_RP2040_CONNECT)
 HCIUartTransportClass HCIUartTransport(SerialHCI, 119600);
-#elif defined(ADAFRUIT_ITSYBITSY_M4_EXPRESS) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
+#elif defined(ADAFRUIT_ITSYBITSY_M4_EXPRESS) || defined(HAS_ADAFRUIT_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
 HCIUartTransportClass HCIUartTransport(SerialHCI, 115200);
 #else
 HCIUartTransportClass HCIUartTransport(SerialHCI, 912600);