MTX-2891 mpower 2-3-4g switch refactoring: enums

5 files changed, 57 insertions, 57 deletions

diff --git a/include/mts/MTS_IO_EG95Radio.h b/include/mts/MTS_IO_EG95Radio.h
index 6077ed1..620a333 100644
--- a/include/mts/MTS_IO_EG95Radio.h
+++ b/include/mts/MTS_IO_EG95Radio.h
@@ -39,9 +39,9 @@ namespace MTS {
             protected:
 
             private:
-                CODE getSupportedCellularModes(PREFERRED_NETWORKS &networks) override;
-                CODE getCellularMode(PREFERRED_NETWORKS &networks) override;
-                CODE setCellularMode(PREFERRED_NETWORKS networks) override;
+                CODE getSupportedCellularModes(CELLULAR_MODES &networks) override;
+                CODE getCellularMode(CELLULAR_MODES &networks) override;
+                CODE setCellularMode(CELLULAR_MODES networks) override;
         };
     }
 }
diff --git a/include/mts/MTS_IO_ICellularRadio.h b/include/mts/MTS_IO_ICellularRadio.h
index c6dae6c..ce1a91e 100644
--- a/include/mts/MTS_IO_ICellularRadio.h
+++ b/include/mts/MTS_IO_ICellularRadio.h
@@ -68,12 +68,12 @@ namespace MTS {
                     RADIO_NETWORK_MODE_LTE_ONLY
                 };
 
