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

Refactoring after review

8 files changed, 67 insertions, 68 deletions

diff --git a/include/mts/MTS_IO_CellularRadio.h b/include/mts/MTS_IO_CellularRadio.h
index b245c48..7e7454b 100644
--- a/include/mts/MTS_IO_CellularRadio.h
+++ b/include/mts/MTS_IO_CellularRadio.h
@@ -134,8 +134,8 @@ namespace MTS {
                 virtual std::string waitResponse(IsNeedMoreData& isNeedMoreData,
                                                  int32_t timeoutMillis = 100) override;
 
-                CODE setUeModeOfOperation(UE_MODES_OF_OPERATION mode) override;
-                CODE getUeModeOfOperation(UE_MODES_OF_OPERATION& mode) override;
+                CODE setUeModeOfOperation(ICellularRadio::UE_MODES_OF_OPERATION mode) override;
+                CODE getUeModeOfOperation(ICellularRadio::UE_MODES_OF_OPERATION& mode) override;
 
             protected:
 
diff --git a/include/mts/MTS_IO_ICellularRadio.h b/include/mts/MTS_IO_ICellularRadio.h
index 63cedbe..e638e8b 100644
--- a/include/mts/MTS_IO_ICellularRadio.h
+++ b/include/mts/MTS_IO_ICellularRadio.h
@@ -82,8 +82,8 @@ namespace MTS {
                 static CODE convertModelToMtsShortCode(const std::string& sModel, std::string& sCode, ICellularRadio *radioObj = NULL);
                 static CODE convertServiceDomainToString(SERVICEDOMAIN eSd, std::string& sSd);
                 static CODE convertActiveBandToString(ACTIVEBAND eBand, std::string& sBand);
-                static CODE convertUeModeToString(UE_MODES_OF_OPERATION mode, std::string& sMode);
-                static CODE convertStringToUeMode(const std::string& sMode, UE_MODES_OF_OPERATION& mode);
+                static CODE convertUeModeToString(ICellularRadio::UE_MODES_OF_OPERATION mode, std::string& sMode);
+                static CODE convertStringToUeMode(const std::string& sMode, ICellularRadio::UE_MODES_OF_OPERATION& mode);
 
                 static std::string sendCommand(MTS::AutoPtr<MTS::IO::Connection>& apIo,
                                                const std::string& sCmd,
@@ -574,9 +574,8 @@ namespace MTS {
                 virtual std::string waitResponse(IsNeedMoreData& isNeedMoreData,
                                                  int32_t timeoutMillis = 100) = 0;
 
-
-                virtual CODE setUeModeOfOperation(UE_MODES_OF_OPERATION mode) = 0;
-                virtual CODE getUeModeOfOperation(UE_MODES_OF_OPERATION& mode) = 0;
+                virtual CODE setUeModeOfOperation(ICellularRadio::UE_MODES_OF_OPERATION mode) = 0;
+                virtual CODE getUeModeOfOperation(ICellularRadio::UE_MODES_OF_OPERATION& mode) = 0;
         };
     }
 }
diff --git a/include/mts/MTS_IO_LE910Radio.h b/include/mts/MTS_IO_LE910Radio.h
index f64600d..2ba423d 100644
--- a/include/mts/MTS_IO_LE910Radio.h
+++ b/include/mts/MTS_IO_LE910Radio.h
@@ -45,8 +45,8 @@ namespace MTS {
                 CODE setRxDiversity(const Json::Value& jArgs);
                 CODE getModemLocation(std::string& sLocation);
 
-                CODE setUeModeOfOperation(UE_MODES_OF_OPERATION mode) override;
-                CODE getUeModeOfOperation(UE_MODES_OF_OPERATION& mode) override;
+                CODE setUeModeOfOperation(ICellularRadio::UE_MODES_OF_OPERATION mode) override;
+                CODE getUeModeOfOperation(ICellularRadio::UE_MODES_OF_OPERATION& mode) override;
 
             protected:
 
diff --git a/include/mts/MTS_IO_QuectelRadio.h b/include/mts/MTS_IO_QuectelRadio.h
index 04c0ef9..c46b39b 100644
--- a/include/mts/MTS_IO_QuectelRadio.h
+++ b/include/mts/MTS_IO_QuectelRadio.h
@@ -51,8 +51,8 @@ namespace MTS {
                 CODE fumoLocalCleanup() override;
                 CODE fumoLocalApply(UpdateCb& stepCb) override;
 
-                CODE setUeModeOfOperation(UE_MODES_OF_OPERATION mode) override;
-                CODE getUeModeOfOperation(UE_MODES_OF_OPERATION& mode) override;
+                CODE setUeModeOfOperation(ICellularRadio::UE_MODES_OF_OPERATION mode) override;
+                CODE getUeModeOfOperation(ICellularRadio::UE_MODES_OF_OPERATION& mode) override;
 
             protected:
                 enum class UE_USAGE_SETTING : uint8_t {
@@ -73,8 +73,8 @@ namespace MTS {
                 virtual CODE removeFile(const std::string& sTargetFilename);
                 virtual CODE checkFile(bool& bFilePresent, const std::string& sTargetFilename);
 
-                virtual CODE getUeUsageSetting(UE_USAGE_SETTING& us);
-                virtual CODE convertToUeUsageSetting(const std::string& sSetting, UE_USAGE_SETTING& us);
+                virtual CODE getUeUsageSetting(QuectelRadio::UE_USAGE_SETTING& us);
+                virtual CODE convertToUeUsageSetting(const std::string& sSetting, QuectelRadio::UE_USAGE_SETTING& us);
 
             private:
                 // private variable to save old firmware versions during FOTA
diff --git a/src/MTS_IO_CellularRadio.cpp b/src/MTS_IO_CellularRadio.cpp
index 81e3332..c2fcfad 100644
--- a/src/MTS_IO_CellularRadio.cpp
+++ b/src/MTS_IO_CellularRadio.cpp
@@ -1379,13 +1379,13 @@ ICellularRadio::CODE CellularRadio::readChunk(int fd, char* pChunk, size_t dChun
     return rc;
 }
 
-ICellularRadio::CODE CellularRadio::setUeModeOfOperation(UE_MODES_OF_OPERATION mode) {
+ICellularRadio::CODE CellularRadio::setUeModeOfOperation(ICellularRadio::UE_MODES_OF_OPERATION mode) {
     printTrace("%s| Set UE Mode Of Operation: not applicable", m_sName.c_str());
     return NOT_APPLICABLE;
 }
 
-ICellularRadio::CODE CellularRadio::getUeModeOfOperation(UE_MODES_OF_OPERATION& mode) {
+ICellularRadio::CODE CellularRadio::getUeModeOfOperation(ICellularRadio::UE_MODES_OF_OPERATION& mode) {
     printTrace("%s| Get UE Mode Of Operation: not applicable", m_sName.c_str());
-    mode = UE_MODES_OF_OPERATION::UNKNOWN_MODE;
+    mode = ICellularRadio::UE_MODES_OF_OPERATION::UNKNOWN_MODE;
     return NOT_APPLICABLE;
 }
diff --git a/src/MTS_IO_ICellularRadio.cpp b/src/MTS_IO_ICellularRadio.cpp
index 3394b4e..0483dc8 100644
--- a/src/MTS_IO_ICellularRadio.cpp
+++ b/src/MTS_IO_ICellularRadio.cpp
@@ -513,30 +513,30 @@ std::string MTS::IO::ICellularRadio::getCodeAsString(CODE eCode) {
     }
 }
 
-MTS::IO::ICellularRadio::CODE MTS::IO::ICellularRadio::convertUeModeToString(UE_MODES_OF_OPERATION mode, std::string& sMode) {
+MTS::IO::ICellularRadio::CODE MTS::IO::ICellularRadio::convertUeModeToString(ICellularRadio::UE_MODES_OF_OPERATION mode, std::string& sMode) {
     CODE rc;
     switch (mode) {
-        case UE_MODES_OF_OPERATION::PS_MODE1:
+        case ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE1:
             sMode = "ps_1";
             rc = SUCCESS;
             break;
-        case UE_MODES_OF_OPERATION::PS_MODE2:
+        case ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE2:
             sMode = "ps_2";
             rc = SUCCESS;
             break;
-        case UE_MODES_OF_OPERATION::CS_PS_MODE1:
+        case ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE1:
             sMode = "csps_1";
             rc = SUCCESS;
             break;
-        case UE_MODES_OF_OPERATION::CS_PS_MODE2:
+        case ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE2:
             sMode = "csps_2";
             rc = SUCCESS;
             break;
-        case UE_MODES_OF_OPERATION::CS_MODE1:
+        case ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE1:
             sMode = "cs_1";
             rc = SUCCESS;
             break;
-        case UE_MODES_OF_OPERATION::CS_MODE2:
+        case ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE2:
             sMode = "cs_2";
             rc = SUCCESS;
             break;
@@ -548,28 +548,28 @@ MTS::IO::ICellularRadio::CODE MTS::IO::ICellularRadio::convertUeModeToString(UE_
     return rc;
 }
 
-MTS::IO::ICellularRadio::CODE MTS::IO::ICellularRadio::convertStringToUeMode(const std::string& sMode, UE_MODES_OF_OPERATION& mode) {
+MTS::IO::ICellularRadio::CODE MTS::IO::ICellularRadio::convertStringToUeMode(const std::string& sMode, ICellularRadio::UE_MODES_OF_OPERATION& mode) {
     CODE rc;
     if (sMode == "ps_1") {
-        mode = UE_MODES_OF_OPERATION::PS_MODE1;
+        mode = ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE1;
         rc = SUCCESS;
     } else if (sMode == "ps_2") {
-        mode = UE_MODES_OF_OPERATION::PS_MODE2;
+        mode = ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE2;
         rc = SUCCESS;
     } else if (sMode == "csps_1") {
-        mode = UE_MODES_OF_OPERATION::CS_PS_MODE1;
+        mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE1;
         rc = SUCCESS;
     } else if (sMode == "csps_2") {
-        mode = UE_MODES_OF_OPERATION::CS_PS_MODE2;
+        mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE2;
         rc = SUCCESS;
     } else if (sMode == "cs_1") {
-        mode = UE_MODES_OF_OPERATION::CS_MODE1;
+        mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE1;
         rc = SUCCESS;
     } else if (sMode == "cs_2") {
-        mode = UE_MODES_OF_OPERATION::CS_MODE2;
+        mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE2;
         rc = SUCCESS;
     } else {
-        mode = UE_MODES_OF_OPERATION::UNKNOWN_MODE;
+        mode = ICellularRadio::UE_MODES_OF_OPERATION::UNKNOWN_MODE;
         rc = FAILURE;
     }
     return rc;
diff --git a/src/MTS_IO_LE910Radio.cpp b/src/MTS_IO_LE910Radio.cpp
index 74cf5c1..ba03c5e 100644
--- a/src/MTS_IO_LE910Radio.cpp
+++ b/src/MTS_IO_LE910Radio.cpp
@@ -78,22 +78,22 @@ ICellularRadio::CODE LE910Radio::getModemLocation(std::string& sLocation) {
     return SUCCESS;
 }
 
-ICellularRadio::CODE LE910Radio::setUeModeOfOperation(UE_MODES_OF_OPERATION mode) {
+ICellularRadio::CODE LE910Radio::setUeModeOfOperation(ICellularRadio::UE_MODES_OF_OPERATION mode) {
     printTrace("%s| Set UE Mode Of Operation", getName().c_str());
 
     std::string sValue;
 
     switch (mode) {
-        case UE_MODES_OF_OPERATION::PS_MODE1:
+        case ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE1:
             sValue = "3";
             break;
-        case UE_MODES_OF_OPERATION::PS_MODE2:
+        case ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE2:
             sValue = "0";
             break;
-        case UE_MODES_OF_OPERATION::CS_PS_MODE1:
+        case ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE1:
             sValue = "1";
             break;
-        case UE_MODES_OF_OPERATION::CS_PS_MODE2:
+        case ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE2:
             sValue = "2";
             break;
         default:
@@ -107,7 +107,7 @@ ICellularRadio::CODE LE910Radio::setUeModeOfOperation(UE_MODES_OF_OPERATION mode
     return sendBasicCommand(sCommand, dTimeout);
 }
 
-ICellularRadio::CODE LE910Radio::getUeModeOfOperation(UE_MODES_OF_OPERATION& mode) {
+ICellularRadio::CODE LE910Radio::getUeModeOfOperation(ICellularRadio::UE_MODES_OF_OPERATION& mode) {
     printTrace("%s| Get UE Mode Of Operation", getName().c_str());
 
     const std::string sCommand = "AT+CEMODE?";
@@ -141,24 +141,24 @@ ICellularRadio::CODE LE910Radio::getUeModeOfOperation(UE_MODES_OF_OPERATION& mod
     CODE rc;
     switch (uiValue) {
         case 0:
-            mode = UE_MODES_OF_OPERATION::PS_MODE2;
+            mode = ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE2;
             rc = SUCCESS;
             break;
         case 1:
-            mode = UE_MODES_OF_OPERATION::CS_PS_MODE1;
+            mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE1;
             rc = SUCCESS;
             break;
         case 2:
-            mode = UE_MODES_OF_OPERATION::CS_PS_MODE2;
+            mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE2;
             rc = SUCCESS;
             break;
         case 3:
-            mode = UE_MODES_OF_OPERATION::PS_MODE1;
+            mode = ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE1;
             rc = SUCCESS;
             break;
         default:
             printError("%s| Unable to parse CEMODE from response [%s]", getName().c_str(), sResult.c_str());
-            mode = UE_MODES_OF_OPERATION::UNKNOWN_MODE;
+            mode = ICellularRadio::UE_MODES_OF_OPERATION::UNKNOWN_MODE;
             rc = FAILURE;
             break;
     }
diff --git a/src/MTS_IO_QuectelRadio.cpp b/src/MTS_IO_QuectelRadio.cpp
index 7d96627..b6eab80 100644
--- a/src/MTS_IO_QuectelRadio.cpp
+++ b/src/MTS_IO_QuectelRadio.cpp
@@ -1222,33 +1222,33 @@ ICellularRadio::CODE QuectelRadio::abortFileUpload() {
     return sendBasicCommand(CMD_ABORT_UPLOAD, 2000, 0x00);
 }
 
-ICellularRadio::CODE QuectelRadio::setUeModeOfOperation(UE_MODES_OF_OPERATION mode) {
+ICellularRadio::CODE QuectelRadio::setUeModeOfOperation(ICellularRadio::UE_MODES_OF_OPERATION mode) {
     printTrace("%s| Set UE Mode Of Operation", getName().c_str());
 
     std::string sDomain, sPreference;
 
     switch (mode) {
-        case UE_MODES_OF_OPERATION::CS_MODE1:
+        case ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE1:
             sDomain = "0";
             sPreference = "00";
             break;
-        case UE_MODES_OF_OPERATION::CS_MODE2:
+        case ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE2:
             sDomain = "0";
             sPreference = "01";
             break;
-        case UE_MODES_OF_OPERATION::PS_MODE1:
+        case ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE1:
             sDomain = "1";
             sPreference = "00";
             break;
-        case UE_MODES_OF_OPERATION::PS_MODE2:
+        case ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE2:
             sDomain = "1";
             sPreference = "01";
             break;
-        case UE_MODES_OF_OPERATION::CS_PS_MODE1:
+        case ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE1:
             sDomain = "2";
             sPreference = "00";
             break;
-        case UE_MODES_OF_OPERATION::CS_PS_MODE2:
+        case ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE2:
             sDomain = "2";
             sPreference = "01";
             break;
@@ -1278,7 +1278,7 @@ ICellularRadio::CODE QuectelRadio::setUeModeOfOperation(UE_MODES_OF_OPERATION mo
     return SUCCESS;
 }
 
-ICellularRadio::CODE QuectelRadio::getUeUsageSetting(UE_USAGE_SETTING& us) {
+ICellularRadio::CODE QuectelRadio::getUeUsageSetting(QuectelRadio::UE_USAGE_SETTING& us) {
     printTrace("%s| Get UE Usage Setting", getName().c_str());
 
     std::string sCmd("AT+QNVFR=\"/nv/item_files/modem/mmode/ue_usage_setting\"");
@@ -1309,22 +1309,22 @@ ICellularRadio::CODE QuectelRadio::getUeUsageSetting(UE_USAGE_SETTING& us) {
     return SUCCESS;
 }
 
-ICellularRadio::CODE QuectelRadio::convertToUeUsageSetting(const std::string& sSetting, UE_USAGE_SETTING& us) {
+ICellularRadio::CODE QuectelRadio::convertToUeUsageSetting(const std::string& sSetting, QuectelRadio::UE_USAGE_SETTING& us) {
     if (sSetting == "00") {
-        us = UE_USAGE_SETTING::MODE_1;
+        us = QuectelRadio::UE_USAGE_SETTING::MODE_1;
         return SUCCESS;
     }
 
     if (sSetting == "01") {
-        us = UE_USAGE_SETTING::MODE_2;
+        us = QuectelRadio::UE_USAGE_SETTING::MODE_2;
         return SUCCESS;
     }
 
-    us = UE_USAGE_SETTING::UNKNOWN_MODE;
+    us = QuectelRadio::UE_USAGE_SETTING::UNKNOWN_MODE;
     return FAILURE;
 }
 
-ICellularRadio::CODE QuectelRadio::getUeModeOfOperation(UE_MODES_OF_OPERATION& mode) {
+ICellularRadio::CODE QuectelRadio::getUeModeOfOperation(ICellularRadio::UE_MODES_OF_OPERATION& mode) {
     printTrace("%s| Get UE Mode Of Operation", getName().c_str());
 
     SERVICEDOMAIN sd;
@@ -1342,37 +1342,37 @@ ICellularRadio::CODE QuectelRadio::getUeModeOfOperation(UE_MODES_OF_OPERATION& m
 
     printTrace("%s| Retrieved ue_usage_setting [%d]", getName().c_str(), us);
 
-    if (sd == SERVICEDOMAIN::CS_ONLY && us == UE_USAGE_SETTING::MODE_1) {
-        mode = UE_MODES_OF_OPERATION::CS_MODE1;
+    if (sd == ICellularRadio::SERVICEDOMAIN::CS_ONLY && us == QuectelRadio::UE_USAGE_SETTING::MODE_1) {
+        mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE1;
         return SUCCESS;
     }
 
-    if (sd == SERVICEDOMAIN::CS_ONLY && us == UE_USAGE_SETTING::MODE_2) {
-        mode = UE_MODES_OF_OPERATION::CS_MODE2;
+    if (sd == ICellularRadio::SERVICEDOMAIN::CS_ONLY && us == QuectelRadio::UE_USAGE_SETTING::MODE_2) {
+        mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE2;
         return SUCCESS;
     }
 
-    if (sd == SERVICEDOMAIN::PS_ONLY && us == UE_USAGE_SETTING::MODE_1) {
-        mode = UE_MODES_OF_OPERATION::PS_MODE1;
+    if (sd == ICellularRadio::SERVICEDOMAIN::PS_ONLY && us == QuectelRadio::UE_USAGE_SETTING::MODE_1) {
+        mode = ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE1;
         return SUCCESS;
     }
 
-    if (sd == SERVICEDOMAIN::PS_ONLY && us == UE_USAGE_SETTING::MODE_2) {
-        mode = UE_MODES_OF_OPERATION::PS_MODE2;
+    if (sd == ICellularRadio::SERVICEDOMAIN::PS_ONLY && us == QuectelRadio::UE_USAGE_SETTING::MODE_2) {
+        mode = ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE2;
         return SUCCESS;
     }
 
-    if (sd == SERVICEDOMAIN::CSPS && us == UE_USAGE_SETTING::MODE_1) {
-        mode = UE_MODES_OF_OPERATION::CS_PS_MODE1;
+    if (sd == ICellularRadio::SERVICEDOMAIN::CSPS && us == QuectelRadio::UE_USAGE_SETTING::MODE_1) {
+        mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE1;
         return SUCCESS;
     }
 
-    if (sd == SERVICEDOMAIN::CSPS && us == UE_USAGE_SETTING::MODE_2) {
-        mode = UE_MODES_OF_OPERATION::CS_PS_MODE2;
+    if (sd == ICellularRadio::SERVICEDOMAIN::CSPS && us == QuectelRadio::UE_USAGE_SETTING::MODE_2) {
+        mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE2;
         return SUCCESS;
     }
 
     printError("%s| Unknown combination of servicedomain [%d] and ue_usage_setting [%d]", getName().c_str(), sd, us);
-    mode = UE_MODES_OF_OPERATION::UNKNOWN_MODE;
+    mode = ICellularRadio::UE_MODES_OF_OPERATION::UNKNOWN_MODE;
     return FAILURE;
 }