Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-06-07 15:42:34 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Fixed a bug in ripcd(8) that caused input and output counts to
	be calculated incorrectly for Software Authority protocol devices
	containing holes in the input and/or output lists.
This commit is contained in:
Fred Gleason 2019-12-04 11:42:07 -05:00
parent b6e37abce0
commit 53fd246dfa
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -19290,3 +19290,7 @@
2019-12-03 Fred Gleason <fredg@paravelsystems.com> 2019-12-03 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdgpimon(1) that caused GPIO cart displays to * Fixed a bug in rdgpimon(1) that caused GPIO cart displays to
fail to accurately reflect current state. fail to accurately reflect current state.
2019-12-04 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in ripcd(8) that caused input and output counts to
be calculated incorrectly for Software Authority protocol devices
containing holes in the input and/or output lists.

10
ripcd/swauthority.cpp
View File

@ -255,7 +255,7 @@ void SoftwareAuthority::DispatchCommand()
QString section=line_in.lower().replace(">>",""); QString section=line_in.lower().replace(">>","");
// //
// Startup Sequence. Get the input and output lists. // Startup Sequence. Get initial GPIO states and the input and output lists.
// //
if(section=="login successful") { if(section=="login successful") {
sprintf(buffer,"gpistat %d\x0D\x0A",swa_card); // Request GPI States sprintf(buffer,"gpistat %d\x0D\x0A",swa_card); // Request GPI States
@ -305,7 +305,6 @@ void SoftwareAuthority::DispatchCommand()
delete q; delete q;
return; return;
} }
swa_inputs++;
f0=line_in.split("\t",QString::KeepEmptyParts); f0=line_in.split("\t",QString::KeepEmptyParts);
name=f0[1]; name=f0[1];
if(f0.size()>=7) { if(f0.size()>=7) {
@ -330,6 +329,9 @@ void SoftwareAuthority::DispatchCommand()
QString().sprintf("MATRIX=%d,",swa_matrix)+ QString().sprintf("MATRIX=%d,",swa_matrix)+
QString().sprintf("NUMBER=%d",f0[0].toInt()); QString().sprintf("NUMBER=%d",f0[0].toInt());
} }
if(f0[0].toInt()>swa_inputs) {
swa_inputs=f0[0].toInt();
}
delete q; delete q;
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
delete q; delete q;
@ -357,7 +359,6 @@ void SoftwareAuthority::DispatchCommand()
} }
return; return;
} }
swa_outputs++;
f0=line_in.split("\t",QString::KeepEmptyParts); f0=line_in.split("\t",QString::KeepEmptyParts);
name=f0[1]; name=f0[1];
if(f0.size()>=6) { if(f0.size()>=6) {
@ -382,6 +383,9 @@ void SoftwareAuthority::DispatchCommand()
QString().sprintf("MATRIX=%d,",swa_matrix)+ QString().sprintf("MATRIX=%d,",swa_matrix)+
QString().sprintf("NUMBER=%d",f0[0].toInt()); QString().sprintf("NUMBER=%d",f0[0].toInt());
} }
if(f0[0].toInt()>swa_outputs) {
swa_outputs=f0[0].toInt();
}
delete q; delete q;
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
delete q; delete q;