From 67a991ff3d772d2f81cb9907e1a710a88436f7c7 Mon Sep 17 00:00:00 2001 From: "mykola.salomatin" Date: Thu, 15 Apr 2021 17:52:10 +0300 Subject: [MTX-3998] mPower R. Apr 2021: +CEMODE shall be set to CEMODE=2 - Quectel - GP-1111 Added CEMODE switching support for Quectel radios --- src/MTS_IO_ICellularRadio.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/MTS_IO_ICellularRadio.cpp') diff --git a/src/MTS_IO_ICellularRadio.cpp b/src/MTS_IO_ICellularRadio.cpp index 9f63408..1fbad0c 100644 --- a/src/MTS_IO_ICellularRadio.cpp +++ b/src/MTS_IO_ICellularRadio.cpp @@ -532,6 +532,14 @@ MTS::IO::ICellularRadio::CODE MTS::IO::ICellularRadio::convertUeModeToString(MTS string = "csps_2"; rc = CODE::SUCCESS; break; + case ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE1: + string = "cs_1"; + rc = CODE::SUCCESS; + break; + case ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE2: + string = "cs_2"; + rc = CODE::SUCCESS; + break; default: string = MTS::IO::ICellularRadio::VALUE_UNKNOWN; rc = CODE::FAILURE; @@ -555,6 +563,12 @@ MTS::IO::ICellularRadio::CODE MTS::IO::ICellularRadio::convertStringToUeMode(con } else if (sMode == "csps_2") { mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE2; rc = CODE::SUCCESS; + } else if (sMode == "cs_1") { + mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE1; + rc = CODE::SUCCESS; + } else if (sMode == "cs_2") { + mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE2; + rc = CODE::SUCCESS; } else { mode = ICellularRadio::UNKNOWN_MODE; rc = CODE::FAILURE; -- cgit v1.2.3 From 6cab1e29fc2031a76c87e49c3bcdd7c5db8f40dc Mon Sep 17 00:00:00 2001 From: "mykola.salomatin" Date: Thu, 15 Apr 2021 20:47:36 +0300 Subject: [MTX-3998] mPower R. Apr 2021: +CEMODE shall be set to CEMODE=2 - Quectel - GP-1111 Refactoring common functions, telit and quectel functions related to CEMODE switching --- src/MTS_IO_ICellularRadio.cpp | 73 +++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 37 deletions(-) (limited to 'src/MTS_IO_ICellularRadio.cpp') diff --git a/src/MTS_IO_ICellularRadio.cpp b/src/MTS_IO_ICellularRadio.cpp index 1fbad0c..3394b4e 100644 --- a/src/MTS_IO_ICellularRadio.cpp +++ b/src/MTS_IO_ICellularRadio.cpp @@ -513,65 +513,64 @@ 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) { +MTS::IO::ICellularRadio::CODE MTS::IO::ICellularRadio::convertUeModeToString(UE_MODES_OF_OPERATION mode, std::string& sMode) { CODE rc; switch (mode) { - case ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE1: - string = "ps_1"; - rc = CODE::SUCCESS; + case UE_MODES_OF_OPERATION::PS_MODE1: + sMode = "ps_1"; + rc = SUCCESS; break; - case ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE2: - string = "ps_2"; - rc = CODE::SUCCESS; + case UE_MODES_OF_OPERATION::PS_MODE2: + sMode = "ps_2"; + rc = SUCCESS; break; - case ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE1: - string = "csps_1"; - rc = CODE::SUCCESS; + case UE_MODES_OF_OPERATION::CS_PS_MODE1: + sMode = "csps_1"; + rc = SUCCESS; break; - case ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE2: - string = "csps_2"; - rc = CODE::SUCCESS; + case UE_MODES_OF_OPERATION::CS_PS_MODE2: + sMode = "csps_2"; + rc = SUCCESS; break; - case ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE1: - string = "cs_1"; - rc = CODE::SUCCESS; + case UE_MODES_OF_OPERATION::CS_MODE1: + sMode = "cs_1"; + rc = SUCCESS; break; - case ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE2: - string = "cs_2"; - rc = CODE::SUCCESS; + case UE_MODES_OF_OPERATION::CS_MODE2: + sMode = "cs_2"; + rc = SUCCESS; break; default: - string = MTS::IO::ICellularRadio::VALUE_UNKNOWN; - rc = CODE::FAILURE; + sMode = ICellularRadio::VALUE_UNKNOWN; + rc = FAILURE; break; } return rc; } -MTS::IO::ICellularRadio::CODE MTS::IO::ICellularRadio::convertStringToUeMode(const std::string &sMode, UE_MODES_OF_OPERATION& mode) { - using namespace MTS::IO; +MTS::IO::ICellularRadio::CODE MTS::IO::ICellularRadio::convertStringToUeMode(const std::string& sMode, UE_MODES_OF_OPERATION& mode) { CODE rc; if (sMode == "ps_1") { - mode = ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE1; - rc = CODE::SUCCESS; + mode = UE_MODES_OF_OPERATION::PS_MODE1; + rc = SUCCESS; } else if (sMode == "ps_2") { - mode = ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE2; - rc = CODE::SUCCESS; + mode = UE_MODES_OF_OPERATION::PS_MODE2; + rc = SUCCESS; } else if (sMode == "csps_1") { - mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE1; - rc = CODE::SUCCESS; + mode = UE_MODES_OF_OPERATION::CS_PS_MODE1; + rc = SUCCESS; } else if (sMode == "csps_2") { - mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE2; - rc = CODE::SUCCESS; + mode = UE_MODES_OF_OPERATION::CS_PS_MODE2; + rc = SUCCESS; } else if (sMode == "cs_1") { - mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE1; - rc = CODE::SUCCESS; + mode = UE_MODES_OF_OPERATION::CS_MODE1; + rc = SUCCESS; } else if (sMode == "cs_2") { - mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE2; - rc = CODE::SUCCESS; + mode = UE_MODES_OF_OPERATION::CS_MODE2; + rc = SUCCESS; } else { - mode = ICellularRadio::UNKNOWN_MODE; - rc = CODE::FAILURE; + mode = UE_MODES_OF_OPERATION::UNKNOWN_MODE; + rc = FAILURE; } return rc; } -- cgit v1.2.3 From ac88b70987f59e89ce5257941e61ad4f1021d65f Mon Sep 17 00:00:00 2001 From: "mykola.salomatin" Date: Fri, 16 Apr 2021 18:50:15 +0300 Subject: [MTX-3998] mPower R. Apr 2021: +CEMODE shall be set to CEMODE=2 - Quectel - GP-1111 Refactoring after review --- src/MTS_IO_ICellularRadio.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/MTS_IO_ICellularRadio.cpp') diff --git a/src/MTS_IO_ICellularRadio.cpp b/src/MTS_IO_ICellularRadio.cpp index 3394b4e..0483dc8 100644 --- a/src/MTS_IO_ICellularRadio.cpp +++ b/src/MTS_IO_ICellularRadio.cpp @@ -513,30 +513,30 @@ std::string MTS::IO::ICellularRadio::getCodeAsString(CODE eCode) { } } -MTS::IO::ICellularRadio::CODE MTS::IO::ICellularRadio::convertUeModeToString(UE_MODES_OF_OPERATION mode, std::string& sMode) { +MTS::IO::ICellularRadio::CODE MTS::IO::ICellularRadio::convertUeModeToString(ICellularRadio::UE_MODES_OF_OPERATION mode, std::string& sMode) { CODE rc; switch (mode) { - case UE_MODES_OF_OPERATION::PS_MODE1: + case ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE1: sMode = "ps_1"; rc = SUCCESS; break; - case UE_MODES_OF_OPERATION::PS_MODE2: + case ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE2: sMode = "ps_2"; rc = SUCCESS; break; - case UE_MODES_OF_OPERATION::CS_PS_MODE1: + case ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE1: sMode = "csps_1"; rc = SUCCESS; break; - case UE_MODES_OF_OPERATION::CS_PS_MODE2: + case ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE2: sMode = "csps_2"; rc = SUCCESS; break; - case UE_MODES_OF_OPERATION::CS_MODE1: + case ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE1: sMode = "cs_1"; rc = SUCCESS; break; - case UE_MODES_OF_OPERATION::CS_MODE2: + case ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE2: sMode = "cs_2"; rc = SUCCESS; break; @@ -548,28 +548,28 @@ MTS::IO::ICellularRadio::CODE MTS::IO::ICellularRadio::convertUeModeToString(UE_ return rc; } -MTS::IO::ICellularRadio::CODE MTS::IO::ICellularRadio::convertStringToUeMode(const std::string& sMode, UE_MODES_OF_OPERATION& mode) { +MTS::IO::ICellularRadio::CODE MTS::IO::ICellularRadio::convertStringToUeMode(const std::string& sMode, ICellularRadio::UE_MODES_OF_OPERATION& mode) { CODE rc; if (sMode == "ps_1") { - mode = UE_MODES_OF_OPERATION::PS_MODE1; + mode = ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE1; rc = SUCCESS; } else if (sMode == "ps_2") { - mode = UE_MODES_OF_OPERATION::PS_MODE2; + mode = ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE2; rc = SUCCESS; } else if (sMode == "csps_1") { - mode = UE_MODES_OF_OPERATION::CS_PS_MODE1; + mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE1; rc = SUCCESS; } else if (sMode == "csps_2") { - mode = UE_MODES_OF_OPERATION::CS_PS_MODE2; + mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE2; rc = SUCCESS; } else if (sMode == "cs_1") { - mode = UE_MODES_OF_OPERATION::CS_MODE1; + mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE1; rc = SUCCESS; } else if (sMode == "cs_2") { - mode = UE_MODES_OF_OPERATION::CS_MODE2; + mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE2; rc = SUCCESS; } else { - mode = UE_MODES_OF_OPERATION::UNKNOWN_MODE; + mode = ICellularRadio::UE_MODES_OF_OPERATION::UNKNOWN_MODE; rc = FAILURE; } return rc; -- cgit v1.2.3