aboutsummaryrefslogtreecommitdiffstats
path: root/doc/zmq-ctrl/cpp
diff options
context:
space:
mode:
authorJörgen Scott <jorgen.scott@gmail.com>2015-02-09 15:54:45 +0100
committerJörgen Scott <jorgen.scott@gmail.com>2015-02-09 15:54:45 +0100
commit958e286699348c1c2110155efd2a1682fb6a1ac4 (patch)
tree9f23c7afd150dbcda2a6ec0fec8e87f4cbb82770 /doc/zmq-ctrl/cpp
parentb31494c688ad93f2c09688a9061c7d392c6844a7 (diff)
downloaddabmod-958e286699348c1c2110155efd2a1682fb6a1ac4.tar.gz
dabmod-958e286699348c1c2110155efd2a1682fb6a1ac4.tar.bz2
dabmod-958e286699348c1c2110155efd2a1682fb6a1ac4.zip
changed static delay parameter type
Diffstat (limited to 'doc/zmq-ctrl/cpp')
-rw-r--r--doc/zmq-ctrl/cpp/OdrModCtrl.cpp2
-rw-r--r--doc/zmq-ctrl/cpp/OdrModCtrl.hpp2
-rw-r--r--doc/zmq-ctrl/cpp/test/ctrl_test.cpp5
3 files changed, 5 insertions, 4 deletions
diff --git a/doc/zmq-ctrl/cpp/OdrModCtrl.cpp b/doc/zmq-ctrl/cpp/OdrModCtrl.cpp
index cd48fd1..731a9af 100644
--- a/doc/zmq-ctrl/cpp/OdrModCtrl.cpp
+++ b/doc/zmq-ctrl/cpp/OdrModCtrl.cpp
@@ -142,7 +142,7 @@ bool COdrModCtrl::SetMuting(const bool mute, std::string &error)
return DoSet(MOD_UHD, PARAM_MUTE, mute, error);
}
-bool COdrModCtrl::SetStaticDelay(const uint32_t delayUs, std::string &error)
+bool COdrModCtrl::SetStaticDelay(const int32_t delayUs, std::string &error)
{
return DoSet(MOD_UHD, PARAM_STAT_DELAY, delayUs, error);
}
diff --git a/doc/zmq-ctrl/cpp/OdrModCtrl.hpp b/doc/zmq-ctrl/cpp/OdrModCtrl.hpp
index 8b40666..e343710 100644
--- a/doc/zmq-ctrl/cpp/OdrModCtrl.hpp
+++ b/doc/zmq-ctrl/cpp/OdrModCtrl.hpp
@@ -50,7 +50,7 @@ class COdrModCtrl
virtual bool SetTxGain(const double gain, std::string &error);
virtual bool SetTxFrequency(const double freqHz, std::string &error);
virtual bool SetMuting(const bool mute, std::string &error);
- virtual bool SetStaticDelay(const uint32_t delayUs, std::string &error);
+ virtual bool SetStaticDelay(const int32_t delayUs, std::string &error);
private:
// methods
diff --git a/doc/zmq-ctrl/cpp/test/ctrl_test.cpp b/doc/zmq-ctrl/cpp/test/ctrl_test.cpp
index 21811d6..fdfd35a 100644
--- a/doc/zmq-ctrl/cpp/test/ctrl_test.cpp
+++ b/doc/zmq-ctrl/cpp/test/ctrl_test.cpp
@@ -80,8 +80,9 @@ BOOST_AUTO_TEST_CASE (Muting)
BOOST_AUTO_TEST_CASE (StaticDelay)
{
- // reset first or else test will fail on successive runs
- BOOST_CHECK(modCtrl.SetStaticDelay(-1, error) == true);
+ // reset first (by setting out of range value) or else test
+ // will fail on successive runs
+ BOOST_CHECK(modCtrl.SetStaticDelay(100000, error) == true);
BOOST_CHECK(modCtrl.SetStaticDelay(45000, error) == true);
uint32_t value;
BOOST_CHECK(modCtrl.GetStaticDelay(value, error) == true);