Skip to content

Commit fe27b85

Browse files
alwayslinux2alwayslinux2
committed
Allow any board that declared HAS_ADAFRUIT_AIRLIFT to work, not just the metro m4 airlift lite
1 parent 026b6e7 commit fe27b85

3 files changed

Lines changed: 13 additions & 13 deletions

File tree

‎src/local/BLELocalDevice.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ BLELocalDevice::~BLELocalDevice()
4646

4747
int BLELocalDevice::begin()
4848
{
49-
#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)
49+
#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)
5050
// reset the NINA in BLE mode
5151
pinMode(SPIWIFI_SS, OUTPUT);
5252
pinMode(NINA_RESETN, OUTPUT);
@@ -61,7 +61,7 @@ int BLELocalDevice::begin()
6161
delay(100);
6262
digitalWrite(NINA_RESETN, LOW);
6363
delay(750);
64-
#elif defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_NANO_RP2040_CONNECT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
64+
#elif defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_NANO_RP2040_CONNECT) || defined(HAS_ADAFRUIT_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
6565
// inverted reset
6666
digitalWrite(NINA_RESETN, LOW);
6767
delay(100);
@@ -74,7 +74,7 @@ int BLELocalDevice::begin()
7474
#endif
7575

7676

77-
#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
77+
#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(HAS_ADAFRUIT_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
7878
// set SS HIGH
7979
digitalWrite(SPIWIFI_SS, HIGH);
8080

@@ -195,7 +195,7 @@ void BLELocalDevice::end()
195195
#if defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_AVR_UNO_WIFI_REV2)
196196
// disable the NINA
197197
digitalWrite(NINA_RESETN, HIGH);
198-
#elif defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_NANO_RP2040_CONNECT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
198+
#elif defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_NANO_RP2040_CONNECT) || defined(HAS_ADAFRUIT_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
199199
// disable the NINA
200200
digitalWrite(NINA_RESETN, LOW);
201201
#elif defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION)

‎src/utility/HCI.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ void HCIClass::poll()
127127

128128
void HCIClass::poll(unsigned long timeout)
129129
{
130-
#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
130+
#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(HAS_ADAFRUIT_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
131131
digitalWrite(NINA_RTS, LOW);
132132
#endif
133133

@@ -152,15 +152,15 @@ void HCIClass::poll(unsigned long timeout)
152152
if (_debug) {
153153
dumpPkt("HCI ACLDATA RX <- ", _recvIndex, _recvBuffer);
154154
}
155-
#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
155+
#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(HAS_ADAFRUIT_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
156156
digitalWrite(NINA_RTS, HIGH);
157157
#endif
158158
int pktLen = _recvIndex - 1;
159159
_recvIndex = 0;
160160

161161
handleAclDataPkt(pktLen, &_recvBuffer[1]);
162162

163-
#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
163+
#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(HAS_ADAFRUIT_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
164164
digitalWrite(NINA_RTS, LOW);
165165
#endif
166166
}
@@ -169,7 +169,7 @@ void HCIClass::poll(unsigned long timeout)
169169
if (_debug) {
170170
dumpPkt("HCI EVENT RX <- ", _recvIndex, _recvBuffer);
171171
}
172-
#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
172+
#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(HAS_ADAFRUIT_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
173173
digitalWrite(NINA_RTS, HIGH);
174174
#endif
175175
// received full event
@@ -178,7 +178,7 @@ void HCIClass::poll(unsigned long timeout)
178178

179179
handleEventPkt(pktLen, &_recvBuffer[1]);
180180

181-
#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
181+
#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(HAS_ADAFRUIT_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
182182
digitalWrite(NINA_RTS, LOW);
183183
#endif
184184
}
@@ -191,7 +191,7 @@ void HCIClass::poll(unsigned long timeout)
191191
}
192192
}
193193

194-
#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
194+
#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(HAS_ADAFRUIT_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
195195
digitalWrite(NINA_RTS, HIGH);
196196
#endif
197197
}

‎src/utility/HCIUartTransport.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
// SerialHCI is already defined in the variant
3030
#elif defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION)
3131
#define SerialHCI Serial2
32-
#elif defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
32+
#elif defined(HAS_ADAFRUIT_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
3333
#define SerialHCI SerialESP32
3434
#else
3535
#define SerialHCI Serial1
@@ -84,7 +84,7 @@ int HCIUartTransportClass::read()
8484

8585
size_t HCIUartTransportClass::write(const uint8_t* data, size_t length)
8686
{
87-
#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
87+
#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(HAS_ADAFRUIT_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
8888
// wait while the CTS pin is low
8989
while (digitalRead(NINA_CTS) == HIGH);
9090
#endif
@@ -98,7 +98,7 @@ size_t HCIUartTransportClass::write(const uint8_t* data, size_t length)
9898

9999
#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(ARDUINO_NANO_RP2040_CONNECT)
100100
HCIUartTransportClass HCIUartTransport(SerialHCI, 119600);
101-
#elif defined(ADAFRUIT_ITSYBITSY_M4_EXPRESS) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
101+
#elif defined(ADAFRUIT_ITSYBITSY_M4_EXPRESS) || defined(HAS_ADAFRUIT_AIRLIFT) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)
102102
HCIUartTransportClass HCIUartTransport(SerialHCI, 115200);
103103
#else
104104
HCIUartTransportClass HCIUartTransport(SerialHCI, 912600);

0 commit comments

Comments
 (0)