Tweak behavior

This commit is contained in:
Nick Mowen 2022-04-18 10:24:47 -06:00
parent e8a420bfaf
commit 5c0207d3b9
2 changed files with 5 additions and 5 deletions

View File

@ -99,14 +99,14 @@ def create_mqtt_client(config: FrigateConfig, camera_metrics):
payload = message.payload.decode() payload = message.payload.decode()
logger.debug(f"on_motion_toggle: {message.topic} {payload}") logger.debug(f"on_motion_toggle: {message.topic} {payload}")
camera_name = message.topic.split("/")[3] camera_name = message.topic.split("/")[-3]
if payload == "ON": if payload == "ON":
if not camera_metrics[camera_name]["motion_enabled"].value: if not camera_metrics[camera_name]["motion_enabled"].value:
logger.info(f"Turning on motion for {camera_name} via mqtt") logger.info(f"Turning on motion for {camera_name} via mqtt")
camera_metrics[camera_name]["motion_enabled"].value = True camera_metrics[camera_name]["motion_enabled"].value = True
elif payload == "OFF": elif payload == "OFF":
if not camera_metrics[camera_name]["detection_enabled"].value: if camera_metrics[camera_name]["detection_enabled"].value:
logger.error( logger.error(
f"Turning off motion is not allowed when detection is enabled." f"Turning off motion is not allowed when detection is enabled."
) )

View File

@ -511,11 +511,11 @@ def process_frames(
f"{camera_name}{frame_time}", (frame_shape[0] * 3 // 2, frame_shape[1]) f"{camera_name}{frame_time}", (frame_shape[0] * 3 // 2, frame_shape[1])
) )
if frame is None: if not motion_enabled.value:
logger.info(f"{camera_name}: frame {frame_time} is not in memory store.")
continue continue
if not motion_enabled: if frame is None:
logger.info(f"{camera_name}: frame {frame_time} is not in memory store.")
continue continue
# look for motion # look for motion