Skip to content

Commit f82b6c5

Browse files
justcallmekokojustcallmekoko
committed
Update all standard ESP32 NimBLE
1 parent e689858 commit f82b6c5

File tree

3 files changed

+42
-27
lines changed

3 files changed

+42
-27
lines changed

‎esp32_marauder/WiFiScan.cpp‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ extern "C" {
7575
memcpy(&AdvData_Raw[i], Name, name_len);
7676
i += name_len;
7777

78-
#ifndef HAS_DUAL_BAND
78+
#ifndef HAS_NIMBLE_2
7979
AdvData.addData(std::string((char *)AdvData_Raw, 7 + name_len));
8080
#else
8181
AdvData.addData(AdvData_Raw, 7 + name_len);
@@ -106,7 +106,7 @@ extern "C" {
106106
//AdvData_Raw[i++] = 0x10; // Type ???
107107
//esp_fill_random(&AdvData_Raw[i], 3);
108108

109-
#ifndef HAS_DUAL_BAND
109+
#ifndef HAS_NIMBLE_2
110110
AdvData.addData(std::string((char *)AdvData_Raw, 11));
111111
#else
112112
AdvData.addData(AdvData_Raw, 11);
@@ -140,7 +140,7 @@ extern "C" {
140140
AdvData_Raw[i++] = (uint8_t)random(256);
141141
AdvData_Raw[i++] = 0x00;
142142

143-
#ifndef HAS_DUAL_BAND
143+
#ifndef HAS_NIMBLE_2
144144
AdvData.addData(std::string((char *)AdvData_Raw, 21));
145145
#else
146146
AdvData.addData(AdvData_Raw, 21);
@@ -170,7 +170,7 @@ extern "C" {
170170
AdvData_Raw[i++] = 0x43;
171171
AdvData_Raw[i++] = (model >> 0x00) & 0xFF; // Watch Model / Color (?)
172172

173-
#ifndef HAS_DUAL_BAND
173+
#ifndef HAS_NIMBLE_2
174174
AdvData.addData(std::string((char *)AdvData_Raw, 15));
175175
#else
176176
AdvData.addData(AdvData_Raw, 15);
@@ -197,7 +197,7 @@ extern "C" {
197197
AdvData_Raw[i++] = 0x0A;
198198
AdvData_Raw[i++] = (rand() % 120) - 100; // -100 to +20 dBm
199199

200-
#ifndef HAS_DUAL_BAND
200+
#ifndef HAS_NIMBLE_2
201201
AdvData.addData(std::string((char *)AdvData_Raw, 14));
202202
#else
203203
AdvData.addData(AdvData_Raw, 14);
@@ -249,7 +249,7 @@ extern "C" {
249249
AdvData_Raw[i++] = 0x80;
250250

251251
// Add the constructed Advertisement Data to the BLE advertisement
252-
#ifndef HAS_DUAL_BAND
252+
#ifndef HAS_NIMBLE_2
253253
AdvData.addData(std::string((char *)AdvData_Raw, i));
254254
#else
255255
AdvData.addData(AdvData_Raw, i);
@@ -261,7 +261,7 @@ extern "C" {
261261
case Airtag: {
262262
for (int i = 0; i < airtags->size(); i++) {
263263
if (airtags->get(i).selected) {
264-
#ifndef HAS_DUAL_BAND
264+
#ifndef HAS_NIMBLE_2
265265
AdvData.addData(std::string((char*)airtags->get(i).payload.data(), airtags->get(i).payloadSize));
266266
#else
267267
AdvData.addData(airtags->get(i).payload.data(), airtags->get(i).payloadSize);
@@ -286,7 +286,7 @@ extern "C" {
286286
//// https://github.com/Spooks4576
287287

288288

289-
#ifndef HAS_DUAL_BAND
289+
#ifndef HAS_NIMBLE_2
290290
class bluetoothScanAllCallback: public NimBLEAdvertisedDeviceCallbacks {
291291

292292
void onResult(NimBLEAdvertisedDevice *advertisedDevice) {
@@ -306,7 +306,7 @@ extern "C" {
306306
(wifi_scan_obj.currentScanMode == BT_SCAN_AIRTAG_MON)) {
307307
//Serial.println("Getting payload length...");
308308
//Serial.flush();
309-
#ifndef HAS_DUAL_BAND
309+
#ifndef HAS_NIMBLE_2
310310
uint8_t* payLoad = advertisedDevice->getPayload();
311311
size_t len = advertisedDevice->getPayloadLength();
312312
if (!payLoad) {
@@ -401,7 +401,7 @@ extern "C" {
401401
}
402402
}
403403
else if (wifi_scan_obj.currentScanMode == BT_SCAN_FLIPPER) {
404-
#ifndef HAS_DUAL_BAND
404+
#ifndef HAS_NIMBLE_2
405405
uint8_t* payLoad = advertisedDevice->getPayload();
406406
size_t len = advertisedDevice->getPayloadLength();
407407
#else
@@ -595,7 +595,7 @@ extern "C" {
595595
}
596596
}
597597
else if (wifi_scan_obj.currentScanMode == BT_SCAN_FLOCK) {
598-
#ifndef HAS_DUAL_BAND
598+
#ifndef HAS_NIMBLE_2
599599
uint8_t* payLoad = advertisedDevice->getPayload();
600600
size_t len = advertisedDevice->getPayloadLength();
601601
#else
@@ -770,7 +770,7 @@ extern "C" {
770770
return;
771771
}
772772

773-
#ifndef HAS_DUAL_BAND
773+
#ifndef HAS_NIMBLE_2
774774
uint8_t* payLoad = advertisedDevice->getPayload();
775775
size_t len = advertisedDevice->getPayloadLength();
776776
#else
@@ -1018,7 +1018,7 @@ extern "C" {
10181018

10191019
if ((wifi_scan_obj.currentScanMode == BT_SCAN_AIRTAG) ||
10201020
(wifi_scan_obj.currentScanMode == BT_SCAN_AIRTAG_MON)) {
1021-
#ifndef HAS_DUAL_BAND
1021+
#ifndef HAS_NIMBLE_2
10221022
uint8_t* payLoad = advertisedDevice->getPayload();
10231023
size_t len = advertisedDevice->getPayloadLength();
10241024
if (!payLoad) {
@@ -1074,7 +1074,7 @@ extern "C" {
10741074

10751075
AirTag airtag;
10761076
airtag.mac = mac;
1077-
#ifndef HAS_DUAL_BAND
1077+
#ifndef HAS_NIMBLE_2
10781078
airtag.payload.assign(payLoad, payLoad + len);
10791079
airtag.payloadSize = len;
10801080
#else
@@ -1103,7 +1103,7 @@ extern "C" {
11031103
}
11041104
}
11051105
else if (wifi_scan_obj.currentScanMode == BT_SCAN_FLIPPER) {
1106-
#ifndef HAS_DUAL_BAND
1106+
#ifndef HAS_NIMBLE_2
11071107
uint8_t* payLoad = advertisedDevice->getPayload();
11081108
size_t len = advertisedDevice->getPayloadLength();
11091109
#else
@@ -1279,7 +1279,7 @@ extern "C" {
12791279
}
12801280
}
12811281
else if (wifi_scan_obj.currentScanMode == BT_SCAN_FLOCK) {
1282-
#ifndef HAS_DUAL_BAND
1282+
#ifndef HAS_NIMBLE_2
12831283
uint8_t* payLoad = advertisedDevice->getPayload();
12841284
size_t len = advertisedDevice->getPayloadLength();
12851285
#else
@@ -1454,7 +1454,7 @@ extern "C" {
14541454
return;
14551455
}
14561456

1457-
#ifndef HAS_DUAL_BAND
1457+
#ifndef HAS_NIMBLE_2
14581458
uint8_t* payLoad = advertisedDevice->getPayload();
14591459
size_t len = advertisedDevice->getPayloadLength();
14601460
#else
@@ -2594,7 +2594,7 @@ bool WiFiScan::mac_cmp(uint8_t addr1[6], uint8_t addr2[6]) {
25942594

25952595
#ifdef HAS_BT
25962596
void WiFiScan::copyNimbleMac(const BLEAddress &addr, unsigned char out[6]) {
2597-
#ifndef HAS_DUAL_BAND
2597+
#ifndef HAS_NIMBLE_2
25982598
const uint8_t* bytes = addr.getNative(); // NimBLE gives MAC as uint8_t[6]
25992599
#else
26002600
const ble_addr_t* base_addr = addr.getBase();
@@ -4868,7 +4868,7 @@ void WiFiScan::executeWarDrive() {
48684868
// Start a BLE scan
48694869
if (currentScanMode == WIFI_SCAN_WAR_DRIVE) {
48704870
#ifdef HAS_BT
4871-
#ifdef HAS_DUAL_BAND
4871+
#ifdef HAS_NIMBLE_2
48724872
pBLEScan->start(500, false, false); // Scan is in MS
48734873
#else
48744874
pBLEScan->start(1, scanCompleteCB, false); // Scan is in Seconds
@@ -5522,7 +5522,7 @@ void WiFiScan::RunBluetoothScan(uint8_t scan_mode, uint16_t color)
55225522
display_obj.setupScrollArea(display_obj.TOP_FIXED_AREA_2, BOT_FIXED_AREA);
55235523
#endif
55245524
if (scan_mode == BT_SCAN_ALL)
5525-
#ifndef HAS_DUAL_BAND
5525+
#ifndef HAS_NIMBLE_2
55265526
pBLEScan->setAdvertisedDeviceCallbacks(new bluetoothScanAllCallback(), false);
55275527
#else
55285528
pBLEScan->setScanCallbacks(new bluetoothScanAllCallback(), false);
@@ -5541,7 +5541,7 @@ void WiFiScan::RunBluetoothScan(uint8_t scan_mode, uint16_t color)
55415541
if ((scan_mode == BT_SCAN_AIRTAG) || (scan_mode == BT_SCAN_AIRTAG_MON))
55425542
this->clearAirtags();
55435543

5544-
#ifndef HAS_DUAL_BAND
5544+
#ifndef HAS_NIMBLE_2
55455545
pBLEScan->setAdvertisedDeviceCallbacks(new bluetoothScanAllCallback(), true);
55465546
#else
55475547
pBLEScan->setScanCallbacks(new bluetoothScanAllCallback(), true);
@@ -5590,13 +5590,13 @@ void WiFiScan::RunBluetoothScan(uint8_t scan_mode, uint16_t color)
55905590
display_obj.setupScrollArea(display_obj.TOP_FIXED_AREA_2, BOT_FIXED_AREA);
55915591
#endif
55925592
if (scan_mode != BT_SCAN_WAR_DRIVE_CONT)
5593-
#ifndef HAS_DUAL_BAND
5593+
#ifndef HAS_NIMBLE_2
55945594
pBLEScan->setAdvertisedDeviceCallbacks(new bluetoothScanAllCallback(), false);
55955595
#else
55965596
pBLEScan->setScanCallbacks(new bluetoothScanAllCallback(), false);
55975597
#endif
55985598
else
5599-
#ifndef HAS_DUAL_BAND
5599+
#ifndef HAS_NIMBLE_2
56005600
pBLEScan->setAdvertisedDeviceCallbacks(new bluetoothScanAllCallback(), true);
56015601
#else
56025602
pBLEScan->setScanCallbacks(new bluetoothScanAllCallback(), true);
@@ -5617,7 +5617,7 @@ void WiFiScan::RunBluetoothScan(uint8_t scan_mode, uint16_t color)
56175617
display_obj.tft.setTextColor(TFT_BLACK, TFT_DARKGREY);
56185618
display_obj.setupScrollArea(display_obj.TOP_FIXED_AREA_2, BOT_FIXED_AREA);
56195619
#endif
5620-
#ifndef HAS_DUAL_BAND
5620+
#ifndef HAS_NIMBLE_2
56215621
pBLEScan->setAdvertisedDeviceCallbacks(new bluetoothScanAllCallback(), false);
56225622
#else
56235623
pBLEScan->setScanCallbacks(new bluetoothScanAllCallback(), false);
@@ -5640,7 +5640,7 @@ void WiFiScan::RunBluetoothScan(uint8_t scan_mode, uint16_t color)
56405640
display_obj.tft.setTextColor(TFT_CYAN, TFT_BLACK);
56415641
display_obj.setupScrollArea(display_obj.TOP_FIXED_AREA_2, BOT_FIXED_AREA);
56425642
#endif
5643-
#ifndef HAS_DUAL_BAND
5643+
#ifndef HAS_NIMBLE_2
56445644
pBLEScan->setAdvertisedDeviceCallbacks(new bluetoothScanAllCallback(), false);
56455645
#else
56465646
pBLEScan->setScanCallbacks(new bluetoothScanAllCallback(), false);
@@ -5649,7 +5649,7 @@ void WiFiScan::RunBluetoothScan(uint8_t scan_mode, uint16_t color)
56495649
}
56505650
else if ((scan_mode == WIFI_SCAN_WAR_DRIVE) ||
56515651
(scan_mode == WIFI_SCAN_DETECT_FOLLOW)) {
5652-
#ifndef HAS_DUAL_BAND
5652+
#ifndef HAS_NIMBLE_2
56535653
pBLEScan->setAdvertisedDeviceCallbacks(new bluetoothScanAllCallback(), true);
56545654
#else
56555655
pBLEScan->setScanCallbacks(new bluetoothScanAllCallback(), true);

‎esp32_marauder/WiFiScan.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#include "esp_system.h"
4141
#include "esp_mac.h"
4242
#endif
43-
#if defined(HAS_BT) && !defined(HAS_DUAL_BAND)
43+
#if defined(HAS_BT) && !defined(HAS_NIMBLE_2)
4444
#include "esp_bt.h"
4545
#endif
4646
#ifdef HAS_SCREEN

‎esp32_marauder/configs.h‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
#define USE_SD
141141
#define HAS_TEMP_SENSOR
142142
#define HAS_GPS
143+
#define HAS_NIMBLE_2
143144
#endif
144145

145146
#ifdef MARAUDER_V7
@@ -157,6 +158,7 @@
157158
#define USE_SD
158159
#define HAS_TEMP_SENSOR
159160
#define HAS_GPS
161+
#define HAS_NIMBLE_2
160162
#endif
161163

162164
#ifdef MARAUDER_V7_1
@@ -175,6 +177,7 @@
175177
#define HAS_TEMP_SENSOR
176178
#define HAS_GPS
177179
#define HAS_PSRAM
180+
#define HAS_NIMBLE_2
178181
#endif
179182

180183
#ifdef MARAUDER_REV_FEATHER
@@ -207,6 +210,7 @@
207210
#define USE_SD
208211
#define HAS_TEMP_SENSOR
209212
#define HAS_GPS
213+
#define HAS_NIMBLE_2
210214
#endif
211215

212216
#if defined(MARAUDER_V6) || defined(MARAUDER_V6_1)
@@ -224,6 +228,7 @@
224228
#define USE_SD
225229
#define HAS_TEMP_SENSOR
226230
#define HAS_GPS
231+
#define HAS_NIMBLE_2
227232
#endif
228233

229234
#ifdef MARAUDER_CYD_MICRO
@@ -243,6 +248,7 @@
243248
#define HAS_TEMP_SENSOR
244249
#define HAS_GPS
245250
#define HAS_CYD_TOUCH
251+
#define HAS_NIMBLE_2
246252
#endif
247253

248254
#ifdef MARAUDER_CYD_2USB
@@ -263,6 +269,7 @@
263269
#define HAS_GPS
264270
#define HAS_CYD_TOUCH
265271
#define HAS_CYD_PORTRAIT
272+
#define HAS_NIMBLE_2
266273
#endif
267274

268275
#ifdef MARAUDER_CYD_3_5_INCH
@@ -284,6 +291,7 @@
284291
//#define HAS_CYD_TOUCH
285292
#define HAS_SEPARATE_SD
286293
#define HAS_CYD_PORTRAIT
294+
#define HAS_NIMBLE_2
287295
#endif
288296

289297
#ifdef MARAUDER_CYD_GUITION
@@ -303,6 +311,7 @@
303311
#define HAS_TEMP_SENSOR
304312
#define HAS_GPS
305313
//#define HAS_CYD_TOUCH
314+
#define HAS_NIMBLE_2
306315
#endif
307316

308317
#ifdef MARAUDER_KIT
@@ -319,6 +328,7 @@
319328
#define USE_SD
320329
#define HAS_TEMP_SENSOR
321330
#define HAS_GPS
331+
#define HAS_NIMBLE_2
322332
#endif
323333

324334
#ifdef GENERIC_ESP32
@@ -332,6 +342,7 @@
332342
//#define HAS_SD
333343
//#define HAS_TEMP_SENSOR
334344
//#define HAS_GPS
345+
#define HAS_NIMBLE_2
335346
#endif
336347

337348
#ifdef MARAUDER_FLIPPER
@@ -378,6 +389,7 @@
378389
#define USE_SD
379390
//#define HAS_TEMP_SENSOR
380391
//#define HAS_GPS
392+
#define HAS_NIMBLE_2
381393
#endif
382394

383395
#ifdef MARAUDER_DEV_BOARD_PRO
@@ -392,6 +404,7 @@
392404
#define USE_SD
393405
//#define HAS_TEMP_SENSOR
394406
#define HAS_GPS
407+
#define HAS_NIMBLE_2
395408
#endif
396409

397410
#ifdef XIAO_ESP32_S3
@@ -423,6 +436,7 @@
423436
#define HAS_DUAL_BAND
424437
//#define HAS_PSRAM
425438
//#define HAS_TEMP_SENSOR
439+
#define HAS_NIMBLE_2
426440
#endif
427441

428442
#ifdef MARAUDER_V8
@@ -443,6 +457,7 @@
443457
#define HAS_DUAL_BAND
444458
#define HAS_PSRAM
445459
//#define HAS_TEMP_SENSOR
460+
#define HAS_NIMBLE_2
446461
#endif
447462
//// END BOARD FEATURES
448463

0 commit comments

Comments
 (0)