Diff: CommandTerminal/CmdTxFrequency.cpp

Revision:

9:ff62b20f7000

Parent:

1:e52ae6584f1c

Child:

14:f9a77400b622

--- a/CommandTerminal/CmdTxFrequency.cpp	Mon Apr 04 13:17:44 2016 +0000
+++ b/CommandTerminal/CmdTxFrequency.cpp	Mon Apr 04 09:00:31 2016 -0500
@@ -24,13 +24,13 @@
     else if (args.size() == 2)
     {
         int32_t code;
-        uint32_t frequency = 0;
+        int frequency = 0;
 
-        sscanf(args[1].c_str(), "%lu", &frequency);
+        sscanf(args[1].c_str(), "%d", &frequency);
         if ((code = _dot->setTxFrequency(frequency)) != mDot::MDOT_OK)
         {
-            std::string error = mDot::getReturnCodeString(code) + " - " + _dot->getLastError();
-            setErrorMessage(error);
+            
+            setErrorMessage(_dot->getLastError());;
             return 1;
         }
     }
@@ -45,13 +45,13 @@
 
     if (args.size() == 2)
     {
-        uint32_t frequency = ULONG_MAX;
-        if (sscanf(args[1].c_str(), "%lu", &frequency) != 1) {
+        int frequency = ULONG_MAX;
+        if (sscanf(args[1].c_str(), "%d", &frequency) != 1) {
             setErrorMessage("Invalid argument");
             return false;
         }
 
-        if (frequency != 0 && (frequency < _dot->getMinFrequency() || frequency > _dot->getMaxFrequency())) {
+        if (frequency != 0 && (frequency < int(_dot->getMinFrequency()) || frequency > int(_dot->getMaxFrequency()))) {
             if (_dot->getFrequencyBand() == mDot::FB_868)
                 setErrorMessage("Invalid frequency, expects (0,863000000-870000000)"); 
             else