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 --- include/mts/MTS_IO_CellularRadio.h | 1 - include/mts/MTS_IO_ICellularRadio.h | 2 +- src/MTS_IO_CellularRadio.cpp | 28 ---------------------------- src/MTS_IO_ICellularRadio.cpp | 27 +++++++++++++++++++++++++++ 4 files changed, 28 insertions(+), 30 deletions(-) diff --git a/include/mts/MTS_IO_CellularRadio.h b/include/mts/MTS_IO_CellularRadio.h index d0f7a14..6840398 100644 --- a/include/mts/MTS_IO_CellularRadio.h +++ b/include/mts/MTS_IO_CellularRadio.h @@ -136,7 +136,6 @@ namespace MTS { CODE setUeModeOfOperation(UE_MODES_OF_OPERATION newmode) override; CODE getUeModeOfOperation(UE_MODES_OF_OPERATION& newmode) override; - CODE convertUeModeToString(UE_MODES_OF_OPERATION mode, std::string &string) override; protected: diff --git a/include/mts/MTS_IO_ICellularRadio.h b/include/mts/MTS_IO_ICellularRadio.h index b84d4b8..63b4f08 100644 --- a/include/mts/MTS_IO_ICellularRadio.h +++ b/include/mts/MTS_IO_ICellularRadio.h @@ -80,6 +80,7 @@ namespace MTS { static CODE convertModelToMtsShortCode(const std::string& sModel, std::string& sCode, ICellularRadio *radioObj = NULL); static CODE convertServiceDomainToString(SERVICEDOMAIN eSd, std::string& sSd); static CODE convertActiveBandToString(ACTIVEBAND eBand, std::string& sBand); + static CODE convertUeModeToString(UE_MODES_OF_OPERATION mode, std::string& string); static std::string sendCommand(MTS::AutoPtr& apIo, const std::string& sCmd, @@ -573,7 +574,6 @@ namespace MTS { virtual CODE setUeModeOfOperation(UE_MODES_OF_OPERATION newmode) = 0; virtual CODE getUeModeOfOperation(UE_MODES_OF_OPERATION& newmode) = 0; - virtual CODE convertUeModeToString(UE_MODES_OF_OPERATION mode, std::string& string) = 0; }; } } 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