2019-01-04 Fred Gleason <fredg@paravelsystems.com>

* Added a 'pypad_xds.py' PyPAD script.
	* Removed the 'rlm_xds' RLM.
This commit is contained in:
Fred Gleason
2019-01-04 11:06:19 -05:00
parent af9a155965
commit efc2a100a9
8 changed files with 208 additions and 557 deletions

View File

@@ -81,6 +81,7 @@ PAD_TCP_PORT=34289
class Update(object):
def __init__(self,pad_data,config):
self.__fields=pad_data
#print('PAD: '+str(self.__fields))
self.__config=config
def __fromIso8601(self,string):

View File

@@ -40,6 +40,8 @@ install-exec-am:
cp pypad_urlwrite.exemplar $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_urlwrite.exemplar
../../../helpers/install_python.sh pypad_walltime.py $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_walltime.py
cp pypad_walltime.exemplar $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_walltime.exemplar
../../../helpers/install_python.sh pypad_xds.py $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_xds.py
cp pypad_xds.exemplar $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_xds.exemplar
uninstall-local:
rm -f $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_ando.exemplar
@@ -60,6 +62,8 @@ uninstall-local:
rm -f $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_urlwrite.py
rm -f $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_walltime.exemplar
rm -f $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_walltime.py
rm -f $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_xds.exemplar
rm -f $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/PyPAD/pypad_xds.py
EXTRA_DIST = pypad_ando.exemplar\
pypad_ando.py\
@@ -76,7 +80,9 @@ EXTRA_DIST = pypad_ando.exemplar\
pypad_urlwrite.exemplar\
pypad_urlwrite.py\
pypad_walltime.exemplar\
pypad_walltime.py
pypad_walltime.py\
pypad_xds.exemplar\
pypad_xds.py
CLEANFILES = *~\
*.idb\

View File

@@ -0,0 +1,92 @@
; This is the configuration for the 'pypad_xds' script for
; Rivendell, which can be used to output ISCI data for a Citidel X-Digital
; Vantive system via UDP or serial.
; Section Header
;
; One section per Vantive UDP port is configured, starting with 'Udp1' and
; working up consecutively
[Udp1]
; IP Address
;
; The IP address of the remote UDP port, in dotted-quad notation.
IpAddress=127.0.0.1
; UDP Port
;
; The UDP port number of the remote UDP port, in the range 0 - 65,535.
UdpPort=1234
; TTY Device
;
; Use the specified TTY device instead of UDP to send CICs.
;TtyDevice=/dev/ttyS0
;TtySpeed=19200
; ISCI Prefix
;
; The string to prepend to transmitted ISCI code strings.
;
IsciPrefix=TEST_
; Log Selection
;
; Set the status for each log to 'Yes', 'No' or 'Onair' to indicate whether
; state changes on that log should be output on this port. If set
; to 'Onair', then output will be generated only if RDAirPlays OnAir flag
; is active.
MasterLog=Yes
Aux1Log=Yes
Aux2Log=Yes
VLog101=No
VLog102=No
VLog103=No
VLog104=No
VLog105=No
VLog106=No
VLog107=No
VLog108=No
VLog109=No
VLog110=No
VLog111=No
VLog112=No
VLog113=No
VLog114=No
VLog115=No
VLog116=No
VLog117=No
VLog118=No
VLog119=No
VLog120=No
; Additional Vantive destinations can be configured by adding new sections...
;[Udp2]
;IpAddress=192.168.10.22
;UdpPort=6789
;TtyDevice=/dev/ttyS1
;TtySpeed=19200
;MasterLog=Yes
;Aux1Log=No
;Aux2Log=Onair
;VLog101=No
;VLog102=No
;VLog103=No
;VLog104=No
;VLog105=No
;VLog106=No
;VLog107=No
;VLog108=No
;VLog109=No
;VLog110=No
;VLog111=No
;VLog112=No
;VLog113=No
;VLog114=No
;VLog115=No
;VLog116=No
;VLog117=No
;VLog118=No
;VLog119=No
;VLog120=No

104
apis/PyPAD/scripts/pypad_xds.py Executable file
View File

@@ -0,0 +1,104 @@
#!%PYTHON_BANGPATH%
# pypad_xds.py
#
# Send CICs via UDP or serial
#
# (C) Copyright 2018 Fred Gleason <fredg@paravelsystems.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as
# published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public
# License along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
import sys
import socket
import configparser
import serial
import PyPAD
def eprint(*args,**kwargs):
print(*args,file=sys.stderr,**kwargs)
def FilterField(string):
string=string.replace(' ','_')
string=string.replace(',','_')
string=string.replace('.','_')
string=string.replace('"',"'")
string=string.replace('%','-')
string=string.replace('*','-')
string=string.replace('+','-')
string=string.replace('/','-')
string=string.replace(':','-')
string=string.replace(';','-')
string=string.replace('<','-')
string=string.replace('=','-')
string=string.replace('>','-')
string=string.replace('?','-')
string=string.replace('@','-')
string=string.replace('[','-')
string=string.replace('\\','-')
string=string.replace(']','-')
string=string.replace('^','-')
string=string.replace('{','-')
string=string.replace('|','-')
string=string.replace('}','-')
return string
def ProcessPad(update):
n=1
while(True):
section='Udp'+str(n)
try:
if update.shouldBeProcessed(section) and update.hasPadType(PyPAD.TYPE_NOW):
packet='0:'+update.serviceProgramCode()+':'+update.config().get(section,'IsciPrefix')+FilterField(update.padField(PyPAD.TYPE_NOW,PyPAD.FIELD_EXTERNAL_EVENT_ID))+':*'
try:
#
# Use serial output
#
tty_dev=update.config().get(section,'TtyDevice')
speed=int(update.config().get(section,'TtySpeed'))
parity=serial.PARITY_NONE
dev=serial.Serial(tty_dev,speed,parity=parity,bytesize=8)
dev.write(packet.encode('utf-8'))
dev.close()
except configparser.NoOptionError:
#
# Use UDP output
#
send_sock.sendto(packet.encode('utf-8'),
(update.config().get(section,'IpAddress'),int(update.config().get(section,'UdpPort'))))
n=n+1
except configparser.NoSectionError:
return
#
# 'Main' function
#
# Create Send Socket
#
send_sock=socket.socket(socket.AF_INET,socket.SOCK_DGRAM)
rcvr=PyPAD.Receiver()
try:
rcvr.setConfigFile(sys.argv[3])
except IndexError:
eprint('pypad_udp.py: you must specify a configuration file')
sys.exit(1)
rcvr.setCallback(ProcessPad)
rcvr.start(sys.argv[1],int(sys.argv[2]))