Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-31 22:24:02 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Fixed a bug in the 'pypad_xds.py' PyPAD script that could cause it
	to emit duplicate CIC updates.
This commit is contained in:
Fred Gleason
2020-01-04 13:49:41 -05:00
parent 2775f7cb35
commit 0e8234afc6
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -19392,3 +19392,6 @@
2020-01-04 Fred Gleason <fredg@paravelsystems.com>
* Modified the example CounterPoint log import file to have unique
GUID values for each line.
2020-01-04 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in the 'pypad_xds.py' PyPAD script that could cause it
to emit duplicate CIC updates.

15
apis/pypad/scripts/pypad_xds.py
View File

@@ -4,7 +4,7 @@
#
# Send CICs via UDP or serial
#
# (C) Copyright 2018-2019 Fred Gleason <fredg@paravelsystems.com>
# (C) Copyright 2018-2020 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
@@ -26,6 +26,11 @@ import configparser
import serial
import pypad
#
# For supressing redundant 'now' updates
#
last_updates={}
def eprint(*args,**kwargs):
print(*args,file=sys.stderr,**kwargs)
@@ -60,10 +65,16 @@ def FilterField(string):
def ProcessPad(update):
try:
last_updates[update.machine()]
except KeyError:
last_updates[update.machine()]=None
n=1
section='Udp'+str(n)
while(update.config().has_section(section)):
if update.shouldBeProcessed(section) and update.hasPadType(pypad.TYPE_NOW) and update.hasService():
if update.shouldBeProcessed(section) and update.hasPadType(pypad.TYPE_NOW) and update.hasService() and (last_updates[update.machine()] != update.startDateTimeString(pypad.TYPE_NOW)):
last_updates[update.machine()]=update.startDateTimeString(pypad.TYPE_NOW)
packet='0:'+update.serviceProgramCode()+':'+update.config().get(section,'IsciPrefix')+FilterField(update.padField(pypad.TYPE_NOW,pypad.FIELD_EXTERNAL_EVENT_ID))+':*'
try:
#