|
|
|
@ -261,13 +261,6 @@ void CController::ReadAmbeDevices()
|
|
|
|
//wait for up to 40 ms to read anthing from all devices
|
|
|
|
//wait for up to 40 ms to read anthing from all devices
|
|
|
|
if (rval > 0) {
|
|
|
|
if (rval > 0) {
|
|
|
|
// from the device file descriptor, we'll know if it's dstar or dmr
|
|
|
|
// from the device file descriptor, we'll know if it's dstar or dmr
|
|
|
|
for (unsigned int i=0 ; i<dstar_device.size(); i++)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if (FD_ISSET(dstar_device[i]->GetFd(), &FdSet))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
ReadDevice(dstar_device[i], EAmbeType::dstar);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
for (unsigned int i=0 ; i<dmr_device.size(); i++)
|
|
|
|
for (unsigned int i=0 ; i<dmr_device.size(); i++)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (FD_ISSET(dmr_device[i]->GetFd(), &FdSet))
|
|
|
|
if (FD_ISSET(dmr_device[i]->GetFd(), &FdSet))
|
|
|
|
@ -276,6 +269,13 @@ void CController::ReadAmbeDevices()
|
|
|
|
std::cout << "Read DMR device " << i << std::endl;
|
|
|
|
std::cout << "Read DMR device " << i << std::endl;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for (unsigned int i=0 ; i<dstar_device.size(); i++)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if (FD_ISSET(dstar_device[i]->GetFd(), &FdSet))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
ReadDevice(dstar_device[i], EAmbeType::dstar);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|