Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-11 07:05:48 +01:00
Code Issues Projects Releases Wiki Activity

2019-07-23 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed regressions that made serial device operation unreliable.
This commit is contained in:
Fred Gleason
2019-07-23 14:19:06 -04:00
parent 70c88ec498
commit c3cc94143a
29 changed files with 216 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ripcd/btss124.cpp
View File

@@ -2,7 +2,7 @@
//
// A Rivendell switcher driver for the BroadcastTools SS 12.4
//
// (C) Copyright 2002-2004,2016-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2019 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
@@ -103,7 +103,7 @@ void BtSs124::processCommand(RDMacro *cmd)
}
sprintf(str,"*%d%02d%d",BTSS124_UNIT_ID,
cmd->arg(1).toInt(),cmd->arg(2).toInt());
bt_device->writeBlock(str,5);
bt_device->write(str,5);
cmd->acknowledge(true);
emit rmlEcho(cmd);
break;
@@ -117,7 +117,7 @@ void BtSs124::processCommand(RDMacro *cmd)
}
sprintf(str,"*%d%02dM%d",BTSS124_UNIT_ID,
cmd->arg(1).toInt(),cmd->arg(2).toInt());
bt_device->writeBlock(str,6);
bt_device->write(str,6);
cmd->acknowledge(true);
emit rmlEcho(cmd);
break;
@@ -131,21 +131,21 @@ void BtSs124::processCommand(RDMacro *cmd)
}
if(cmd->arg(1).toInt()==0) {
sprintf(str,"*%dM%d",BTSS124_UNIT_ID,cmd->arg(2).toInt());
bt_device->writeBlock(str,4);
bt_device->write(str,4);
}
else {
sprintf(str,"*%d%02d%d",BTSS124_UNIT_ID,
cmd->arg(1).toInt(),cmd->arg(2).toInt());
bt_device->writeBlock(str,5);
bt_device->write(str,5);
for(int i=1;i<cmd->arg(1).toInt();i++) {
sprintf(str,"*%d%02dM%d",BTSS124_UNIT_ID,
i,cmd->arg(2).toInt());
bt_device->writeBlock(str,6);
bt_device->write(str,6);
}
for(int i=cmd->arg(1).toInt()+1;i<9;i++) {
sprintf(str,"*%d%02dM%d",BTSS124_UNIT_ID,
i,cmd->arg(2).toInt());
bt_device->writeBlock(str,6);
bt_device->write(str,6);
}
}
cmd->acknowledge(true);