Merge branch 'master' into beta

Author: andrewjfreyer

monitor.sh

@@ -158,7 +158,7 @@ done
 # ----------------------------------------------------------------------------------------
 
 #LIST CONNECTED DEVICES
-previously_connected_devices=$(echo "quit" | bluetoothctl | grep -Eio "Device ([0-9A-F]{2}:){5}[0-9A-F]{2}" | sed 's/Device //gi')
+previously_connected_devices=$(echo "paired-devices" | bluetoothctl | grep -Eio "Device ([0-9A-F]{2}:){5}[0-9A-F]{2}" | sed 's/Device //gi')
 
 #POPULATE KNOWN DEVICE ADDRESS
 for addr in "${known_static_addresses[@]^^}"; do 

support/README.md

@@ -33,13 +33,13 @@ For an automation or script (or other service trigger), use:
 ```yaml
   service: 'mqtt.publish'
   data: 
-    topic: location/scan/arrive
+    topic: monitor/scan/arrive
 ```
 
 ```yaml
   service: 'mqtt.publish'
   data: 
-    topic: location/scan/depart
+    topic: monitor/scan/depart
 ```
 </details>
 
@@ -139,7 +139,7 @@ journalctl -u monitor -r
 
 <details><summary><b> My Android phone doesn't seem to send any anonymous advertisements, no matter what I do. Is there any solution?</b></summary><p><p>  
 
-Some phones, like the LG ThinQ G7 include an option in settings to enable file sharing via bluetooth. As resported by Home Assistant forum user @jusdwy, access this option via Settings >Connected Devices > File Sharing > File Sharing ON. For other android phones, an app like [Beacon Simulator](https://play.google.com/store/apps/details?</b></summary><p><p>id=net.alea.beaconsimulator&hl=en_US) may be a good option. You may also be able to see more information about Bluetooth on your phone using [nRF Connect](https://play.google.com/store/apps/details?</b></summary><p><p>id=no.nordicsemi.android.mcp&hl=en_US). 
+Some phones, like the LG ThinQ G7 include an option in settings to enable file sharing via bluetooth. As resported by Home Assistant forum user @jusdwy, access this option via Settings >Connected Devices > File Sharing > File Sharing ON. For other android phones, an app like [Beacon Simulator](https://play.google.com/store/apps/details?id=net.alea.beaconsimulator&hl=en_US) may be a good option. You may also be able to see more information about Bluetooth on your phone using [nRF Connect](https://play.google.com/store/apps/details?id=no.nordicsemi.android.mcp&hl=en_US). 
 
 Unfortunately, until Android OS includes at least one service that requires bluetooth peripheral mode to be enabled, Android devices will probably not advertise without an application running in the background. In short, as I understand it, Android/Google has been  slow to adopt BTLE peripheral mode as an option in addition to the default central mode. [Here is a decently comprehensive list of phones that support peripheral mode](https://altbeacon.github.io/android-beacon-library/beacon-transmitter-devices.html), should an application choose to leverage the appropriate API. It does not appear as though the native OS has an option (outside of the file sharing option mentioned above on LG phones) to enable this mode. 
 

support/mqtt

@@ -168,6 +168,7 @@ mqtt_error_handler () {
 		[[ ${received^^} =~ .*NETWORK.* ]] && [[ ${received^^} =~ .*UNREACHABLE.* ]] && return_value=0 && print_message="network is down. enqueuing command to try again after a delay"
 		[[ ${received^^} =~ .*LOOKUP ERROR.* ]] && return_value=0 && print_message="issue connecting to mqtt server (lookup error). enqueuing command to try again after a delay"
 
+
 		if [ -n "$last_error_message" ] && [ "$last_error_message" == "$print_message" ]; then 
 			#HERE, WE HAVE A REPEATED ERROR
 			duplicate_error_count=$((duplicate_error_count + 1 ))