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_EG95Radio.cpp | 13 +++++++++++++ src/MTS_IO_QuectelRadio.cpp | 11 ----------- src/MTS_IO_TelitRadio.cpp | 6 +++--- 3 files changed, 16 insertions(+), 14 deletions(-) (limited to 'src') 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_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 -- cgit v1.2.3