MTX-2891 mpower 2-3-4g switch refactoring: method names

7 files changed, 25 insertions, 25 deletions

diff --git a/include/mts/MTS_IO_EG95Radio.h b/include/mts/MTS_IO_EG95Radio.h
index f3021cc..6077ed1 100644
--- a/include/mts/MTS_IO_EG95Radio.h
+++ b/include/mts/MTS_IO_EG95Radio.h
@@ -39,7 +39,9 @@ namespace MTS {
             protected:
 
             private:
-
+                CODE getSupportedCellularModes(PREFERRED_NETWORKS &networks) override;
+                CODE getCellularMode(PREFERRED_NETWORKS &networks) override;
+                CODE setCellularMode(PREFERRED_NETWORKS networks) override;
         };
     }
 }
diff --git a/include/mts/MTS_IO_ICellularRadio.h b/include/mts/MTS_IO_ICellularRadio.h
index 29f710a..c6dae6c 100644
--- a/include/mts/MTS_IO_ICellularRadio.h
+++ b/include/mts/MTS_IO_ICellularRadio.h
@@ -228,9 +228,9 @@ namespace MTS {
                 virtual CODE getImsi(std::string& sImsi) = 0;
                 virtual CODE getSimStatus(std::string& sSimStatus) = 0;
 
-                virtual CODE getAvailablePreferredNetworks(PREFERRED_NETWORKS &networks) = 0;
-                virtual CODE getPreferredNetworks(PREFERRED_NETWORKS &networks) = 0;
-                virtual CODE setPreferredNetworks(PREFERRED_NETWORKS networks) = 0;
+                virtual CODE getSupportedCellularModes(PREFERRED_NETWORKS &networks) = 0;
+                virtual CODE getCellularMode(PREFERRED_NETWORKS &networks) = 0;
+                virtual CODE setCellularMode(PREFERRED_NETWORKS networks) = 0;
 
                 /**
                  * @brief getSimStatusSummary - get summary on the SIM card status
diff --git a/include/mts/MTS_IO_QuectelRadio.h b/include/mts/MTS_IO_QuectelRadio.h
index 8b8b92a..3b1ba5a 100644
--- a/include/mts/MTS_IO_QuectelRadio.h
+++ b/include/mts/MTS_IO_QuectelRadio.h
@@ -44,10 +44,6 @@ namespace MTS {
                 CODE getRadioNetworkMode(RADIO_NETWORK_MODE &mode) override;
                 CODE setRadioNetworkMode(RADIO_NETWORK_MODE mode) override;
 
-                CODE getAvailablePreferredNetworks(PREFERRED_NETWORKS &networks) override;
-                CODE getPreferredNetworks(PREFERRED_NETWORKS &networks) override;
-                CODE setPreferredNetworks(PREFERRED_NETWORKS networks) override;
-
             protected:
                 QuectelRadio(const std::string& sName, const std::string& sRadioPort);
 
diff --git a/include/mts/MTS_IO_TelitRadio.h b/include/mts/MTS_IO_TelitRadio.h
index 7b04125..f6ce53e 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 getAvailablePreferredNetworks(PREFERRED_NETWORKS &networks) override;
-                CODE getPreferredNetworks(PREFERRED_NETWORKS &networks) override;
-                CODE setPreferredNetworks(PREFERRED_NETWORKS networks) override;
+                CODE getSupportedCellularModes(PREFERRED_NETWORKS &networks) override;
+                CODE getCellularMode(PREFERRED_NETWORKS &networks) override;
+                CODE setCellularMode(PREFERRED_NETWORKS networks) override;
 
             protected:
                 TelitRadio(const std::string& sName, const std::string& sRadioPort);
diff --git a/src/MTS_IO_EG95Radio.cpp b/src/MTS_IO_EG95Radio.cpp
index 5c9ed69..f85b2c3 100644
--- a/src/MTS_IO_EG95Radio.cpp
+++ b/src/MTS_IO_EG95Radio.cpp
@@ -45,3 +45,16 @@ 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);
+    return SUCCESS;
+}
+
+ICellularRadio::CODE EG95Radio::getCellularMode(PREFERRED_NETWORKS &networks) {
+    return FAILURE;
+}
+
+ICellularRadio::CODE EG95Radio::setCellularMode(PREFERRED_NETWORKS networks) {
+    return SUCCESS;
+}
diff --git a/src/MTS_IO_QuectelRadio.cpp b/src/MTS_IO_QuectelRadio.cpp
index aaf30e4..4c65382 100644
--- a/src/MTS_IO_QuectelRadio.cpp
+++ b/src/MTS_IO_QuectelRadio.cpp
@@ -610,14 +610,3 @@ ICellularRadio::CODE QuectelRadio::setRadioNetworkMode(RADIO_NETWORK_MODE mode)
     return SUCCESS;
 }
 
-ICellularRadio::CODE QuectelRadio::getAvailablePreferredNetworks(PREFERRED_NETWORKS &networks) {
-    return SUCCESS;
-}
-
-ICellularRadio::CODE QuectelRadio::getPreferredNetworks(PREFERRED_NETWORKS &networks) {
-    return SUCCESS;
-}
-
-ICellularRadio::CODE QuectelRadio::setPreferredNetworks(PREFERRED_NETWORKS networks) {
-    return SUCCESS;
-}
diff --git a/src/MTS_IO_TelitRadio.cpp b/src/MTS_IO_TelitRadio.cpp
index 2750b98..12776f8 100644
--- a/src/MTS_IO_TelitRadio.cpp
+++ b/src/MTS_IO_TelitRadio.cpp
@@ -666,7 +666,7 @@ ICellularRadio::CODE TelitRadio::getSimLockAttempts(int& iAttemptsPin, int& iAtt
     return SUCCESS;
 }
 
-ICellularRadio::CODE TelitRadio::getAvailablePreferredNetworks(PREFERRED_NETWORKS &networks) {
+ICellularRadio::CODE TelitRadio::getSupportedCellularModes(PREFERRED_NETWORKS &networks) {
     networks = PREFERRED_NETWORK_NA;
     std::string sCmd("AT+WS46=?");
     std::string cmdResult = sendCommand(sCmd);
@@ -719,7 +719,7 @@ ICellularRadio::CODE TelitRadio::getAvailablePreferredNetworks(PREFERRED_NETWORK
     return SUCCESS;
 }
 
-ICellularRadio::CODE TelitRadio::getPreferredNetworks(PREFERRED_NETWORKS &networks) {
+ICellularRadio::CODE TelitRadio::getCellularMode(PREFERRED_NETWORKS &networks) {
     networks = PREFERRED_NETWORK_NA;
     std::string sCmd("AT+WS46?");
     std::string cmdResult = sendCommand(sCmd);
@@ -736,7 +736,7 @@ ICellularRadio::CODE TelitRadio::getPreferredNetworks(PREFERRED_NETWORKS &networ
     return FAILURE;
 }
 
-ICellularRadio::CODE TelitRadio::setPreferredNetworks(PREFERRED_NETWORKS networks) {
+ICellularRadio::CODE TelitRadio::setCellularMode(PREFERRED_NETWORKS networks) {
     int wds = 0;
     // 3GPP TS 27.007
     // https://portal.3gpp.org/desktopmodules/Specifications/SpecificationDetails.aspx?specificationId=1515