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 --- include/mts/MTS_IO_CellularRadio.h | 4 ++-- include/mts/MTS_IO_ICellularRadio.h | 9 ++++----- include/mts/MTS_IO_LE910Radio.h | 4 ++-- include/mts/MTS_IO_QuectelRadio.h | 8 ++++---- 4 files changed, 12 insertions(+), 13 deletions(-) (limited to 'include') diff --git a/include/mts/MTS_IO_CellularRadio.h b/include/mts/MTS_IO_CellularRadio.h index b245c48..7e7454b 100644 --- a/include/mts/MTS_IO_CellularRadio.h +++ b/include/mts/MTS_IO_CellularRadio.h @@ -134,8 +134,8 @@ namespace MTS { virtual std::string waitResponse(IsNeedMoreData& isNeedMoreData, int32_t timeoutMillis = 100) override; - CODE setUeModeOfOperation(UE_MODES_OF_OPERATION mode) override; - CODE getUeModeOfOperation(UE_MODES_OF_OPERATION& mode) override; + CODE setUeModeOfOperation(ICellularRadio::UE_MODES_OF_OPERATION mode) override; + CODE getUeModeOfOperation(ICellularRadio::UE_MODES_OF_OPERATION& mode) override; protected: diff --git a/include/mts/MTS_IO_ICellularRadio.h b/include/mts/MTS_IO_ICellularRadio.h index 63cedbe..e638e8b 100644 --- a/include/mts/MTS_IO_ICellularRadio.h +++ b/include/mts/MTS_IO_ICellularRadio.h @@ -82,8 +82,8 @@ 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& sMode); - static CODE convertStringToUeMode(const std::string& sMode, UE_MODES_OF_OPERATION& mode); + static CODE convertUeModeToString(ICellularRadio::UE_MODES_OF_OPERATION mode, std::string& sMode); + static CODE convertStringToUeMode(const std::string& sMode, ICellularRadio::UE_MODES_OF_OPERATION& mode); static std::string sendCommand(MTS::AutoPtr& apIo, const std::string& sCmd, @@ -574,9 +574,8 @@ namespace MTS { virtual std::string waitResponse(IsNeedMoreData& isNeedMoreData, int32_t timeoutMillis = 100) = 0; - - virtual CODE setUeModeOfOperation(UE_MODES_OF_OPERATION mode) = 0; - virtual CODE getUeModeOfOperation(UE_MODES_OF_OPERATION& mode) = 0; + virtual CODE setUeModeOfOperation(ICellularRadio::UE_MODES_OF_OPERATION mode) = 0; + virtual CODE getUeModeOfOperation(ICellularRadio::UE_MODES_OF_OPERATION& mode) = 0; }; } } diff --git a/include/mts/MTS_IO_LE910Radio.h b/include/mts/MTS_IO_LE910Radio.h index f64600d..2ba423d 100644 --- a/include/mts/MTS_IO_LE910Radio.h +++ b/include/mts/MTS_IO_LE910Radio.h @@ -45,8 +45,8 @@ namespace MTS { CODE setRxDiversity(const Json::Value& jArgs); CODE getModemLocation(std::string& sLocation); - CODE setUeModeOfOperation(UE_MODES_OF_OPERATION mode) override; - CODE getUeModeOfOperation(UE_MODES_OF_OPERATION& mode) override; + CODE setUeModeOfOperation(ICellularRadio::UE_MODES_OF_OPERATION mode) override; + CODE getUeModeOfOperation(ICellularRadio::UE_MODES_OF_OPERATION& mode) override; protected: diff --git a/include/mts/MTS_IO_QuectelRadio.h b/include/mts/MTS_IO_QuectelRadio.h index 04c0ef9..c46b39b 100644 --- a/include/mts/MTS_IO_QuectelRadio.h +++ b/include/mts/MTS_IO_QuectelRadio.h @@ -51,8 +51,8 @@ namespace MTS { CODE fumoLocalCleanup() override; CODE fumoLocalApply(UpdateCb& stepCb) override; - CODE setUeModeOfOperation(UE_MODES_OF_OPERATION mode) override; - CODE getUeModeOfOperation(UE_MODES_OF_OPERATION& mode) override; + CODE setUeModeOfOperation(ICellularRadio::UE_MODES_OF_OPERATION mode) override; + CODE getUeModeOfOperation(ICellularRadio::UE_MODES_OF_OPERATION& mode) override; protected: enum class UE_USAGE_SETTING : uint8_t { @@ -73,8 +73,8 @@ namespace MTS { virtual CODE removeFile(const std::string& sTargetFilename); virtual CODE checkFile(bool& bFilePresent, const std::string& sTargetFilename); - virtual CODE getUeUsageSetting(UE_USAGE_SETTING& us); - virtual CODE convertToUeUsageSetting(const std::string& sSetting, UE_USAGE_SETTING& us); + virtual CODE getUeUsageSetting(QuectelRadio::UE_USAGE_SETTING& us); + virtual CODE convertToUeUsageSetting(const std::string& sSetting, QuectelRadio::UE_USAGE_SETTING& us); private: // private variable to save old firmware versions during FOTA -- cgit v1.2.3