From 285cee922e229cb1bbd704e6227dbbb3756bd889 Mon Sep 17 00:00:00 2001 From: "rodion.shyshkin" Date: Wed, 31 Mar 2021 20:49:08 +0300 Subject: [GP-1111] mPower R. Apr 2021: +CEMODE shall be set to CEMODE=2 - libmts-io for Telit Adding an ability to set UE mode of operation to libmts-io. There was added two clear virtual methods in iCellularRadio, correct implementation for them for Telit LTE modems and implementation with error messages for all other. --- src/MTS_IO_CellularRadio.cpp | 39 ++++++++++++++++++++ src/MTS_IO_LE910Radio.cpp | 85 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 124 insertions(+) (limited to 'src') diff --git a/src/MTS_IO_CellularRadio.cpp b/src/MTS_IO_CellularRadio.cpp index fe252c0..ee45ace 100644 --- a/src/MTS_IO_CellularRadio.cpp +++ b/src/MTS_IO_CellularRadio.cpp @@ -1378,3 +1378,42 @@ ICellularRadio::CODE CellularRadio::readChunk(int fd, char* pChunk, size_t dChun return rc; } + +ICellularRadio::CODE CellularRadio::setUeModeOfOperation(UE_MODES_OF_OPERATION newmode) { + printTrace("%s| Set UE Mode Of Operation: not applicable", m_sName.c_str()); + return CODE::NOT_APPLICABLE; +} + +ICellularRadio::CODE CellularRadio::getUeModeOfOperation(UE_MODES_OF_OPERATION &newmode) { + printTrace("%s| Get UE Mode Of Operation: not applicable", m_sName.c_str()); + newmode = UE_MODES_OF_OPERATION::UNKNOWN_MODE; + return CODE::NOT_APPLICABLE; +} + +ICellularRadio::CODE CellularRadio::convertUeModeToString(ICellularRadio::UE_MODES_OF_OPERATION mode, std::string& string) { + CODE rc; + switch (mode) { + case ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE1: + string = "ps_1"; + rc = CODE::SUCCESS; + break; + case ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE2: + string = "ps_2"; + rc = CODE::SUCCESS; + break; + case ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE1: + string = "csps_1"; + rc = CODE::SUCCESS; + break; + case ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE2: + string = "csps_2"; + rc = CODE::SUCCESS; + break; + default: + string = "unknown"; + rc = CODE::FAILURE; + break; + } + return rc; +} + diff --git a/src/MTS_IO_LE910Radio.cpp b/src/MTS_IO_LE910Radio.cpp index ea905a8..764ac5e 100644 --- a/src/MTS_IO_LE910Radio.cpp +++ b/src/MTS_IO_LE910Radio.cpp @@ -29,6 +29,7 @@ #include #include +#include using namespace MTS::IO; @@ -76,3 +77,87 @@ ICellularRadio::CODE LE910Radio::getModemLocation(std::string& sLocation) { return SUCCESS; } + +ICellularRadio::CODE LE910Radio::setUeModeOfOperation(ICellularRadio::UE_MODES_OF_OPERATION newmode) { + uint8_t iValue; + + switch (newmode) { + case UE_MODES_OF_OPERATION::PS_MODE1: + iValue = 3; + break; + case UE_MODES_OF_OPERATION::PS_MODE2: + iValue = 0; + break; + case UE_MODES_OF_OPERATION::CS_PS_MODE1: + iValue = 1; + break; + case UE_MODES_OF_OPERATION::CS_PS_MODE2: + iValue = 2; + break; + default: + printTrace("Set UE Mode Of Operation: invalid argument"); + return CODE::INVALID_ARGS; + } + + const int dTimeout = 1000; // ms + const std::string sCommand = "AT+CEMODE=" + MTS::Text::format(iValue); + + return sendBasicCommand(sCommand, dTimeout); +} + +ICellularRadio::CODE LE910Radio::getUeModeOfOperation(ICellularRadio::UE_MODES_OF_OPERATION& newmode) { + const std::string sCommand = "AT+CEMODE?"; + const int dTimeout = 1000; // ms + + std::string sResult = sendCommand(sCommand, ICellularRadio::DEFAULT_BAIL_STRINGS, dTimeout); + printTrace("Got response from the radio: %s", sResult.c_str()); + + size_t end = sResult.rfind(ICellularRadio::RSP_OK); + if (std::string::npos == end) { + printWarning("Unable to get UE Mode Of Operation from radio using command [%s]", sCommand.c_str()); + return CODE::FAILURE; + } + + const std::string sLabel = "+CEMODE: "; + size_t start = sResult.find(sLabel); + if (std::string::npos == start) { + printWarning("Unable to get UE Mode Of Operation from radio using command [%s]", sCommand.c_str()); + return CODE::FAILURE; + } + + start += sLabel.length(); + const std::string sValue = MTS::Text::trim(sResult.substr(start, end - start)); + uint8_t uiValue; + + if (!MTS::Text::parse(uiValue, sValue)) { + printWarning("Unable to parse CEMODE from response [%s]", sResult.c_str()); + return CODE::FAILURE; + } + + CODE rc; + switch (uiValue) { + case 0: + newmode = ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE2; + rc = CODE::SUCCESS; + break; + case 1: + newmode = ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE1; + rc = CODE::SUCCESS; + break; + case 2: + newmode = ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE2; + rc = CODE::SUCCESS; + break; + case 3: + newmode = ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE1; + rc = CODE::SUCCESS; + break; + default: + printWarning("Unable to parse CEMODE from response [%s]", sResult.c_str()); + newmode = ICellularRadio::UE_MODES_OF_OPERATION::UNKNOWN_MODE; + rc = CODE::FAILURE; + break; + } + return rc; +} + -- cgit v1.2.3 From 2ff46750ec3f1004a5c153944c18dbb081911a03 Mon Sep 17 00:00:00 2001 From: "rodion.shyshkin" Date: Wed, 31 Mar 2021 22:29:58 +0300 Subject: [GP-1111] mPower R. Apr 2021: +CEMODE shall be set to CEMODE=2 - libmts-io for Telit Changes after a code review --- src/MTS_IO_CellularRadio.cpp | 28 ---------------------------- src/MTS_IO_ICellularRadio.cpp | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 28 deletions(-) (limited to 'src') diff --git a/src/MTS_IO_CellularRadio.cpp b/src/MTS_IO_CellularRadio.cpp index ee45ace..49bdcb4 100644 --- a/src/MTS_IO_CellularRadio.cpp +++ b/src/MTS_IO_CellularRadio.cpp @@ -1389,31 +1389,3 @@ ICellularRadio::CODE CellularRadio::getUeModeOfOperation(UE_MODES_OF_OPERATION & newmode = UE_MODES_OF_OPERATION::UNKNOWN_MODE; return CODE::NOT_APPLICABLE; } - -ICellularRadio::CODE CellularRadio::convertUeModeToString(ICellularRadio::UE_MODES_OF_OPERATION mode, std::string& string) { - CODE rc; - switch (mode) { - case ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE1: - string = "ps_1"; - rc = CODE::SUCCESS; - break; - case ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE2: - string = "ps_2"; - rc = CODE::SUCCESS; - break; - case ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE1: - string = "csps_1"; - rc = CODE::SUCCESS; - break; - case ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE2: - string = "csps_2"; - rc = CODE::SUCCESS; - break; - default: - string = "unknown"; - rc = CODE::FAILURE; - break; - } - return rc; -} - diff --git a/src/MTS_IO_ICellularRadio.cpp b/src/MTS_IO_ICellularRadio.cpp index 73737c7..0621740 100644 --- a/src/MTS_IO_ICellularRadio.cpp +++ b/src/MTS_IO_ICellularRadio.cpp @@ -513,3 +513,30 @@ std::string MTS::IO::ICellularRadio::getCodeAsString(CODE eCode) { } } +MTS::IO::ICellularRadio::CODE MTS::IO::ICellularRadio::convertUeModeToString(MTS::IO::ICellularRadio::UE_MODES_OF_OPERATION mode, std::string &string) { + CODE rc; + switch (mode) { + case ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE1: + string = "ps_1"; + rc = CODE::SUCCESS; + break; + case ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE2: + string = "ps_2"; + rc = CODE::SUCCESS; + break; + case ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE1: + string = "csps_1"; + rc = CODE::SUCCESS; + break; + case ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE2: + string = "csps_2"; + rc = CODE::SUCCESS; + break; + default: + string = MTS::IO::ICellularRadio::VALUE_UNKNOWN; + rc = CODE::FAILURE; + break; + } + return rc; +} + -- cgit v1.2.3 From 76df85f676adde6f31c35f7809f9f7794baca2a1 Mon Sep 17 00:00:00 2001 From: "rodion.shyshkin" Date: Wed, 31 Mar 2021 22:54:54 +0300 Subject: [GP-1111] mPower R. Apr 2021: +CEMODE shall be set to CEMODE=2 - libmts-io for Telit Changes after a code review. --- src/MTS_IO_ICellularRadio.cpp | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'src') diff --git a/src/MTS_IO_ICellularRadio.cpp b/src/MTS_IO_ICellularRadio.cpp index 0621740..9f63408 100644 --- a/src/MTS_IO_ICellularRadio.cpp +++ b/src/MTS_IO_ICellularRadio.cpp @@ -540,3 +540,24 @@ MTS::IO::ICellularRadio::CODE MTS::IO::ICellularRadio::convertUeModeToString(MTS return rc; } +MTS::IO::ICellularRadio::CODE MTS::IO::ICellularRadio::convertStringToUeMode(const std::string &sMode, UE_MODES_OF_OPERATION& mode) { + using namespace MTS::IO; + CODE rc; + if (sMode == "ps_1") { + mode = ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE1; + rc = CODE::SUCCESS; + } else if (sMode == "ps_2") { + mode = ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE2; + rc = CODE::SUCCESS; + } else if (sMode == "csps_1") { + mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE1; + rc = CODE::SUCCESS; + } else if (sMode == "csps_2") { + mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE2; + rc = CODE::SUCCESS; + } else { + mode = ICellularRadio::UNKNOWN_MODE; + rc = CODE::FAILURE; + } + return rc; +} -- cgit v1.2.3