diff options
Diffstat (limited to 'include/mts')
| -rw-r--r-- | include/mts/MTS_IO_CellularRadio.h | 4 | ||||
| -rw-r--r-- | include/mts/MTS_IO_ICellularRadio.h | 19 | ||||
| -rw-r--r-- | include/mts/MTS_IO_LE910Radio.h | 4 | ||||
| -rw-r--r-- | include/mts/MTS_IO_QuectelRadio.h | 12 |
4 files changed, 26 insertions, 13 deletions
diff --git a/include/mts/MTS_IO_CellularRadio.h b/include/mts/MTS_IO_CellularRadio.h index 6840398..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 newmode) override; - CODE getUeModeOfOperation(UE_MODES_OF_OPERATION& newmode) 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 e8ae891..e638e8b 100644 --- a/include/mts/MTS_IO_ICellularRadio.h +++ b/include/mts/MTS_IO_ICellularRadio.h @@ -70,18 +70,20 @@ namespace MTS { enum UE_MODES_OF_OPERATION : uint8_t { UNKNOWN_MODE = 0, // current mode of operation is not available - PS_MODE1, // only EPS (LTE) services are allowed, the usage is “voice centric” - PS_MODE2, // only EPS (LTE) services are allowed, the usage is “data centric” - CS_PS_MODE1, // both EPS and non-EPS services are allowed, the usage is “voice centric” - CS_PS_MODE2 // both EPS and non-EPS services are allowed, the usage is “data centric” + PS_MODE1, // only EPS (LTE) services are allowed, the usage is "voice centric" + PS_MODE2, // only EPS (LTE) services are allowed, the usage is "data centric" + CS_PS_MODE1, // both EPS and non-EPS services are allowed, the usage is "voice centric" + CS_PS_MODE2, // both EPS and non-EPS services are allowed, the usage is "data centric" + CS_MODE1, // only non-EPS services are allowed, the usage is "voice centric" + CS_MODE2 // only non-EPS services are allowed, the usage is "data centric" }; static CODE convertModelToType(const std::string& sModel, std::string& sType); 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 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<MTS::IO::Connection>& apIo, const std::string& sCmd, @@ -572,9 +574,8 @@ namespace MTS { virtual std::string waitResponse(IsNeedMoreData& isNeedMoreData, int32_t timeoutMillis = 100) = 0; - - virtual CODE setUeModeOfOperation(UE_MODES_OF_OPERATION newmode) = 0; - virtual CODE getUeModeOfOperation(UE_MODES_OF_OPERATION& newmode) = 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 e8a0dec..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 newmode) override; - CODE getUeModeOfOperation(UE_MODES_OF_OPERATION &newmode) 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 9713f48..c46b39b 100644 --- a/include/mts/MTS_IO_QuectelRadio.h +++ b/include/mts/MTS_IO_QuectelRadio.h @@ -51,7 +51,16 @@ namespace MTS { CODE fumoLocalCleanup() override; CODE fumoLocalApply(UpdateCb& stepCb) 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 { + UNKNOWN_MODE = 0, // Unknown mode + MODE_1, // Voice centric mode + MODE_2 // Data centric mode + }; + QuectelRadio(const std::string& sName, const std::string& sRadioPort); CODE getIsSimInserted(bool& bData) override; @@ -64,6 +73,9 @@ namespace MTS { virtual CODE removeFile(const std::string& sTargetFilename); virtual CODE checkFile(bool& bFilePresent, const std::string& sTargetFilename); + 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 std::string m_sQuectelFirmware; |