watch script is now stopped during update

Author: ccrisan

board/raspberrypi/config.txt

@@ -1,9 +1,11 @@
 start_file=start.elf
 fixup_file=fixup.elf
-arm_freq=800
-core_freq=500
-sdram_freq=500
-over_voltage=6
+arm_freq=700
+core_freq=250
+sdram_freq=400
+over_voltage=0
+gpu_mem=128
 gpu_mem_256=128
 gpu_mem_512=128
 disable_camera_led=0
+

board/raspberrypi/overlay/etc/modules

@@ -1,2 +1,2 @@
-bcm2835-v4l2
+bcm2835-v4l2 max_video_width=2592 max_video_height=1944
 

board/raspberrypi/overlay/programs/motioneye/src/boardctl.py

@@ -18,17 +18,17 @@
 import logging
 import os.path
 
-from config import additional_config, additional_section
+from config import additional_config
 
 
 CONFIG_TXT = '/boot/config.txt'
 
 OVERCLOCK = {
-    '700': '700|250|400|0',
-    '800': '800|250|400|0',
-    '900': '900|250|450|0',
-    '950': '950|250|450|0',
-    '1000': '1000|500|600|6'
+    700: '700|250|400|0',
+    800: '800|250|400|0',
+    900: '900|250|450|0',
+    950: '950|250|450|0',
+    1000: '1000|500|600|6'
 }
 
 def _get_board_settings():
@@ -156,14 +156,18 @@ def _set_board_settings(s):
 
     with open(CONFIG_TXT, 'w') as f:
         for line in lines:
-            f.write(line + '\n')
+            if not line.strip():
+                continue
+            if not line.endswith('\n'):
+                line += '\n'
+            f.write(line)
 
 
-@additional_section
-def board():
+@additional_config
+def boardSeparator():
     return {
-        'label': 'Raspberry PI Tweaks',
-        'description': 'tweak your Raspberry PI board',
+        'type': 'separator',
+        'section': 'expertSettings',
         'advanced': True
     }
 
@@ -176,7 +180,7 @@ def gpuMem():
         'type': 'number',
         'min': '16',
         'max': '448',
-        'section': 'board',
+        'section': 'expertSettings',
         'advanced': True,
         'reboot': True,
         'get': _get_board_settings,
@@ -191,7 +195,7 @@ def cameraLed():
         'label': 'Enable CSI Camera Led',
         'description': 'control the led on the CSI camera board',
         'type': 'bool',
-        'section': 'board',
+        'section': 'expertSettings',
         'advanced': True,
         'reboot': True,
         'get': _get_board_settings,
@@ -213,10 +217,11 @@ def overclock():
             ('950|250|450|0', 'high (950/250/450/0)'),
             ('1000|500|600|6', 'turbo (1000/500/600/6)')
         ],
-        'section': 'board',
+        'section': 'expertSettings',
         'advanced': True,
         'reboot': True,
         'get': _get_board_settings,
         'set': _set_board_settings,
         'get_set_dict': True
     }
+

package/motioneye/extractl.py

@@ -98,7 +98,11 @@ def _set_motioneye_settings(s):
 
     with open(MOTIONEYE_CONF, 'w') as f:
         for line in lines:
-            f.write(line + '\n')
+            if not line.strip():
+                continue
+            if not line.endswith('\n'):
+                line += '\n'
+            f.write(line)
 
 
 def _get_date_settings():

package/motioneye/update.py

@@ -185,6 +185,9 @@ def perform_update(version):
     logging.info('killing motioneye init script...')
     os.system('kill $(pidof S95motioneye)')
 
+    logging.info('stopping netwatch init script...')
+    os.system('/etc/init.d/S41netwatch stop')
+
     download(version)
 
     logging.info('backing up /boot/config.txt')