Merge branch 'ad/MTX-4190/modbus_slave_feature' into 'master' 1.3

[GP-862] mPower R.6.0: Update MODBUS slave feature to support Quectel and newer Telit radios. - MTX-4190

See merge request !15

1 files changed, 7 insertions, 7 deletions

diff --git a/main.cpp b/main.cpp
index f7e919f..f2cc086 100644
--- a/main.cpp
+++ b/main.cpp
@@ -97,7 +97,7 @@ const uint32_t OPT_SUMMARY_STATIC      = 0x01000000;
 const uint32_t OPT_SUMMARY_NETWORK     = 0x02000000;
 const uint32_t OPT_CELL_MODE           = 0x04000000;
 const uint32_t OPT_SUPPORTED_CELL_MODE = 0x08000000;
-const uint32_t OPT_SELECTED_BANDS      = 0x20000000;
+const uint32_t OPT_SELECTED_BANDS_RAW  = 0x20000000;
 
 int32_t g_iAuxOptions = 0;
 const uint32_t AOPT_VOICE_SUPPORT      = 0x00000001;
@@ -370,11 +370,11 @@ int main(int argc, char** argv) {
         if (result == ICellularRadio::SUCCESS) {
             printf("%s", toCompactStyledString(jValue).c_str());
         }
-    } else if (g_iOptions & OPT_SELECTED_BANDS) {
-        Json::Value jValue;
-        result = g_apRadio->getSelectedBands(jValue);
+    } else if (g_iOptions & OPT_SELECTED_BANDS_RAW) {
+        std::string sResult;
+        result = g_apRadio->getSelectedBandsRaw(sResult);
         if (result == ICellularRadio::SUCCESS) {
-            printf("%s", toCompactStyledString(jValue).c_str());
+            printf("%s", sResult.c_str());
         }
     }
 
@@ -669,7 +669,7 @@ void parseOptions(int argc, char** argv) {
               { "ue-mode-of-operation", no_argument,&iOption, OPT_UE_MODE_OF_OPERATION },
               { "sim-mcc-mnc",  no_argument,        &iOption, OPT_SIM_MCC_MNC },
               { "voice-support",no_argument,        &iAuxOption, AOPT_VOICE_SUPPORT },
-              { "selected-bands", no_argument,      &iOption, OPT_SELECTED_BANDS },
+              { "selected-bands-raw", no_argument,  &iOption, OPT_SELECTED_BANDS_RAW },
               { 0, 0, 0, 0 } };
 
         /* getopt_long stores the option index here. */
@@ -784,7 +784,7 @@ void printHelp(const std::string& sApp) {
     printf("\t--ue-mode-of-operation\n");
     printf("\t--sim-mcc-mnc\n");
     printf("\t--voice-support\n");
-    printf("\t--selected-bands\n");
+    printf("\t--selected-bands-raw\n");
     // Applicable for LTE910-NA1 dual FW images only
     // printf("\t--active-firmware\n");
     printf("\n");