Remove TYPE

Author: baylanger

subroutines.sh

@@ -34,9 +34,8 @@ replace_value_at_position() {
 
 # Function
 check_presence() {
-  TYPE="$1" # BLE MAC, LN
-  BLE_LN="$2"
-  BLE_MAC="$3"
+  BLE_LN="$1"
+  BLE_MAC="$1"
 
   CURRENT_TIME_EPOCH=$(date +%s)
   MATCH="($BLE_LN|$BLE_MAC)"
@@ -54,10 +53,10 @@ check_presence() {
   echo $BLE_MAC
 
   if echo "${BLTCTL_OUT}" | grep -Eq "$MATCH"; then
-    log_info "VIN $VIN $TYPE $MATCH presence detected"
+    log_info "vin:$VIN ble_ln:$BLE_LN match:$MATCH presence detected"
 
     if [ $CURRENT_TIME_EPOCH -ge $PRESENCE_EXPIRE_TIME ]; then
-      log_info "VIN $VIN $MATCH TTL expired, set presence ON"
+      log_info "vin:$VIN ble_ln:$BLE_LN TTL expired, set presence ON"
       set +e
       # We need a function for mosquitto_pub w/ retry
       MQTT_OUT=$(eval $MOSQUITTO_PUB_BASE --nodelay -t "$MQTT_TOPIC" -m ON 2>&1)
@@ -71,14 +70,14 @@ check_presence() {
 
     # Update presence expire time
     EPOCH_EXPIRE_TIME=$((CURRENT_TIME_EPOCH + PRESENCE_DETECTION_TTL))
-    log_debug "VIN $VIN $MATCH update presence expire time to $EPOCH_EXPIRE_TIME"
+    log_debug "vin:$VIN ble_ln:$BLE_LN update presence expire time to $EPOCH_EXPIRE_TIME"
     PRESENCE_EXPIRE_TIME_LIST=$(replace_value_at_position "$PRESENCE_EXPIRE_TIME_LIST" \
       $position $EPOCH_EXPIRE_TIME)
     # END if MATCH
   else
-    log_debug "VIN $VIN $TYPE $MATCH presence not detected"
+    log_debug "vin:$VIN ble_ln:$BLE_LN match:$MATCH presence not detected"
     if [ $CURRENT_TIME_EPOCH -ge $PRESENCE_EXPIRE_TIME ]; then
-      log_info "VIN $VIN $TYPE $MATCH presence has expired, setting presence OFF"
+      log_info "vin:$VIN ble_ln:$BLE_LN presence has expired, setting presence OFF"
       set +e
       MQTT_OUT=$(eval $MOSQUITTO_PUB_BASE --nodelay -t "$MQTT_TOPIC" -m OFF 2>&1)
       EXIT_STATUS=$?
@@ -88,7 +87,7 @@ check_presence() {
         return
       log_debug "mqtt topic $MQTT_TOPIC succesfully updated to OFF"
     else
-      log_info "VIN $VIN $TYPE $MATCH presence not expired"
+      log_info "vin:$VIN ble_ln:$BLE_LN presence not expired"
     fi # END if expired time
   fi   # END if ! MATCH
 }
@@ -165,7 +164,7 @@ listen_to_ble() {
 
       # Check the presence using both MAC Addr and BLE Local Name
       log_debug "BLTCTL_OUT:$(echo "$BLTCTL_OUT" | grep -E "($BLE_MAC|$BLE_LN)")"
-      macAddr=$(check_presence "BLE LN & MAC" $BLE_LN $BLE_MAC)
+      macAddr=$(check_presence $BLE_LN $BLE_MAC)
 
       # Add the MAC address to BLE_MAC_LIST if it's not already present at the position
       if [ "$macAddr" != "$BLE_MAC" ]; then