still images capture mode fix

diff --git a/doc/todo.txt b/doc/todo.txt
index ade352875886801a3cfcf037c9fd4e3e4ed59634..c9f150bccaa4872e09a35a70898a38173fd16e62 100644 (file)
--- a/doc/todo.txt
+++ b/doc/todo.txt
@@ -1,7 +1,12 @@
+-> kill mjpgclients when not used
+-> add a loading progress when page loads
+-> order of the cams is a bit random
+-> disk usage at bottom
 -> make camera frames positions configurable
 -> add a view log functionality
 -> add a previewer for snapshots
 -> add a previewer for movies
+-> increase the maximal number of threshold pixels (maybe express it in % as well)
 
 -> style scroll bars
 -> hint text next to section titles
@@ -11,6 +16,7 @@
 -> implement notifications
 -> implement functionalities specific to raspberry pi: network settings, smb control
 -> group @config rules at top
+-> chaining two or more remote motionEye cameras breaks updating configuration
 
 -> browser compatibility test
 -> requirements test

diff --git a/raspicam/README.md b/raspicam/README.md
index 37c60378cc0a4240d7ebfb4db98434115b03cec9..f58baa51f392e438d7913ff45f45f96956f27f04 100644 (file)
--- a/raspicam/README.md
+++ b/raspicam/README.md
@@ -18,7 +18,7 @@
 4. the `uv4l` daemon must be started at boot; add the following line to `/etc/rc.local`,
    *before* the line that starts motionEye:
 
-        test -x /usr/local/bin/motion && /usr/local/bin/motion -h > /dev/null 2>&1
+        test -x /usr/local/bin/motion && sudo -u pi /usr/local/bin/motion -h > /dev/null 2>&1 || false
 
 5. if you wish to start motionEye at boot, add this to `/etc/rc.local` (assuming motionEye lives in pi's home directory):
 

diff --git a/src/config.py b/src/config.py
index 96d7d64b5ee7113c214d491fb1309d5358486947..ed255b82bce239bf7ea70cf93709fd97c72102b5 100644 (file)
--- a/src/config.py
+++ b/src/config.py
@@ -729,13 +729,13 @@ def camera_dict_to_ui(data):
             ui['capture_mode'] = 'all-frames'
             ui['image_file_name'] = jpeg_filename
             
-        elif data.get('snapshot_interval'):
-            ui['capture-mode'] = 'interval-snapshots'
+        elif snapshot_interval:
+            ui['capture_mode'] = 'interval-snapshots'
             ui['image_file_name'] = snapshot_filename
             ui['snapshot_interval'] = snapshot_interval
             
-        elif data.get('output_normal'):
-            ui['capture-mode'] = 'motion-triggered'
+        elif output_normal:
+            ui['capture_mode'] = 'motion-triggered'
             ui['image_file_name'] = jpeg_filename  
             
         ui['image_quality'] = ui.get('quality', 85)

diff --git a/templates/main.html b/templates/main.html
index e05fa399712cf923dfb88cc0ce3b9d7a95f51dd5..570d6e406eaf33ec9c507c72d0c38086f1026af9 100644 (file)
--- a/templates/main.html
+++ b/templates/main.html
@@ -68,7 +68,6 @@
                     <tr class="settings-item advanced-setting">
                         <td class="settings-item-label"><span class="settings-item-label">Current Version</span></td>
                         <td class="settings-item-value"><span class="settings-item-label">{{VERSION}}</span></td>
-                        <td><span class="help-mark" title="checks for new versions and performs updates">?</span></td>
                     </tr>
                     <tr class="settings-item advanced-setting">
                         <td class="settings-item-label"><span class="settings-item-label">Software Update</span></td>