software automatic brightness option is back (but don't blame me if it

doesn't work as expected)

diff --git a/src/config.py b/src/config.py
index d15ff29f673d1530a792cb14b1e58b0dcb63b9e2..48e2d649adf8cb71801b01d3bf4043d0cf099d18 100644 (file)
--- a/src/config.py
+++ b/src/config.py
@@ -514,6 +514,7 @@ def camera_ui_to_dict(ui):
         '@name': ui['name'],
         '@enabled': ui['enabled'],
         'lightswitch': int(ui['light_switch_detect']) * 50,
+        'auto_brightness': ui['auto_brightness'],
         'framerate': int(ui['framerate']),
         'rotate': int(ui['rotation']),
         
@@ -765,6 +766,7 @@ def camera_dict_to_ui(data):
         'enabled': data['@enabled'],
         'id': data['@id'],
         'light_switch_detect': data['lightswitch'] > 0,
+        'auto_brightness': data['auto_brightness'],
         'framerate': int(data['framerate']),
         'rotation': int(data['rotate']),
         
@@ -1278,6 +1280,7 @@ def _set_default_motion_camera(camera_id, data, old_motion=False):
         data.setdefault('height', 288)
 
     data.setdefault('lightswitch', 50)
+    data.setdefault('auto_brightness', False)
     data.setdefault('framerate', 2)
     data.setdefault('rotate', 0)
     

diff --git a/static/js/main.js b/static/js/main.js
index 3088acae06b2af59fe21a7351a0eccd1d89335b9..87ecc70d3b40689e5d15c2d34eda26fc70cd8f34 100644 (file)
--- a/static/js/main.js
+++ b/static/js/main.js
@@ -911,6 +911,7 @@ function cameraUi2Dict() {
         'enabled': $('#videoDeviceSwitch')[0].checked,
         'name': $('#deviceNameEntry').val(),
         'light_switch_detect': $('#lightSwitchDetectSwitch')[0].checked,
+        'auto_brightness': $('#autoBrightnessSwitch')[0].checked,
         'rotation': $('#rotationSelect').val(),
         'framerate': $('#framerateSlider').val(),
         'proto': $('#deviceEntry')[0].proto,
@@ -1050,6 +1051,7 @@ function dict2CameraUi(dict) {
     $('#deviceEntry')[0].username = dict['username'];
     $('#deviceEntry')[0].password = dict['password'];
     $('#lightSwitchDetectSwitch')[0].checked = dict['light_switch_detect'];
+    $('#autoBrightnessSwitch')[0].checked = dict['auto_brightness'];
     
     if (dict['brightness'] != null) {
         $('#brightnessSlider').val(dict['brightness']);

diff --git a/templates/main.html b/templates/main.html
index 1be6446304bccf4b7596c652b146d55b7759c034..3e3216dbb4eb6ca891237bd4a8c524cb1a90b2cb 100644 (file)
--- a/templates/main.html
+++ b/templates/main.html
@@ -136,6 +136,11 @@
                         <td class="settings-item-value"><input type="checkbox" class="styled device" id="lightSwitchDetectSwitch"></td>
                         <td><span class="help-mark" title="enable this if you want sudden changes in light to not be treated as motion">?</span></td>
                     </tr>
+                    <tr class="settings-item advanced-setting">
+                        <td class="settings-item-label"><span class="settings-item-label">Automatic Brightness</span></td>
+                        <td class="settings-item-value"><input type="checkbox" class="styled device" id="autoBrightnessSwitch"></td>
+                        <td><span class="help-mark" title="enables software automatic brightness (only recommended for cameras without autobrightness)">?</span></td>
+                    </tr>
                     <tr class="settings-item advanced-setting">
                         <td class="settings-item-label"><span class="settings-item-label">Brightness</span></td>
                         <td class="settings-item-value"><input type="text" class="range styled device" id="brightnessSlider"></td>