From 10b5aa49467609480ece0f8187f6b8f87e00febf Mon Sep 17 00:00:00 2001 From: Senad Uka Date: Sat, 8 Oct 2016 16:51:12 +0200 Subject: [PATCH] fix syntax errors --- controller/camera_capture.py | 2 +- controller/camera_send.py | 2 +- controller/config/copy__init__.py.example | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/controller/camera_capture.py b/controller/camera_capture.py index ff25dbe..ff590d5 100644 --- a/controller/camera_capture.py +++ b/controller/camera_capture.py @@ -1,3 +1,3 @@ -import drivers.camera +import drivers.camera as camera camera.capture_picture() diff --git a/controller/camera_send.py b/controller/camera_send.py index ca1103d..c62823c 100644 --- a/controller/camera_send.py +++ b/controller/camera_send.py @@ -1,4 +1,4 @@ -import drivers.camera +import drivers.camera as camera import requests import config diff --git a/controller/config/copy__init__.py.example b/controller/config/copy__init__.py.example index cdfbc78..36f0b59 100644 --- a/controller/config/copy__init__.py.example +++ b/controller/config/copy__init__.py.example @@ -15,5 +15,5 @@ CONTROLLER_ID = '120' # every controller must have a different one STATE_FILE = '/mnt/zoblakdata/controller_state' PICTURE_TRANSFER_FILE='/mnt/zoblakdata/picture_transfer_ready.jpg' PICTURE_INPUT_FILE='/mnt/zoblakdata/picture.jpg' # must match file in PICTURE_COMMAND -PICTURE_COMMAND='avconv -i rtsp://192.168.1.10:554//user=admin_password=_channel=1_stream=0.sdp -i zoblakLogo.png -filter_complex "[0:v]drawtext=fontfile=/usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf:fontsize=30:box=1:boxcolor=black@0.75:text='%d\.%m\.%Y\. %H\:%M\:%S':fontcolor=white@0.8: x=10: y=10[text]; [text][1:v]overlay=main_w-overlay_w-5:5 [filtered]" -map "[filtered]" -f image2 -vframes 1 /mnt/zoblakdata/picture.jpg' # filename must match PICTURE_INPUT_FILE path +PICTURE_COMMAND="""avconv -i rtsp://192.168.5.10:554//user=admin_password=_channel=1_stream=0.sdp -i zoblakLogo.png -filter_complex "[0:v]drawtext=fontfile=/usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf:fontsize=30:box=1:boxcolor=black@0.75:text='%d\.%m\.%Y\. %H\:%M\:%S':fontcolor=white@0.8: x=10: y=10[text]; [text][1:v]overlay=main_w-overlay_w-5:5 [filtered]" -map "[filtered]" -f image2 -vframes 1 /mnt/zoblakdata/picture.jpg""" # filename must match PICTURE_INPUT_FILE path PICTURE_URL = 'http://agrar.zoblak.com/api/v1.0/picture/'