From 7d39cf570f865916a04133b05c3dd2c695e0ca73 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sat, 27 Dec 2014 17:16:06 +0200 Subject: [PATCH] software automatic brightness option is back (but don't blame me if it doesn't work as expected) --- src/config.py | 3 +++ static/js/main.js | 2 ++ templates/main.html | 5 +++++ 3 files changed, 10 insertions(+) diff --git a/src/config.py b/src/config.py index d15ff29..48e2d64 100644 --- 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 3088aca..87ecc70 100644 --- 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 1be6446..3e3216d 100644 --- a/templates/main.html +++ b/templates/main.html @@ -136,6 +136,11 @@ ? + + Automatic Brightness + + ? + Brightness -- 2.39.5