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 --- src/MTS_IO_QuectelRadio.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/MTS_IO_QuectelRadio.cpp') diff --git a/src/MTS_IO_QuectelRadio.cpp b/src/MTS_IO_QuectelRadio.cpp index f3227a5..c603d08 100644 --- a/src/MTS_IO_QuectelRadio.cpp +++ b/src/MTS_IO_QuectelRadio.cpp @@ -610,3 +610,15 @@ 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; +} -- cgit v1.2.3 From 6c92f7176e69daaa56f8274f0059ccf70beb4fe8 Mon Sep 17 00:00:00 2001 From: Maksym Telychko Date: Fri, 26 Jul 2019 12:19:15 +0300 Subject: MTX-2891 mpower 2-3-4g switch: build and treat warnings as errors --- src/MTS_IO_QuectelRadio.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/MTS_IO_QuectelRadio.cpp') diff --git a/src/MTS_IO_QuectelRadio.cpp b/src/MTS_IO_QuectelRadio.cpp index c603d08..aaf30e4 100644 --- a/src/MTS_IO_QuectelRadio.cpp +++ b/src/MTS_IO_QuectelRadio.cpp @@ -215,7 +215,6 @@ CellularRadio::CODE QuectelRadio::getNetworkStatus(Json::Value& jData) { const std::string RAT_WCDMA = "WCDMA"; const std::string RAT_LTE = "LTE"; - int32_t iValue; ACTIVEBAND abnd; SERVICEDOMAIN sd; std::string sValue; -- 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 --- src/MTS_IO_QuectelRadio.cpp | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'src/MTS_IO_QuectelRadio.cpp') 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; -} -- 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 --- src/MTS_IO_QuectelRadio.cpp | 42 ------------------------------------------ 1 file changed, 42 deletions(-) (limited to 'src/MTS_IO_QuectelRadio.cpp') diff --git a/src/MTS_IO_QuectelRadio.cpp b/src/MTS_IO_QuectelRadio.cpp index 4c65382..c4bdc56 100644 --- a/src/MTS_IO_QuectelRadio.cpp +++ b/src/MTS_IO_QuectelRadio.cpp @@ -568,45 +568,3 @@ ICellularRadio::CODE QuectelRadio::convertToActiveBand(const std::string& sQuect return SUCCESS; } - -ICellularRadio::CODE QuectelRadio::getRadioNetworkMode(RADIO_NETWORK_MODE &mode) -{ - // AT+QCFG="nwscanmode" execution can take up to 300ms according to the datasheet. Setting timeout to 500ms just for sure. - std::string sCmd("AT+QCFG=\"nwscanmode\""); - std::string cmdResult = sendCommand(sCmd, DEFAULT_BAIL_STRINGS, 500); - - if (cmdResult.find(ICellularRadio::RSP_OK) == std::string::npos) { - printDebug("%s| AT+QCFG? returned unexpected response: [%s][%s]", getName().c_str(), sCmd.c_str(), cmdResult.c_str()); - return FAILURE; - } - switch (stoi(MTS::Text::split(cmdResult, ',')[1])) { - case 1: mode = ICellularRadio::RADIO_NETWORK_MODE_GSM_ONLY; break; - case 5: mode = ICellularRadio::RADIO_NETWORK_MODE_UMTS_ONLY; break; - case 0: mode = ICellularRadio::RADIO_NETWORK_MODE_AUTO; break; - default: mode = ICellularRadio::RADIO_NETWORK_MODE_UNKNOWN; break; - } - return SUCCESS; -} - -ICellularRadio::CODE QuectelRadio::setRadioNetworkMode(RADIO_NETWORK_MODE mode) -{ - std::string value; - switch (mode) { - case ICellularRadio::RADIO_NETWORK_MODE_GSM_ONLY: value = "1"; break; - case ICellularRadio::RADIO_NETWORK_MODE_UMTS_ONLY: value = "5"; break; - case ICellularRadio::RADIO_NETWORK_MODE_AUTO: value = "0"; break; - default: return FAILURE; - } - std::string sCmd("AT+QCFG=\"nwscanmode\","); - sCmd += value; - - // AT+QCFG="nwscanmode" execution can take up to 300ms according to the datasheet. Setting timeout to 500ms just for sure. - std::string cmdResult = sendCommand(sCmd, DEFAULT_BAIL_STRINGS, 500); - - if (cmdResult.find(ICellularRadio::RSP_OK) == std::string::npos) { - printDebug("%s| AT+QCFG? returned unexpected response: [%s][%s]", getName().c_str(), sCmd.c_str(), cmdResult.c_str()); - return FAILURE; - } - return SUCCESS; -} - -- cgit v1.2.3