[MTX-3998] mPower R. Apr 2021: +CEMODE shall be set to CEMODE=2 - Quectel - GP-1111

Refactoring common functions, telit and quectel functions related to CEMODE switching

1 files changed, 36 insertions, 37 deletions

diff --git a/src/MTS_IO_ICellularRadio.cpp b/src/MTS_IO_ICellularRadio.cpp
index 1fbad0c..3394b4e 100644
--- a/src/MTS_IO_ICellularRadio.cpp
+++ b/src/MTS_IO_ICellularRadio.cpp
@@ -513,65 +513,64 @@ std::string MTS::IO::ICellularRadio::getCodeAsString(CODE eCode) {
     }
 }
 
-MTS::IO::ICellularRadio::CODE MTS::IO::ICellularRadio::convertUeModeToString(MTS::IO::ICellularRadio::UE_MODES_OF_OPERATION mode, std::string &string) {
+MTS::IO::ICellularRadio::CODE MTS::IO::ICellularRadio::convertUeModeToString(UE_MODES_OF_OPERATION mode, std::string& sMode) {
     CODE rc;
     switch (mode) {
-        case ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE1:
-            string = "ps_1";
-            rc = CODE::SUCCESS;
+        case UE_MODES_OF_OPERATION::PS_MODE1:
+            sMode = "ps_1";
+            rc = SUCCESS;
             break;
-        case ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE2:
-            string = "ps_2";
-            rc = CODE::SUCCESS;
+        case UE_MODES_OF_OPERATION::PS_MODE2:
+            sMode = "ps_2";
+            rc = SUCCESS;
             break;
-        case ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE1:
-            string = "csps_1";
-            rc = CODE::SUCCESS;
+        case UE_MODES_OF_OPERATION::CS_PS_MODE1:
+            sMode = "csps_1";
+            rc = SUCCESS;
             break;
-        case ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE2:
-            string = "csps_2";
-            rc = CODE::SUCCESS;
+        case UE_MODES_OF_OPERATION::CS_PS_MODE2:
+            sMode = "csps_2";
+            rc = SUCCESS;
             break;
-        case ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE1:
-            string = "cs_1";
-            rc = CODE::SUCCESS;
+        case UE_MODES_OF_OPERATION::CS_MODE1:
+            sMode = "cs_1";
+            rc = SUCCESS;
             break;
-        case ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE2:
-            string = "cs_2";
-            rc = CODE::SUCCESS;
+        case UE_MODES_OF_OPERATION::CS_MODE2:
+            sMode = "cs_2";
+            rc = SUCCESS;
             break;
         default:
-            string = MTS::IO::ICellularRadio::VALUE_UNKNOWN;
-            rc = CODE::FAILURE;
+            sMode = ICellularRadio::VALUE_UNKNOWN;
+            rc = FAILURE;
             break;
     }
     return rc;
 }
 
-MTS::IO::ICellularRadio::CODE MTS::IO::ICellularRadio::convertStringToUeMode(const std::string &sMode, UE_MODES_OF_OPERATION& mode) {
-    using namespace MTS::IO;
+MTS::IO::ICellularRadio::CODE MTS::IO::ICellularRadio::convertStringToUeMode(const std::string& sMode, UE_MODES_OF_OPERATION& mode) {
     CODE rc;
     if (sMode == "ps_1") {
-        mode = ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE1;
-        rc = CODE::SUCCESS;
+        mode = UE_MODES_OF_OPERATION::PS_MODE1;
+        rc = SUCCESS;
     } else if (sMode == "ps_2") {
-        mode = ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE2;
-        rc = CODE::SUCCESS;
+        mode = UE_MODES_OF_OPERATION::PS_MODE2;
+        rc = SUCCESS;
     } else if (sMode == "csps_1") {
-        mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE1;
-        rc = CODE::SUCCESS;
+        mode = UE_MODES_OF_OPERATION::CS_PS_MODE1;
+        rc = SUCCESS;
     } else if (sMode == "csps_2") {
-        mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE2;
-        rc = CODE::SUCCESS;
+        mode = UE_MODES_OF_OPERATION::CS_PS_MODE2;
+        rc = SUCCESS;
     } else if (sMode == "cs_1") {
-        mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE1;
-        rc = CODE::SUCCESS;
+        mode = UE_MODES_OF_OPERATION::CS_MODE1;
+        rc = SUCCESS;
     } else if (sMode == "cs_2") {
-        mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE2;
-        rc = CODE::SUCCESS;
+        mode = UE_MODES_OF_OPERATION::CS_MODE2;
+        rc = SUCCESS;
     } else {
-        mode = ICellularRadio::UNKNOWN_MODE;
-        rc = CODE::FAILURE;
+        mode = UE_MODES_OF_OPERATION::UNKNOWN_MODE;
+        rc = FAILURE;
     }
     return rc;
 }