-                enum PREFERRED_NETWORKS : uint8_t {
-                    PREFERRED_NETWORK_NA = 0, // NOT AVAILABLE
-                    PREFERRED_NETWORK_2G = 1 << 0, // GSM
-                    PREFERRED_NETWORK_3G = 1 << 1, // WCDMA
-                    PREFERRED_NETWORK_4G = 1 << 2, // LTE
-                    PREFERRED_NETWORK_5G = 1 << 3  // 5G
+                enum CELLULAR_MODES : uint8_t {
+                    CELLULAR_MODE_NA = 0, // NOT AVAILABLE
+                    CELLULAR_MODE_2G = 1 << 0, // GSM
+                    CELLULAR_MODE_3G = 1 << 1, // WCDMA
+                    CELLULAR_MODE_4G = 1 << 2, // LTE
+                    CELLULAR_MODE_5G = 1 << 3  // 5G
                 };
 
                 static CODE convertModelToType(const std::string& sModel, std::string& sType);
@@ -228,9 +228,9 @@ namespace MTS {
                 virtual CODE getImsi(std::string& sImsi) = 0;
                 virtual CODE getSimStatus(std::string& sSimStatus) = 0;
 
-                virtual CODE getSupportedCellularModes(PREFERRED_NETWORKS &networks) = 0;
-                virtual CODE getCellularMode(PREFERRED_NETWORKS &networks) = 0;
-                virtual CODE setCellularMode(PREFERRED_NETWORKS networks) = 0;
+                virtual CODE getSupportedCellularModes(CELLULAR_MODES &networks) = 0;
+                virtual CODE getCellularMode(CELLULAR_MODES &networks) = 0;
+                virtual CODE setCellularMode(CELLULAR_MODES networks) = 0;
 
                 /**
                  * @brief getSimStatusSummary - get summary on the SIM card status
diff --git a/include/mts/MTS_IO_TelitRadio.h b/include/mts/MTS_IO_TelitRadio.h
index f6ce53e..fc041cf 100644
--- a/include/mts/MTS_IO_TelitRadio.h
+++ b/include/mts/MTS_IO_TelitRadio.h
@@ -42,9 +42,9 @@ namespace MTS {
                 CODE getRadioNetworkMode(RADIO_NETWORK_MODE &mode) override;
                 CODE setRadioNetworkMode(RADIO_NETWORK_MODE mode) override;
 
-                CODE getSupportedCellularModes(PREFERRED_NETWORKS &networks) override;
-                CODE getCellularMode(PREFERRED_NETWORKS &networks) override;
-                CODE setCellularMode(PREFERRED_NETWORKS networks) override;
+                CODE getSupportedCellularModes(CELLULAR_MODES &networks) override;
+                CODE getCellularMode(CELLULAR_MODES &networks) override;
+                CODE setCellularMode(CELLULAR_MODES networks) override;
 
             protected:
                 TelitRadio(const std::string& sName, const std::string& sRadioPort);
@@ -57,7 +57,7 @@ namespace MTS {
 
             private:
                 virtual CODE getSimLockAttempts(int& iAttemptsPin, int& iAttemptsPuk, const std::string& sLockStatus);
-                static ICellularRadio::PREFERRED_NETWORKS preferredNetwork(PREFERRED_NETWORKS prefNetwork, int wds);
+                static ICellularRadio::CELLULAR_MODES preferredNetwork(CELLULAR_MODES prefNetwork, int wds);
 
         };
     }
diff --git a/src/MTS_IO_EG95Radio.cpp b/src/MTS_IO_EG95Radio.cpp
index f85b2c3..88f5724 100644
--- a/src/MTS_IO_EG95Radio.cpp
+++ b/src/MTS_IO_EG95Radio.cpp
@@ -46,15 +46,15 @@ ICellularRadio::CODE EG95Radio::setRxDiversity(const Json::Value& jArgs) {
     return sendBasicCommand(sCmd);
 }
 
-ICellularRadio::CODE EG95Radio::getSupportedCellularModes(PREFERRED_NETWORKS &networks) {
-    networks = static_cast<PREFERRED_NETWORKS>(PREFERRED_NETWORK_2G | PREFERRED_NETWORK_3G | PREFERRED_NETWORK_4G);
+ICellularRadio::CODE EG95Radio::getSupportedCellularModes(CELLULAR_MODES &networks) {
+    networks = static_cast<CELLULAR_MODES>(CELLULAR_MODE_2G | CELLULAR_MODE_3G | CELLULAR_MODE_4G);
     return SUCCESS;
 }
 
-ICellularRadio::CODE EG95Radio::getCellularMode(PREFERRED_NETWORKS &networks) {
+ICellularRadio::CODE EG95Radio::getCellularMode(CELLULAR_MODES &networks) {
     return FAILURE;
 }
 
-ICellularRadio::CODE EG95Radio::setCellularMode(PREFERRED_NETWORKS networks) {
+ICellularRadio::CODE EG95Radio::setCellularMode(CELLULAR_MODES networks) {
     return SUCCESS;
 }
diff --git a/src/MTS_IO_TelitRadio.cpp b/src/MTS_IO_TelitRadio.cpp
index 12776f8..b20d776 100644
--- a/src/MTS_IO_TelitRadio.cpp
+++ b/src/MTS_IO_TelitRadio.cpp
@@ -666,8 +666,8 @@ ICellularRadio::CODE TelitRadio::getSimLockAttempts(int& iAttemptsPin, int& iAtt
     return SUCCESS;
 }
 
-ICellularRadio::CODE TelitRadio::getSupportedCellularModes(PREFERRED_NETWORKS &networks) {
-    networks = PREFERRED_NETWORK_NA;
+ICellularRadio::CODE TelitRadio::getSupportedCellularModes(CELLULAR_MODES &networks) {
+    networks = CELLULAR_MODE_NA;
     std::string sCmd("AT+WS46=?");
     std::string cmdResult = sendCommand(sCmd);
     if (cmdResult.find("+WS46:") == std::string::npos) {
@@ -719,8 +719,8 @@ ICellularRadio::CODE TelitRadio::getSupportedCellularModes(PREFERRED_NETWORKS &n
     return SUCCESS;
 }
 
-ICellularRadio::CODE TelitRadio::getCellularMode(PREFERRED_NETWORKS &networks) {
-    networks = PREFERRED_NETWORK_NA;
+ICellularRadio::CODE TelitRadio::getCellularMode(CELLULAR_MODES &networks) {
+    networks = CELLULAR_MODE_NA;
     std::string sCmd("AT+WS46?");
     std::string cmdResult = sendCommand(sCmd);
     if (cmdResult.find("+WS46:") == std::string::npos) {
@@ -736,26 +736,26 @@ ICellularRadio::CODE TelitRadio::getCellularMode(PREFERRED_NETWORKS &networks) {
     return FAILURE;
 }
 
-ICellularRadio::CODE TelitRadio::setCellularMode(PREFERRED_NETWORKS networks) {
+ICellularRadio::CODE TelitRadio::setCellularMode(CELLULAR_MODES networks) {
     int wds = 0;
     // 3GPP TS 27.007
     // https://portal.3gpp.org/desktopmodules/Specifications/SpecificationDetails.aspx?specificationId=1515
     switch (static_cast<int>(networks)) {
-    case PREFERRED_NETWORK_2G                                                                     : wds = 12; break;
-	case                        PREFERRED_NETWORK_3G                                              : wds = 22; break;
-	case PREFERRED_NETWORK_2G | PREFERRED_NETWORK_3G | PREFERRED_NETWORK_4G                       : wds = 25; break;
-	case                                               PREFERRED_NETWORK_4G                       : wds = 28; break;
-	case PREFERRED_NETWORK_2G | PREFERRED_NETWORK_3G                                              : wds = 29; break;
-	case PREFERRED_NETWORK_2G |                        PREFERRED_NETWORK_4G                       : wds = 30; break;
-	case                        PREFERRED_NETWORK_3G | PREFERRED_NETWORK_4G                       : wds = 31; break;
-    case PREFERRED_NETWORK_2G | PREFERRED_NETWORK_3G | PREFERRED_NETWORK_4G | PREFERRED_NETWORK_5G: wds = 35; break;
-    case                                                                      PREFERRED_NETWORK_5G: wds = 36; break;
-    case                                               PREFERRED_NETWORK_4G | PREFERRED_NETWORK_5G: wds = 37; break;
-    case                        PREFERRED_NETWORK_3G | PREFERRED_NETWORK_4G | PREFERRED_NETWORK_5G: wds = 38; break;
-    case PREFERRED_NETWORK_2G                        | PREFERRED_NETWORK_4G | PREFERRED_NETWORK_5G: wds = 39; break;
-    case                        PREFERRED_NETWORK_3G                        | PREFERRED_NETWORK_5G: wds = 40; break;
-    case PREFERRED_NETWORK_2G | PREFERRED_NETWORK_3G                        | PREFERRED_NETWORK_5G: wds = 41; break;
-    case PREFERRED_NETWORK_2G                                               | PREFERRED_NETWORK_5G: wds = 42; break;
+    case CELLULAR_MODE_2G                                                         : wds = 12; break;
+	case                    CELLULAR_MODE_3G                                      : wds = 22; break;
+	case CELLULAR_MODE_2G | CELLULAR_MODE_3G | CELLULAR_MODE_4G                   : wds = 25; break;
+	case                                       CELLULAR_MODE_4G                   : wds = 28; break;
+	case CELLULAR_MODE_2G | CELLULAR_MODE_3G                                      : wds = 29; break;
+	case CELLULAR_MODE_2G |                    CELLULAR_MODE_4G                   : wds = 30; break;
+	case                    CELLULAR_MODE_3G | CELLULAR_MODE_4G                   : wds = 31; break;
+    case CELLULAR_MODE_2G | CELLULAR_MODE_3G | CELLULAR_MODE_4G | CELLULAR_MODE_5G: wds = 35; break;
+    case                                                          CELLULAR_MODE_5G: wds = 36; break;
+    case                                       CELLULAR_MODE_4G | CELLULAR_MODE_5G: wds = 37; break;
+    case                    CELLULAR_MODE_3G | CELLULAR_MODE_4G | CELLULAR_MODE_5G: wds = 38; break;
+    case CELLULAR_MODE_2G                    | CELLULAR_MODE_4G | CELLULAR_MODE_5G: wds = 39; break;
+    case                    CELLULAR_MODE_3G                    | CELLULAR_MODE_5G: wds = 40; break;
+    case CELLULAR_MODE_2G | CELLULAR_MODE_3G                    | CELLULAR_MODE_5G: wds = 41; break;
+    case CELLULAR_MODE_2G                                       | CELLULAR_MODE_5G: wds = 42; break;
     }
     std::string sCmd("AT+WS46=");
     sCmd += std::to_string(wds);
@@ -767,30 +767,30 @@ ICellularRadio::CODE TelitRadio::setCellularMode(PREFERRED_NETWORKS networks) {
     return SUCCESS;
 }
 
-ICellularRadio::PREFERRED_NETWORKS TelitRadio::preferredNetwork(PREFERRED_NETWORKS prefNetwork, int wds)
+ICellularRadio::CELLULAR_MODES TelitRadio::preferredNetwork(CELLULAR_MODES prefNetwork, int wds)
 {
 	int result = prefNetwork;
     // 3GPP TS 27.007
     // https://portal.3gpp.org/desktopmodules/Specifications/SpecificationDetails.aspx?specificationId=1515
 	switch (wds) {
-	case 12: result |= PREFERRED_NETWORK_2G;                                                                      break;
-	case 22: result |=                        PREFERRED_NETWORK_3G;                                               break;
-	case 25: result |= PREFERRED_NETWORK_2G | PREFERRED_NETWORK_3G | PREFERRED_NETWORK_4G;                        break;
-	case 28: result |=                                               PREFERRED_NETWORK_4G;                        break;
-	case 29: result |= PREFERRED_NETWORK_2G | PREFERRED_NETWORK_3G;                                               break;
-	case 30: result |= PREFERRED_NETWORK_2G |                        PREFERRED_NETWORK_4G;                        break;
-	case 31: result |=                        PREFERRED_NETWORK_3G | PREFERRED_NETWORK_4G;                        break;
-    case 35: result |= PREFERRED_NETWORK_2G | PREFERRED_NETWORK_3G | PREFERRED_NETWORK_4G | PREFERRED_NETWORK_5G; break;
-    case 36: result |=                                                                      PREFERRED_NETWORK_5G; break;
-    case 37: result |=                                               PREFERRED_NETWORK_4G | PREFERRED_NETWORK_5G; break;
-    case 38: result |=                        PREFERRED_NETWORK_3G | PREFERRED_NETWORK_4G | PREFERRED_NETWORK_5G; break;
-    case 39: result |= PREFERRED_NETWORK_2G                        | PREFERRED_NETWORK_4G | PREFERRED_NETWORK_5G; break;
-    case 40: result |=                        PREFERRED_NETWORK_3G                        | PREFERRED_NETWORK_5G; break;
-    case 41: result |= PREFERRED_NETWORK_2G | PREFERRED_NETWORK_3G                        | PREFERRED_NETWORK_5G; break;
-    case 42: result |= PREFERRED_NETWORK_2G                                               | PREFERRED_NETWORK_5G; break;
+	case 12: result |= CELLULAR_MODE_2G;                                                                      break;
+	case 22: result |=                    CELLULAR_MODE_3G;                                               break;
+	case 25: result |= CELLULAR_MODE_2G | CELLULAR_MODE_3G | CELLULAR_MODE_4G;                    break;
+	case 28: result |=                                       CELLULAR_MODE_4G;                    break;
+	case 29: result |= CELLULAR_MODE_2G | CELLULAR_MODE_3G;                                       break;
+	case 30: result |= CELLULAR_MODE_2G |                    CELLULAR_MODE_4G;                    break;
+	case 31: result |=                    CELLULAR_MODE_3G | CELLULAR_MODE_4G;                    break;
+    case 35: result |= CELLULAR_MODE_2G | CELLULAR_MODE_3G | CELLULAR_MODE_4G | CELLULAR_MODE_5G; break;
+    case 36: result |=                                                          CELLULAR_MODE_5G; break;
+    case 37: result |=                                       CELLULAR_MODE_4G | CELLULAR_MODE_5G; break;
+    case 38: result |=                    CELLULAR_MODE_3G | CELLULAR_MODE_4G | CELLULAR_MODE_5G; break;
+    case 39: result |= CELLULAR_MODE_2G                    | CELLULAR_MODE_4G | CELLULAR_MODE_5G; break;
+    case 40: result |=                    CELLULAR_MODE_3G                    | CELLULAR_MODE_5G; break;
+    case 41: result |= CELLULAR_MODE_2G | CELLULAR_MODE_3G                    | CELLULAR_MODE_5G; break;
+    case 42: result |= CELLULAR_MODE_2G                                       | CELLULAR_MODE_5G; break;
 	default:
 		printDebug("AT+WS46: unhandled network mode: %d", wds);
 		break;
 	}
-	return static_cast<PREFERRED_NETWORKS>(result);
+	return static_cast<CELLULAR_MODES>(result);
 }