diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-02-22 21:39:56 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-02-22 21:39:56 +0100 |
| commit | 87b708657a78cac4690ba81967e5ca03d7faab09 (patch) | |
| tree | 029f6bdc0cc65d9a1ad2849624e947a9404b94b8 /src/OutputUHD.cpp | |
| parent | 1ada0901a8fa687576fa4953044fd43bc6c06f8a (diff) | |
| download | dabmod-87b708657a78cac4690ba81967e5ca03d7faab09.tar.gz dabmod-87b708657a78cac4690ba81967e5ca03d7faab09.tar.bz2 dabmod-87b708657a78cac4690ba81967e5ca03d7faab09.zip | |
Restart full modulator on ZeroMQ input overrun
Diffstat (limited to 'src/OutputUHD.cpp')
| -rw-r--r-- | src/OutputUHD.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/OutputUHD.cpp b/src/OutputUHD.cpp index d033700..efdf6df 100644 --- a/src/OutputUHD.cpp +++ b/src/OutputUHD.cpp @@ -496,7 +496,7 @@ void UHDWorker::process() md.time_spec = uhd::time_spec_t(tx_second, pps_offset); // md is defined, let's do some checks - if (md.time_spec.get_real_secs() + 0.2 < usrp_time) { + if (md.time_spec.get_real_secs() + timeout < usrp_time) { uwd->logger->level(warn) << "OutputUHD: Timestamp in the past! offset: " << md.time_spec.get_real_secs() - usrp_time << @@ -507,12 +507,14 @@ void UHDWorker::process() goto loopend; //skip the frame } +#if 0 // Let uhd handle this if (md.time_spec.get_real_secs() > usrp_time + TIMESTAMP_MARGIN_FUTURE) { uwd->logger->level(warn) << "OutputUHD: Timestamp too far in the future! offset: " << md.time_spec.get_real_secs() - usrp_time; usleep(20000); //sleep so as to fill buffers } +#endif if (md.time_spec.get_real_secs() > usrp_time + TIMESTAMP_ABORT_FUTURE) { uwd->logger->level(error) << |