Merge branch 'ms/MTX-3998_quectel_set_cemode_2' into 'master' 1.0.25

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

See merge request !38

1 files changed, 10 insertions, 9 deletions

diff --git a/include/mts/MTS_IO_ICellularRadio.h b/include/mts/MTS_IO_ICellularRadio.h
index e8ae891..e638e8b 100644
--- a/include/mts/MTS_IO_ICellularRadio.h
+++ b/include/mts/MTS_IO_ICellularRadio.h
@@ -70,18 +70,20 @@ namespace MTS {
 
                 enum UE_MODES_OF_OPERATION : uint8_t {
                     UNKNOWN_MODE = 0, // current mode of operation is not available
-                    PS_MODE1, // only EPS (LTE) services are allowed, the usage is “voice centric”
-                    PS_MODE2, // only EPS (LTE) services are allowed, the usage is “data centric”
-                    CS_PS_MODE1, // both EPS and non-EPS services are allowed, the usage is “voice centric”
-                    CS_PS_MODE2 // both EPS and non-EPS services are allowed, the usage is “data centric”
+                    PS_MODE1, // only EPS (LTE) services are allowed, the usage is "voice centric"
+                    PS_MODE2, // only EPS (LTE) services are allowed, the usage is "data centric"
+                    CS_PS_MODE1, // both EPS and non-EPS services are allowed, the usage is "voice centric"
+                    CS_PS_MODE2, // both EPS and non-EPS services are allowed, the usage is "data centric"
+                    CS_MODE1, // only non-EPS services are allowed, the usage is "voice centric"
+                    CS_MODE2 // only non-EPS services are allowed, the usage is "data centric"
                 };
 
                 static CODE convertModelToType(const std::string& sModel, std::string& sType);
                 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& string);
-                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,
@@ -572,9 +574,8 @@ namespace MTS {
                 virtual std::string waitResponse(IsNeedMoreData& isNeedMoreData,
                                                  int32_t timeoutMillis = 100) = 0;
 
-
-                virtual CODE setUeModeOfOperation(UE_MODES_OF_OPERATION newmode) = 0;
-                virtual CODE getUeModeOfOperation(UE_MODES_OF_OPERATION& newmode) = 0;
+                virtual CODE setUeModeOfOperation(ICellularRadio::UE_MODES_OF_OPERATION mode) = 0;
+                virtual CODE getUeModeOfOperation(ICellularRadio::UE_MODES_OF_OPERATION& mode) = 0;
         };
     }
 }