added some new defaults, v4l2 ctl values are now rounded

diff --git a/doc/todo.txt b/doc/todo.txt
index 73448ee1375780a7584c3925f1900d63db045e26..13f1dc4e8ea31e2d5fe33e9538a2860f2f715e99 100644 (file)
--- a/doc/todo.txt
+++ b/doc/todo.txt
@@ -1,3 +1,11 @@
+-> gunoiul de ffmpeg_variable_bitrate nu merge decat in motion.conf
+
+-> brightness/contrast/hue/sat on picam1 issue when applying
+-> http clients don't die: max_clients limit reached, request queued. 10 active, 217 queued requests. 
+-> remote adding ui could be improved (cleanup fields on ok/on load, no error message until everything is ok)
+
+-> add an autoupdate mechanism
+
 -> style scroll bars
 -> hint text next to section titles
 -> clickable hints

diff --git a/src/config.py b/src/config.py
index e3b0f980c64f3704f0e0af0f463c96b7bef5f8ab..48bbd3e96afe450a8910b684f114fb3677e2b335 100644 (file)
--- a/src/config.py
+++ b/src/config.py
@@ -527,14 +527,14 @@ def _set_default_motion_camera(data):
     data.setdefault('@proto', 'v4l2')
     data.setdefault('videodevice', '/dev/video0')
     data.setdefault('lightswitch', 0)
-    data.setdefault('auto_brightness', True)
+    data.setdefault('auto_brightness', False)
     data.setdefault('brightness', 0)
     data.setdefault('contrast', 0)
     data.setdefault('saturation', 0)
     data.setdefault('hue', 0)
     data.setdefault('width', 352)
     data.setdefault('height', 288)
-    data.setdefault('framerate', 5)
+    data.setdefault('framerate', 2)
     data.setdefault('rotate', 0)
     
     data.setdefault('@storage_device', 'local-disk')
@@ -559,10 +559,11 @@ def _set_default_motion_camera(data):
     data.setdefault('threshold', 1500)
     data.setdefault('noise_tune', True)
     data.setdefault('noise_level', 32)
+    data.setdefault('minimum_motion_frames', 5)
     
-    data.setdefault('gap', 60)
-    data.setdefault('pre_capture', 5)
-    data.setdefault('post_capture', 5)
+    data.setdefault('gap', 30)
+    data.setdefault('pre_capture', 2)
+    data.setdefault('post_capture', 4)
     
     data.setdefault('output_all', False)
     data.setdefault('output_normal', False)

diff --git a/src/v4l2ctl.py b/src/v4l2ctl.py
index fa294da7c120540a9cd8da263234aef3b17291fe..f41e72552ca0af70c29cfc55eafbfe97ccad6a98 100644 (file)
--- a/src/v4l2ctl.py
+++ b/src/v4l2ctl.py
@@ -98,7 +98,7 @@ def _get_ctrl(device, control):
         min_value = int(properties['min'])
         max_value = int(properties['max'])
         
-        value = int((value - min_value) * 100.0 / (max_value - min_value))
+        value = int(round((value - min_value) * 100.0 / (max_value - min_value)))
     
     else:
         logging.warn('min and max values not found for control %(control)s of device %(device)s' % {
@@ -124,7 +124,7 @@ def _set_ctrl(device, control, value):
         min_value = int(properties['min'])
         max_value = int(properties['max'])
         
-        value = min_value + value * float(max_value - min_value) / 100
+        value = int(round(min_value + value * (max_value - min_value) / 100.0))
     
     else:
         logging.warn('min and max values not found for control %(control)s of device %(device)s' % {