jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 14:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

raspberrypi3: boardctl.py merge conflict fix

Browse Source
This commit is contained in:
Calin Crisan 2016-08-28 17:51:42 +03:00
parent 8b80a21898
commit 47baec0589
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
board/raspberrypi3/motioneye-modules/boardctl.py
View File

@ -135,6 +135,7 @@ def _set_board_settings(s):
if name == 'gpu_mem': if name == 'gpu_mem':
lines[i] = '%s=%s' % (name, s['gpuMem']) lines[i] = '%s=%s' % (name, s['gpuMem'])
elif name == 'disable_camera_led': elif name == 'disable_camera_led':
lines[i] = 'disable_camera_led=%s' % ['1', '0'][s['cameraLed']] lines[i] = 'disable_camera_led=%s' % ['1', '0'][s['cameraLed']]