Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-11 09:03:40 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Fixed a bug in the 'Software Authority' driver that caused
	autodetection of the number of GPIOs in a router to be unreliable.
	* Removed superfluous code from rdgpimon(1).
This commit is contained in:
Fred Gleason
2020-04-13 17:36:17 -04:00
parent f92e8771ce
commit e737fcbc27
4 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
utils/rdgpimon/rdgpimon.cpp
View File

@@ -298,19 +298,6 @@ void MainWidget::matrixActivatedData(int index)
new RDMatrix(rda->config()->stationName(),gpi_matrix_box->currentItem());
UpdateLabelsDown(0);
gpi_up_button->setDisabled(true);
switch((RDMatrix::GpioType)gpi_type_box->currentItem()) {
case RDMatrix::GpioInput:
rda->ripc()->sendGpiStatus(gpi_matrix_box->currentItem());
rda->ripc()->sendGpiMask(gpi_matrix_box->currentItem());
rda->ripc()->sendGpiCart(gpi_matrix_box->currentItem());
break;
case RDMatrix::GpioOutput:
rda->ripc()->sendGpoStatus(gpi_matrix_box->currentItem());
rda->ripc()->sendGpoMask(gpi_matrix_box->currentItem());
rda->ripc()->sendGpoCart(gpi_matrix_box->currentItem());
break;
}
RefreshEventsList();
gpi_events_startup_timer->start(1000,true);
}
@@ -459,6 +446,7 @@ void MainWidget::gpiMaskChangedData(int matrix,int line,bool state)
void MainWidget::gpoMaskChangedData(int matrix,int line,bool state)
{
// printf("gpoMaskChangedData(%d,%d,%d)\n",matrix,line,state);
if(gpi_type_box->currentItem()!=RDMatrix::GpioOutput) {
return;
}
@@ -502,6 +490,8 @@ void MainWidget::gpiCartChangedData(int matrix,int line,int off_cartnum,
void MainWidget::gpoCartChangedData(int matrix,int line,int off_cartnum,
int on_cartnum)
{
// printf("gpoCartChangedData(%d,%d,%d,%d)\n",matrix,line,off_cartnum,
// on_cartnum);
if(gpi_type_box->currentItem()!=RDMatrix::GpioOutput) {
return;
}
@@ -633,9 +623,7 @@ void MainWidget::UpdateLabelsDown(int first_line)
"order by NUMBER";
q=new RDSqlQuery(sql);
while(q->next()&&(count<(GPIMON_ROWS*GPIMON_COLS))) {
gpi_labels[count]->setLine(q->value(0).toInt()-1);
gpi_labels[count]->setCart(q->value(1).toUInt(),q->value(2).toUInt());
gpi_labels[count]->show();
if(!first_updated) {
gpi_first_line=q->value(0).toInt();
first_updated=true;
@@ -646,6 +634,22 @@ void MainWidget::UpdateLabelsDown(int first_line)
gpi_down_button->setEnabled(q->next());
delete q;
sql=QString("select ")+
tablename+" "+ // 00
"from MATRICES where "+
"(STATION_NAME=\""+RDEscapeString(rda->station()->name())+"\") && "+
QString().sprintf("(MATRIX=%d)",gpi_matrix->matrix());
q=new RDSqlQuery(sql);
if(q->first()) {
for(int i=0;i<(GPIMON_ROWS*GPIMON_COLS);i++) {
if((i+first_line)<q->value(0).toInt()) {
gpi_labels[i]->setLine(i+first_line);
gpi_labels[i]->show();
}
}
}
delete q;
RefreshGpioStates();
}