From 41129ca8eca69636a912baa9da032ab012aa3d00 Mon Sep 17 00:00:00 2001
From: jptrsn <ptrsnja@gmail.com>
Date: Sat, 7 Mar 2020 14:41:25 -0500
Subject: [PATCH 1/5] Fixed incorrect Settings inclusion.

---
 src/ESP32-mqtt-room.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ESP32-mqtt-room.ino b/src/ESP32-mqtt-room.ino
index f56d8ce..93506ea 100644
--- a/src/ESP32-mqtt-room.ino
+++ b/src/ESP32-mqtt-room.ino
@@ -33,7 +33,7 @@ extern "C" {
 #include "BLEBeacon.h"
 #include "BLEEddystoneTLM.h"
 #include "BLEEddystoneURL.h"
-#include "Settings_f.h"
+#include "Settings.h"
 
 #ifdef htuSensorTopic
 	#define tempTopic htuSensorTopic "/temperature"

From 38f5dd580a2a830bc6f731ac1c212b2b7db57576 Mon Sep 17 00:00:00 2001
From: Patatman <git@jeursen.nl>
Date: Thu, 1 Oct 2020 09:38:46 +0200
Subject: [PATCH 2/5] Add clarification to home-assistant integration

---
 docs/home_assistant.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/home_assistant.md b/docs/home_assistant.md
index 133ab1f..80e74e6 100644
--- a/docs/home_assistant.md
+++ b/docs/home_assistant.md
@@ -1,6 +1,11 @@
 # Home Assistant Configuration
 Once the ESP32 is running, it is important to configure Home Assistant to use the information from the MQTT topic to determine what devices to track. You can read the full documentation [on the Home Assistant website](https://www.home-assistant.io/components/sensor.mqtt_room/). It is critical that you configure your device IDs to include the Major and Minor versions, in the format `{{beacon uuid}}-{{major}}-{{minor}}`
 
+To obtain a `{{beacon uuid}}-{{major}}-{{minor}}`, you need to setup a beacon following one of the guides:
+- [Android](./android.md)
+- [Beacons](./beacons.md)
+- [generic_ble](./generic_ble.md)
+
 ### configuration.yaml
 Here is an example of how an entry into your `configuration.yaml` file should look:
 ```yaml

From af19cc927677b421773ffc425d85674be163bbfa Mon Sep 17 00:00:00 2001
From: Stephen Littman <Stephen.littman7912@gmail.com>
Date: Thu, 14 Jan 2021 15:16:12 -0500
Subject: [PATCH 3/5] move pull from development to master april 8th

Stumbled across this and realize that it was never moved to master
---
 src/ESP32-mqtt-room.ino | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/ESP32-mqtt-room.ino b/src/ESP32-mqtt-room.ino
index 93506ea..2b2e13e 100644
--- a/src/ESP32-mqtt-room.ino
+++ b/src/ESP32-mqtt-room.ino
@@ -346,6 +346,12 @@ bool reportDevice(BLEAdvertisedDevice advertisedDevice) {
 
 	 if (advertisedDevice.getServiceDataUUID().equals(BLEUUID(beaconUUID))==true) {  // found Eddystone UUID
 		// Serial.printf("is Eddystone: %d %s length %d\n", advertisedDevice.getServiceDataUUID().bitSize(), advertisedDevice.getServiceDataUUID().toString().c_str(),strServiceData.length());
+	       // Update distance variable for Eddystone BLE devices
+	    BLEBeacon oBeacon = BLEBeacon();
+	    distance = calculateDistance(rssi, oBeacon.getSignalPower());
+	    doc["distance"] = distance;
+
+
 		if (cServiceData[0]==0x10) {
 			 BLEEddystoneURL oBeacon = BLEEddystoneURL();
 			 oBeacon.setData(strServiceData);

From 360b8c1b85585dcea2743705fecb3d290eaf8a98 Mon Sep 17 00:00:00 2001
From: PatBoud <patboud@MacBook-Pro-de-PatBoud.local>
Date: Sat, 23 Jan 2021 17:29:13 -0500
Subject: [PATCH 4/5] New feature: List of allowed MAC Addresses

---
 .DS_Store               | Bin 0 -> 6148 bytes
 src/ESP32-mqtt-room.ino |  19 +++++++++++++++++++
 src/Settings.h          |   7 +++++++
 3 files changed, 26 insertions(+)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..44e504fab9ff76b401c41ebd4ec400ff2552c376
GIT binary patch
literal 6148
zcmeHK%}T>S5Z<*_6GZGmu*bc4>!DTKo`g{A!J81#gG!s&Vgof>n$(~%lGo5T@(Fw$
zXLdJYu?J5gb_RC8nVp&4%m>*Y#u)F+1`Wn4j4=xuB1dI`;P67%iU~&KI7c+`$I=Ju
z&7T<GUkCj55{uZB-T2AZ?;i(IT(7_Ll~Q?iZQZhM%igrF-H}Y(*o$XT$D3ZFb?U_<
z-{@yjjz4wJKM#gUud;n4!`KVL;Z!9DgCT@mT?FAkCLK8o2a%e`)ef~#uTo9Zy;id(
z8qIcA6KT6$uZe^GR+ib;&TixIq<{DDm_B9CFPdKt^efpiSimbNro4N18jfXn3nN8z
z5k*K05Cg;jF|bq&m}9`&SgNY2SYm(}_z45JKL}`uj=@}`+B%@a>ofYxh$x`rTLMuS
zbPVPi!2`l|Dxgl~=83^|I*bbw=NQa2>U74{$}o>vxp=&AwK|Lo70$S$k$Pf)7?@|E
zq|FMR|HtslEPUk8r;tSq5Ci{=0bcI9-3}CG&em_`;aMx7^`W6)T#gC|=yR6<FmNBK
fDyQ}f)FI9>m}|sYa9pJW(nUZKLLD*i3k-Y!6v<EA

literal 0
HcmV?d00001

diff --git a/src/ESP32-mqtt-room.ino b/src/ESP32-mqtt-room.ino
index 93506ea..3d25cf7 100644
--- a/src/ESP32-mqtt-room.ino
+++ b/src/ESP32-mqtt-room.ino
@@ -318,6 +318,25 @@ bool reportDevice(BLEAdvertisedDevice advertisedDevice) {
 	String mac_address = advertisedDevice.getAddress().toString().c_str();
 	mac_address.replace(":","");
 	mac_address.toLowerCase();
+
+
+	//Check scanned MAC Address against a list of allowed MAC Addresses
+
+	if (allowedListCheck) {
+		bool allowedListFound = false;
+		for (uint32_t x = 0; x < allowedListNumberOfItems; x++) {
+			if (mac_address == allowedList[x]) {
+				allowedListFound = true;
+			}
+		}
+
+		if (allowedListFound == false) {
+			return false;
+		}
+	}
+	// --------------
+
+
 	// Serial.print("mac:\t");
 	// Serial.println(mac_address);
 	int rssi = advertisedDevice.getRSSI();
diff --git a/src/Settings.h b/src/Settings.h
index 0d28014..5cbc637 100644
--- a/src/Settings.h
+++ b/src/Settings.h
@@ -49,3 +49,10 @@
 
 // MQTT topic for sensor values from HTU21D temperature and humidity sensor
 //#define htuSensorTopic "presence_nodes/" hostname "/sensor"
+
+
+//List of allowed MAC Addresses for MQTT Publish. All others will be ignored.
+//Feature is disabled by default.
+#define allowedListCheck false
+String allowedList[] = {"11223344aabb", "11223344aabb"};
+uint32_t allowedListNumberOfItems = 2;

From 6148131c2dcfbb9c9da0e29e4df3f343337c7065 Mon Sep 17 00:00:00 2001
From: jptrsn <ptrsnja@gmail.com>
Date: Sat, 26 Jun 2021 11:00:17 -0400
Subject: [PATCH 5/5] Fix for device count callback causing zero devices
 discovered.

---
 platformio.ini          | 1 +
 src/ESP32-mqtt-room.ino | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 29c2fb6..52b48f0 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -18,3 +18,4 @@ board = esp32dev
 lib_deps = ArduinoJson@^6, ESP32 BLE Arduino@^1.0.1, AsyncMqttClient@^0.8.2, AsyncTCP
 lib_ignore = ESPAsyncTCP
 board_build.partitions = partitions_singleapp.csv
+monitor_speed = 115200
diff --git a/src/ESP32-mqtt-room.ino b/src/ESP32-mqtt-room.ino
index fe14028..27ca85c 100644
--- a/src/ESP32-mqtt-room.ino
+++ b/src/ESP32-mqtt-room.ino
@@ -600,7 +600,6 @@ void setup() {
 
   BLEDevice::init("");
   pBLEScan = BLEDevice::getScan(); //create new scan
-  pBLEScan->setAdvertisedDeviceCallbacks(new MyAdvertisedDeviceCallbacks());
   pBLEScan->setActiveScan(activeScan);
 	pBLEScan->setInterval(bleScanInterval);
 	pBLEScan->setWindow(bleScanWindow);