Merge branch 'MTX-2891-mpower-2g-3g-4g' into 'master'

Mtx 2891 mpower 2g 3g 4g

See merge request !2

5 files changed, 18 insertions, 14 deletions

diff --git a/include/mts/MTS_IO_CellularRadio.h b/include/mts/MTS_IO_CellularRadio.h
index eecefee..1e80274 100644
--- a/include/mts/MTS_IO_CellularRadio.h
+++ b/include/mts/MTS_IO_CellularRadio.h
@@ -70,6 +70,7 @@ namespace MTS {
                 CODE getTower(std::string& sTower) override;
                 CODE getTime(std::string& sDate, std::string& sTime, std::string& sTimeZone) override;
                 CODE getRoaming(bool& bRoaming) override;
+                CODE getCellularMode(CELLULAR_MODES &networks) override;
 
                 CODE getSignalStrength(int32_t& iRssi) override;
                 CODE getModemLocation(std::string& sLocation) override;
diff --git a/include/mts/MTS_IO_EG95Radio.h b/include/mts/MTS_IO_EG95Radio.h
index f3021cc..5296e16 100644
--- a/include/mts/MTS_IO_EG95Radio.h
+++ b/include/mts/MTS_IO_EG95Radio.h
@@ -34,12 +34,13 @@ namespace MTS {
 
                 EG95Radio(const std::string& sPort);
                 virtual ~EG95Radio();
-                CODE setRxDiversity(const Json::Value& jArgs);
+                CODE setRxDiversity(const Json::Value& jArgs) override;
 
             protected:
 
             private:
-
+                CODE getSupportedCellularModes(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 e2bf652..57d6f53 100644
--- a/include/mts/MTS_IO_ICellularRadio.h
+++ b/include/mts/MTS_IO_ICellularRadio.h
@@ -60,12 +60,12 @@ namespace MTS {
                     NOT_INSERTED
                 };
 
-                enum RADIO_NETWORK_MODE : uint8_t {
-                    RADIO_NETWORK_MODE_UNKNOWN = 0,
-                    RADIO_NETWORK_MODE_AUTO,
-                    RADIO_NETWORK_MODE_GSM_ONLY,
-                    RADIO_NETWORK_MODE_UMTS_ONLY,
-                    RADIO_NETWORK_MODE_LTE_ONLY
+                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);
@@ -220,6 +220,10 @@ namespace MTS {
                 virtual CODE getImsi(std::string& sImsi) = 0;
                 virtual CODE getSimStatus(std::string& sSimStatus) = 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
                  *        (if there is a SIM card inserted, is it locked, etc).
@@ -281,8 +285,6 @@ namespace MTS {
                  *         or on any other error).
                  */
                 virtual CODE unlockSimCard(const Json::Value& jArgs) = 0;
-                virtual CODE getRadioNetworkMode(RADIO_NETWORK_MODE &mode) = 0;
-                virtual CODE setRadioNetworkMode(RADIO_NETWORK_MODE mode) = 0;
 
                 //! Gather details of the radio's Mobile IP Profile
                 /*!
diff --git a/include/mts/MTS_IO_QuectelRadio.h b/include/mts/MTS_IO_QuectelRadio.h
index 3b1ba5a..df3b5b5 100644
--- a/include/mts/MTS_IO_QuectelRadio.h
+++ b/include/mts/MTS_IO_QuectelRadio.h
@@ -41,8 +41,6 @@ namespace MTS {
                 CODE convertdBmToSignalStrength(const int32_t& dBm, int32_t& iRssi) override;
 
                 CODE setMdn(const Json::Value& jArgs) override;
-                CODE getRadioNetworkMode(RADIO_NETWORK_MODE &mode) override;
-                CODE setRadioNetworkMode(RADIO_NETWORK_MODE mode) 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 6382696..b81cd7d 100644
--- a/include/mts/MTS_IO_TelitRadio.h
+++ b/include/mts/MTS_IO_TelitRadio.h
@@ -39,8 +39,9 @@ namespace MTS {
                 CODE convertdBmToSignalStrength(const int32_t& dBm, int32_t& iRssi) override;
 
                 CODE setMdn(const Json::Value& jArgs) override;
-                CODE getRadioNetworkMode(RADIO_NETWORK_MODE &mode) override;
-                CODE setRadioNetworkMode(RADIO_NETWORK_MODE mode) override;
+
+                CODE getSupportedCellularModes(CELLULAR_MODES &networks) override;
+                CODE setCellularMode(CELLULAR_MODES networks) override;
 
             protected:
                 TelitRadio(const std::string& sName, const std::string& sRadioPort);
@@ -53,6 +54,7 @@ namespace MTS {
 
             private:
                 virtual CODE getSimLockAttempts(int& iAttemptsPin, int& iAttemptsPuk, const std::string& sLockStatus);
+                static ICellularRadio::CELLULAR_MODES preferredNetwork(CELLULAR_MODES prefNetwork, int wds);
 
         };
     }