|
@@ -216,7 +216,9 @@ CAMERAS_SCHEMA = vol.Schema(vol.All(
|
|
},
|
|
},
|
|
'objects': OBJECTS_SCHEMA,
|
|
'objects': OBJECTS_SCHEMA,
|
|
vol.Optional('motion', default={}): MOTION_SCHEMA,
|
|
vol.Optional('motion', default={}): MOTION_SCHEMA,
|
|
- vol.Optional('detect', default={}): DETECT_SCHEMA
|
|
|
|
|
|
+ vol.Optional('detect', default={}): DETECT_SCHEMA.extend({
|
|
|
|
+ vol.Optional('enabled', default=True): bool
|
|
|
|
+ })
|
|
}
|
|
}
|
|
}, vol.Msg(ensure_zones_and_cameras_have_different_names, msg='Zones cannot share names with cameras'))
|
|
}, vol.Msg(ensure_zones_and_cameras_have_different_names, msg='Zones cannot share names with cameras'))
|
|
)
|
|
)
|
|
@@ -737,14 +739,20 @@ class MotionConfig():
|
|
|
|
|
|
class DetectConfig():
|
|
class DetectConfig():
|
|
def __init__(self, global_config, config, camera_fps):
|
|
def __init__(self, global_config, config, camera_fps):
|
|
|
|
+ self._enabled = config['enabled']
|
|
self._max_disappeared = config.get('max_disappeared', global_config.get('max_disappeared', camera_fps*2))
|
|
self._max_disappeared = config.get('max_disappeared', global_config.get('max_disappeared', camera_fps*2))
|
|
|
|
|
|
|
|
+ @property
|
|
|
|
+ def enabled(self):
|
|
|
|
+ return self._enabled
|
|
|
|
+
|
|
@property
|
|
@property
|
|
def max_disappeared(self):
|
|
def max_disappeared(self):
|
|
return self._max_disappeared
|
|
return self._max_disappeared
|
|
|
|
|
|
def to_dict(self):
|
|
def to_dict(self):
|
|
return {
|
|
return {
|
|
|
|
+ 'enabled': self.enabled,
|
|
'max_disappeared': self._max_disappeared,
|
|
'max_disappeared': self._max_disappeared,
|
|
}
|
|
}
|
|
|
|
|