From 53efcef2e2f521135b323e194c45f1d9fa7b5d5d Mon Sep 17 00:00:00 2001 From: Maksym Telychko Date: Thu, 6 Jun 2019 14:45:58 +0300 Subject: [MTS-MTQ] refactoring: namespace usage Using identificators in appropriate namespace --- src/MTS_IO_LE910NA1Radio.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/MTS_IO_LE910NA1Radio.cpp') diff --git a/src/MTS_IO_LE910NA1Radio.cpp b/src/MTS_IO_LE910NA1Radio.cpp index 64583b4..382432b 100644 --- a/src/MTS_IO_LE910NA1Radio.cpp +++ b/src/MTS_IO_LE910NA1Radio.cpp @@ -38,8 +38,8 @@ LE910NA1Radio::LE910NA1Radio(const std::string& sPort) } -CellularRadio::CODE LE910NA1Radio::setActiveFirmware(const Json::Value& jArgs) { - CellularRadio::CODE rc; +LE910NA1Radio::CODE LE910NA1Radio::setActiveFirmware(const Json::Value& jArgs) { + CODE rc; // Set command allows enabling a specific firmware image on products // embedding 2 different firmware images: @@ -82,9 +82,9 @@ CellularRadio::CODE LE910NA1Radio::setActiveFirmware(const Json::Value& jArgs) { return sendBasicCommand(sCmd, 5000); } -CellularRadio::CODE LE910NA1Radio::getActiveFirmware(std::string& sFwId) { +LE910NA1Radio::CODE LE910NA1Radio::getActiveFirmware(std::string& sFwId) { std::string sCmd; - CellularRadio::CODE rc; + CODE rc; // // Read command reports the current active firmware image: // AT#FWSWITCH? -- cgit v1.2.3 From 123aed7c4be0b88a4726cae5d722d74ebdf93782 Mon Sep 17 00:00:00 2001 From: Maksym Telychko Date: Wed, 12 Jun 2019 15:22:41 +0300 Subject: [MTS-MTQ] refactoring: using full qualified names for consts --- src/MTS_IO_LE910NA1Radio.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/MTS_IO_LE910NA1Radio.cpp') diff --git a/src/MTS_IO_LE910NA1Radio.cpp b/src/MTS_IO_LE910NA1Radio.cpp index 382432b..8ae15ad 100644 --- a/src/MTS_IO_LE910NA1Radio.cpp +++ b/src/MTS_IO_LE910NA1Radio.cpp @@ -108,7 +108,7 @@ LE910NA1Radio::CODE LE910NA1Radio::getActiveFirmware(std::string& sFwId) { sCmd = "AT#FWSWITCH?"; std::string sResult = sendCommand(sCmd); - size_t end = sResult.find(RSP_OK); + size_t end = sResult.find(ICellularRadio::RSP_OK); if (end == std::string::npos) { printWarning("%s| Unable to get active image number from radio using command [%s]", getName().c_str(), -- cgit v1.2.3 From 0330513b8913d1d7bf14bad99d64ab002b770b7c Mon Sep 17 00:00:00 2001 From: Serhii Kostiuk Date: Thu, 18 Jul 2019 11:41:24 +0300 Subject: [MTR-MTQ] Namespace-related usage improvements Restored full qualification of the ICellularRadio::CODE object type for all files that used full qualification before (effectively, for all source files and only one header file). This commit partially reverses 53efcef2e2f521135b323e194c45f1d9fa7b5d5d. --- src/MTS_IO_LE910NA1Radio.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/MTS_IO_LE910NA1Radio.cpp') diff --git a/src/MTS_IO_LE910NA1Radio.cpp b/src/MTS_IO_LE910NA1Radio.cpp index 8ae15ad..c7341b0 100644 --- a/src/MTS_IO_LE910NA1Radio.cpp +++ b/src/MTS_IO_LE910NA1Radio.cpp @@ -38,8 +38,8 @@ LE910NA1Radio::LE910NA1Radio(const std::string& sPort) } -LE910NA1Radio::CODE LE910NA1Radio::setActiveFirmware(const Json::Value& jArgs) { - CODE rc; +ICellularRadio::CODE LE910NA1Radio::setActiveFirmware(const Json::Value& jArgs) { + ICellularRadio::CODE rc; // Set command allows enabling a specific firmware image on products // embedding 2 different firmware images: @@ -82,9 +82,9 @@ LE910NA1Radio::CODE LE910NA1Radio::setActiveFirmware(const Json::Value& jArgs) { return sendBasicCommand(sCmd, 5000); } -LE910NA1Radio::CODE LE910NA1Radio::getActiveFirmware(std::string& sFwId) { +ICellularRadio::CODE LE910NA1Radio::getActiveFirmware(std::string& sFwId) { std::string sCmd; - CODE rc; + ICellularRadio::CODE rc; // // Read command reports the current active firmware image: // AT#FWSWITCH? -- cgit v1.2.3