From 59bd86588878af7e3f541902e8f2ed3d125dde81 Mon Sep 17 00:00:00 2001 From: Maksym Telychko Date: Thu, 25 Jul 2019 17:57:07 +0300 Subject: MTX-2891 mpower: 2-3-4g switch implementation for Telit --- include/mts/MTS_IO_ICellularRadio.h | 12 ++++++++++++ include/mts/MTS_IO_QuectelRadio.h | 4 ++++ include/mts/MTS_IO_TelitRadio.h | 5 +++++ 3 files changed, 21 insertions(+) (limited to 'include') diff --git a/include/mts/MTS_IO_ICellularRadio.h b/include/mts/MTS_IO_ICellularRadio.h index e2bf652..29f710a 100644 --- a/include/mts/MTS_IO_ICellularRadio.h +++ b/include/mts/MTS_IO_ICellularRadio.h @@ -68,6 +68,14 @@ 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 + }; + 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); @@ -220,6 +228,10 @@ 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; + /** * @brief getSimStatusSummary - get summary on the SIM card status * (if there is a SIM card inserted, is it locked, etc). diff --git a/include/mts/MTS_IO_QuectelRadio.h b/include/mts/MTS_IO_QuectelRadio.h index 3b1ba5a..8b8b92a 100644 --- a/include/mts/MTS_IO_QuectelRadio.h +++ b/include/mts/MTS_IO_QuectelRadio.h @@ -44,6 +44,10 @@ 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 6382696..7b04125 100644 --- a/include/mts/MTS_IO_TelitRadio.h +++ b/include/mts/MTS_IO_TelitRadio.h @@ -42,6 +42,10 @@ 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: TelitRadio(const std::string& sName, const std::string& sRadioPort); @@ -53,6 +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); }; } -- cgit v1.2.3 From 5ee7664dde53f71fd245db530f985f10f111b28b Mon Sep 17 00:00:00 2001 From: Maksym Telychko Date: Mon, 29 Jul 2019 13:27:29 +0300 Subject: MTX-2891 mpower 2-3-4g switch refactoring: method names --- include/mts/MTS_IO_EG95Radio.h | 4 +++- include/mts/MTS_IO_ICellularRadio.h | 6 +++--- include/mts/MTS_IO_QuectelRadio.h | 4 ---- include/mts/MTS_IO_TelitRadio.h | 6 +++--- 4 files changed, 9 insertions(+), 11 deletions(-) (limited to 'include') 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); -- cgit v1.2.3 From d8b526a82a9b4575adf7dd0d8451d95b6984b02f Mon Sep 17 00:00:00 2001 From: Maksym Telychko Date: Tue, 30 Jul 2019 10:47:36 +0300 Subject: MTX-2891 mpower 2-3-4g switch refactoring: enums --- include/mts/MTS_IO_EG95Radio.h | 6 +++--- include/mts/MTS_IO_ICellularRadio.h | 18 +++++++++--------- include/mts/MTS_IO_TelitRadio.h | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) (limited to 'include') 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); }; } -- cgit v1.2.3 From e8412ebb27c8ff995795951d609377b003c8d6b1 Mon Sep 17 00:00:00 2001 From: Maksym Telychko Date: Wed, 31 Jul 2019 14:30:04 +0300 Subject: Removed obsolete methods get/set radio mode Use get/setCellularMode instead Revert of commits: 4ef332ec707946a3cf2a55473d05dfc9af3d4b11 [MTS-MTQ] network radio mode switch: refactoring method name 143feb6a4587817d28c77e4df3a1b594b855f5e5 [MTS-MTQ] RAT mode switch: implementation for telit and quectel --- include/mts/MTS_IO_ICellularRadio.h | 10 ---------- include/mts/MTS_IO_QuectelRadio.h | 2 -- include/mts/MTS_IO_TelitRadio.h | 2 -- 3 files changed, 14 deletions(-) (limited to 'include') diff --git a/include/mts/MTS_IO_ICellularRadio.h b/include/mts/MTS_IO_ICellularRadio.h index ce1a91e..57d6f53 100644 --- a/include/mts/MTS_IO_ICellularRadio.h +++ b/include/mts/MTS_IO_ICellularRadio.h @@ -60,14 +60,6 @@ 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 @@ -293,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 fc041cf..991f630 100644 --- a/include/mts/MTS_IO_TelitRadio.h +++ b/include/mts/MTS_IO_TelitRadio.h @@ -39,8 +39,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; CODE getSupportedCellularModes(CELLULAR_MODES &networks) override; CODE getCellularMode(CELLULAR_MODES &networks) override; -- cgit v1.2.3 From dde61cb74828054f00518ca3b931f0b20009cc79 Mon Sep 17 00:00:00 2001 From: Maksym Telychko Date: Mon, 5 Aug 2019 19:05:47 +0300 Subject: MTX-2898 mpower 2-3-4g: quectel methods for set-cellular-mode and common methods for get-cellular-mode --- include/mts/MTS_IO_CellularRadio.h | 1 + include/mts/MTS_IO_EG95Radio.h | 3 +-- include/mts/MTS_IO_TelitRadio.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) (limited to 'include') 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 620a333..5296e16 100644 --- a/include/mts/MTS_IO_EG95Radio.h +++ b/include/mts/MTS_IO_EG95Radio.h @@ -34,13 +34,12 @@ 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 getCellularMode(CELLULAR_MODES &networks) override; CODE setCellularMode(CELLULAR_MODES networks) override; }; } diff --git a/include/mts/MTS_IO_TelitRadio.h b/include/mts/MTS_IO_TelitRadio.h index 991f630..b81cd7d 100644 --- a/include/mts/MTS_IO_TelitRadio.h +++ b/include/mts/MTS_IO_TelitRadio.h @@ -41,7 +41,6 @@ namespace MTS { CODE setMdn(const Json::Value& jArgs) override; CODE getSupportedCellularModes(CELLULAR_MODES &networks) override; - CODE getCellularMode(CELLULAR_MODES &networks) override; CODE setCellularMode(CELLULAR_MODES networks) override; protected: -- cgit v1.2.3