senaduka/old-tfm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- added support for 2 cameras, changes in /controller/config/__init__.py

Browse Source 
- since this creates a new, merged image an additional tool named "imagemagick" is needed, see README.md
This commit is contained in:
Amir Smajevic
2016-12-28 14:14:44 +01:00
parent 9b80df491f
commit 5074bc4903
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
controller/config/copy__init__.py.example
View File

@@ -14,7 +14,10 @@ API_BASE_URL = 'http://agrar.zoblak.com/api/v1.0'
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.5.10:554//user=admin_password=_channel=1_stream=0.sdp -i /home/pi/projects/tfm/controller/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_INPUT_FILE='/mnt/zoblakdata/picture.jpg' # must match file in PICTURE_COMMAND
#PICTURE_COMMAND="""avconv -i rtsp://192.168.5.10:554//user=admin_password=_channel=1_stream=0.sdp -i /home/pi/projects/tfm/controller/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_INPUT_FILE='/mnt/zoblakdata/picture_output.jpg' # must match resulting combined filename in PICTURE_COMMAND
PICTURE_COMMAND="""avconv -i rtsp://192.168.51.10:554//user=admin_password=_channel=1_stream=0.sdp -i /home/pi/projects/tfm/controller/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\nKALEM PILE - SPRAT':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;avconv -i rtsp://192.168.51.11:554//user=admin_password=_channel=1_stream=0.sdp -i /home/pi/projects/tfm/controller/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\nKALEM PILE - PRIZEMLJE':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/picture2.jpg;convert -bordercolor white -border 0x10 /mnt/zoblakdata/picture.jpg /mnt/zoblakdata/picture.jpg;convert /mnt/zoblakdata/picture.jpg /mnt/zoblakdata/picture2.jpg -append /mnt/zoblakdata/picture_output.jpg""" # filename must match PICTURE_INPUT_FILE path
PICTURE_URL = 'http://agrar.zoblak.com/api/v1.0/picture'
ONE_WIRE_THERMO_SENSORS = ['/sys/bus/w1/devices/xxx/w1_slave'] # xxx -serial
ONE_WIRE_THERMO_SENSORS = ['/sys/bus/w1/devices/28-000007516ef2/w1_slave','/sys/bus/w1/devices/28-00000752162e/w1_slave'] # xxx -serial