gitea-mirror/ESP32Marauder
1
0
Fork 0
mirror of https://github.com/justcallmekoko/ESP32Marauder.git synced 2025-12-05 20:40:25 -08:00
Code Issues Packages Projects Releases Wiki Activity

Use NimBLE

Browse Source
This commit is contained in:
Just Call Me Koko
2020-08-05 20:03:23 -04:00
parent ba05c388b1
commit c5136b5d2e
3 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
esp32_marauder/Display.h
View File

@@ -16,8 +16,8 @@
#include <TFT_eSPI.h>
#define TFT_SHIELD
//#define TFT_DIY
//#define TFT_SHIELD
#define TFT_DIY
#define SCREEN_WIDTH 240
#define SCREEN_HEIGHT 320

40
esp32_marauder/WiFiScan.cpp
View File

@@ -9,8 +9,12 @@ int num_probe = 0;
int num_eapol = 0;
class bluetoothScanAllCallback: public BLEAdvertisedDeviceCallbacks {
void onResult(BLEAdvertisedDevice advertisedDevice) {
/* Original BLE */
//void onResult(BLEAdvertisedDevice advertisedDevice) {
/* NimBLE */
void onResult(BLEAdvertisedDevice *advertisedDevice) {
//advertisedDevice.getScan()->stop();
@@ -18,24 +22,24 @@ class bluetoothScanAllCallback: public BLEAdvertisedDeviceCallbacks {
if (display_obj.display_buffer->size() >= 0)
{
display_string.concat(" RSSI: ");
display_string.concat(advertisedDevice.getRSSI());
display_string.concat(advertisedDevice->getRSSI());
Serial.print(" RSSI: ");
Serial.print(advertisedDevice.getRSSI());
Serial.print(advertisedDevice->getRSSI());
display_string.concat(" ");
Serial.print(" ");
Serial.print("Device: ");
if(advertisedDevice.getName().length() != 0)
if(advertisedDevice->getName().length() != 0)
{
display_string.concat(advertisedDevice.getName().c_str());
Serial.print(advertisedDevice.getName().c_str());
display_string.concat(advertisedDevice->getName().c_str());
Serial.print(advertisedDevice->getName().c_str());
}
else
{
display_string.concat(advertisedDevice.getAddress().toString().c_str());
Serial.print(advertisedDevice.getAddress().toString().c_str());
display_string.concat(advertisedDevice->getAddress().toString().c_str());
Serial.print(advertisedDevice->getAddress().toString().c_str());
}
int temp_len = display_string.length();
@@ -56,7 +60,11 @@ class bluetoothScanAllCallback: public BLEAdvertisedDeviceCallbacks {
};
class bluetoothScanSkimmersCallback: public BLEAdvertisedDeviceCallbacks {
void onResult(BLEAdvertisedDevice advertisedDevice) {
/* Original BLE */
//void onResult(BLEAdvertisedDevice advertisedDevice) {
/* NimBLE */
void onResult(BLEAdvertisedDevice *advertisedDevice) {
String bad_list[bad_list_length] = {"HC-03", "HC-05", "HC-06"};
if (display_obj.display_buffer->size() >= 0)
{
@@ -65,17 +73,17 @@ class bluetoothScanSkimmersCallback: public BLEAdvertisedDeviceCallbacks {
//display_string.concat(" RSSI: ");
//display_string.concat(advertisedDevice.getRSSI());
//display_string.concat(" ");
if(advertisedDevice.getName().length() != 0)
if(advertisedDevice->getName().length() != 0)
{
//display_string.concat(advertisedDevice.getName().c_str());
Serial.print(advertisedDevice.getName().c_str());
Serial.print(advertisedDevice->getName().c_str());
for(int i = 0; i < bad_list_length; i++)
{
if(strcmp(advertisedDevice.getName().c_str(), bad_list[i].c_str()) == 0)
if(strcmp(advertisedDevice->getName().c_str(), bad_list[i].c_str()) == 0)
{
display_string.concat("Potential Skimmer: ");
display_string.concat(" ");
display_string.concat(advertisedDevice.getName().c_str());
display_string.concat(advertisedDevice->getName().c_str());
int temp_len = display_string.length();
for (int i = 0; i < 40 - temp_len; i++)
{
@@ -91,7 +99,7 @@ class bluetoothScanSkimmersCallback: public BLEAdvertisedDeviceCallbacks {
}
else
{
Serial.print(advertisedDevice.getAddress().toString().c_str());
Serial.print(advertisedDevice->getAddress().toString().c_str());
//display_string.concat(advertisedDevice.getAddress().toString().c_str());
}
/*
@@ -102,7 +110,7 @@ class bluetoothScanSkimmersCallback: public BLEAdvertisedDeviceCallbacks {
}
*/
Serial.print(" RSSI: ");
Serial.println(advertisedDevice.getRSSI());
Serial.println(advertisedDevice->getRSSI());
/*
while (display_obj.printing)

12
esp32_marauder/WiFiScan.h
View File

@@ -1,12 +1,16 @@
#ifndef WiFiScan_h
#define WiFiScan_h
#include <BLEDevice.h>
#include <BLEUtils.h>
#include <BLEScan.h>
#include <BLEAdvertisedDevice.h>
//#include <BLEDevice.h>
//#include <BLEUtils.h>
//#include <BLEScan.h>
//#include <BLEAdvertisedDevice.h>
#include <ArduinoJson.h>
// Testing NimBLE
#include <NimBLEDevice.h>
#include <NimBLEAdvertisedDevice.h>
#include <WiFi.h>
#include <math.h>
#include "esp_wifi.h"