diff --git a/ChangeLog b/ChangeLog index 8e4b03fd..4c5f424c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19548,3 +19548,6 @@ 2020-02-14 Fred Gleason * Cleaned up the device access mode in the BroadcastTools 8x2 switcher driver. +2020-02-14 Fred Gleason + * Fixed a regression in the BroadcastTools ACS8.2 switcher driver + that could cause deadlocks and intermittent operation. diff --git a/ripcd/btacs82.cpp b/ripcd/btacs82.cpp index 9530619e..7e16755e 100644 --- a/ripcd/btacs82.cpp +++ b/ripcd/btacs82.cpp @@ -2,7 +2,7 @@ // // A Rivendell switcher driver for the BroadcastTools ACS 8.2 // -// (C) Copyright 2002-2019 Fred Gleason +// (C) Copyright 2002-2020 Fred Gleason // // 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 @@ -53,6 +53,7 @@ BtAcs82::BtAcs82(RDMatrix *matrix,QObject *parent) // RDTty *tty=new RDTty(rda->station()->name(),matrix->port(RDMatrix::Primary)); bt_device=new RDTTYDevice(); + connect(bt_device,SIGNAL(readyRead()),this,SLOT(processStatus())); if(tty->active()) { bt_device->setName(tty->port()); bt_device->setSpeed(tty->baudRate()); @@ -71,13 +72,6 @@ BtAcs82::BtAcs82(RDMatrix *matrix,QObject *parent) bt_gpo_oneshot=new RDOneShot(this); connect(bt_gpo_oneshot,SIGNAL(timeout(void *)), this,SLOT(gpoOneshotData(int))); - - // - // The Poll Timer - // - QTimer *timer=new QTimer(this,"poll_timer"); - connect(timer,SIGNAL(timeout()),this,SLOT(processStatus())); - timer->start(BTACS82_POLL_INTERVAL); } diff --git a/ripcd/btacs82.h b/ripcd/btacs82.h index dae2ea90..c6caacdb 100644 --- a/ripcd/btacs82.h +++ b/ripcd/btacs82.h @@ -2,7 +2,7 @@ // // A Rivendell switcher driver for the BroadcastTools ACS 8.2 // -// (C) Copyright 2002-2008,2016 Fred Gleason +// (C) Copyright 2002-2020 Fred Gleason // // 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 @@ -30,7 +30,6 @@ #include #define BTACS82_UNIT_ID 0 -#define BTACS82_POLL_INTERVAL 100 #define BTACS82_GPIO_PINS 16 class BtAcs82 : public Switcher