summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/mts/MTS_IO_ICellularRadio.h16
-rw-r--r--include/mts/MTS_IO_QuectelRadio.h4
-rw-r--r--include/mts/MTS_IO_TelitRadio.h4
-rw-r--r--src/MTS_IO_QuectelRadio.cpp18
-rw-r--r--src/MTS_IO_TelitRadio.cpp18
5 files changed, 30 insertions, 30 deletions
diff --git a/include/mts/MTS_IO_ICellularRadio.h b/include/mts/MTS_IO_ICellularRadio.h
index 2d47fcf..e2bf652 100644
--- a/include/mts/MTS_IO_ICellularRadio.h
+++ b/include/mts/MTS_IO_ICellularRadio.h
@@ -60,12 +60,12 @@ namespace MTS {
NOT_INSERTED
};
- enum RADIOMODE : uint8_t {
- RADIOMODE_UNKNOWN = 0,
- RADIOMODE_AUTO,
- RADIOMODE_GSM_ONLY,
- RADIOMODE_UMTS_ONLY,
- RADIOMODE_LTE_ONLY
+ enum RADIO_NETWORK_MODE : uint8_t {
+ RADIO_NETWORK_MODE_UNKNOWN = 0,
+ RADIO_NETWORK_MODE_AUTO,
+ RADIO_NETWORK_MODE_GSM_ONLY,
+ RADIO_NETWORK_MODE_UMTS_ONLY,
+ RADIO_NETWORK_MODE_LTE_ONLY
};
static CODE convertModelToType(const std::string& sModel, std::string& sType);
@@ -262,8 +262,6 @@ namespace MTS {
virtual CODE getRegistration(REGISTRATION& eRegistration) = 0;
virtual CODE convertRegistrationToString(REGISTRATION eRegistration, std::string& sRegistration) = 0;
- virtual CODE getRadioMode(RADIOMODE &mode) = 0;
- virtual CODE setRadioMode(RADIOMODE mode) = 0;
/**
* @brief unlockSimCard - unlock the SIM card using PIN code provided
*
@@ -283,6 +281,8 @@ namespace MTS {
* or on any other error).
*/
virtual CODE unlockSimCard(const Json::Value& jArgs) = 0;
+ virtual CODE getRadioNetworkMode(RADIO_NETWORK_MODE &mode) = 0;
+ virtual CODE setRadioNetworkMode(RADIO_NETWORK_MODE mode) = 0;
//! Gather details of the radio's Mobile IP Profile
/*!
diff --git a/include/mts/MTS_IO_QuectelRadio.h b/include/mts/MTS_IO_QuectelRadio.h
index 3e5886c..557fd82 100644
--- a/include/mts/MTS_IO_QuectelRadio.h
+++ b/include/mts/MTS_IO_QuectelRadio.h
@@ -41,8 +41,8 @@ namespace MTS {
CODE convertdBmToSignalStrength(const int32_t& dBm, int32_t& iRssi) override;
CODE setMdn(const Json::Value& jArgs) override;
- CODE getRadioMode(RADIOMODE &mode) override;
- CODE setRadioMode(RADIOMODE mode) override;
+ CODE getRadioNetworkMode(RADIO_NETWORK_MODE &mode) override;
+ CODE setRadioNetworkMode(RADIO_NETWORK_MODE mode) override;
protected:
QuectelRadio(const std::string& sName, const std::string& sRadioPort);
diff --git a/include/mts/MTS_IO_TelitRadio.h b/include/mts/MTS_IO_TelitRadio.h
index 08b144c..6382696 100644
--- a/include/mts/MTS_IO_TelitRadio.h
+++ b/include/mts/MTS_IO_TelitRadio.h
@@ -39,8 +39,8 @@ namespace MTS {
CODE convertdBmToSignalStrength(const int32_t& dBm, int32_t& iRssi) override;
CODE setMdn(const Json::Value& jArgs) override;
- CODE getRadioMode(RADIOMODE &mode) override;
- CODE setRadioMode(RADIOMODE mode) override;
+ CODE getRadioNetworkMode(RADIO_NETWORK_MODE &mode) override;
+ CODE setRadioNetworkMode(RADIO_NETWORK_MODE mode) override;
protected:
TelitRadio(const std::string& sName, const std::string& sRadioPort);
diff --git a/src/MTS_IO_QuectelRadio.cpp b/src/MTS_IO_QuectelRadio.cpp
index 472255f..6f97989 100644
--- a/src/MTS_IO_QuectelRadio.cpp
+++ b/src/MTS_IO_QuectelRadio.cpp
@@ -576,7 +576,7 @@ CellularRadio::CODE QuectelRadio::convertToActiveBand(const std::string& sQuecte
return SUCCESS;
}
-ICellularRadio::CODE QuectelRadio::getRadioMode(RADIOMODE &mode)
+ICellularRadio::CODE QuectelRadio::getRadioNetworkMode(RADIO_NETWORK_MODE &mode)
{
std::string sCmd("AT+QCFG=\"nwscanmode\"");
std::string cmdResult = sendCommand(sCmd);
@@ -585,21 +585,21 @@ ICellularRadio::CODE QuectelRadio::getRadioMode(RADIOMODE &mode)
return FAILURE;
}
switch (stoi(MTS::Text::split(cmdResult, ',')[1])) {
- case 1: mode = ICellularRadio::RADIOMODE_GSM_ONLY; break;
- case 5: mode = ICellularRadio::RADIOMODE_UMTS_ONLY; break;
- case 0: mode = ICellularRadio::RADIOMODE_AUTO; break;
- default: mode = ICellularRadio::RADIOMODE_UNKNOWN; break;
+ case 1: mode = ICellularRadio::RADIO_NETWORK_MODE_GSM_ONLY; break;
+ case 5: mode = ICellularRadio::RADIO_NETWORK_MODE_UMTS_ONLY; break;
+ case 0: mode = ICellularRadio::RADIO_NETWORK_MODE_AUTO; break;
+ default: mode = ICellularRadio::RADIO_NETWORK_MODE_UNKNOWN; break;
}
return SUCCESS;
}
-ICellularRadio::CODE QuectelRadio::setRadioMode(RADIOMODE mode)
+ICellularRadio::CODE QuectelRadio::setRadioNetworkMode(RADIO_NETWORK_MODE mode)
{
std::string value;
switch (mode) {
- case ICellularRadio::RADIOMODE_GSM_ONLY: value = "1"; break;
- case ICellularRadio::RADIOMODE_UMTS_ONLY: value = "5"; break;
- case ICellularRadio::RADIOMODE_AUTO: value = "0"; break;
+ case ICellularRadio::RADIO_NETWORK_MODE_GSM_ONLY: value = "1"; break;
+ case ICellularRadio::RADIO_NETWORK_MODE_UMTS_ONLY: value = "5"; break;
+ case ICellularRadio::RADIO_NETWORK_MODE_AUTO: value = "0"; break;
default: return FAILURE;
}
std::string sCmd("AT+QCFG=\"nwscanmode\",");
diff --git a/src/MTS_IO_TelitRadio.cpp b/src/MTS_IO_TelitRadio.cpp
index 2d0422d..bafbd35 100644
--- a/src/MTS_IO_TelitRadio.cpp
+++ b/src/MTS_IO_TelitRadio.cpp
@@ -538,7 +538,7 @@ bool TelitRadio::getHardwareVersionFromFirmware(const std::string& sFirmware, st
}
-ICellularRadio::CODE TelitRadio::getRadioMode(RADIOMODE &mode)
+ICellularRadio::CODE TelitRadio::getRadioNetworkMode(RADIO_NETWORK_MODE &mode)
{
std::string sCmd("AT+WS46?");
std::string cmdResult = sendCommand(sCmd);
@@ -547,21 +547,21 @@ ICellularRadio::CODE TelitRadio::getRadioMode(RADIOMODE &mode)
return FAILURE;
}
switch (stoi(MTS::Text::split(cmdResult, ':')[1])) {
- case 12: mode = ICellularRadio::RADIOMODE_GSM_ONLY; break;
- case 22: mode = ICellularRadio::RADIOMODE_UMTS_ONLY; break;
- case 25: mode = ICellularRadio::RADIOMODE_AUTO; break;
- default: mode = ICellularRadio::RADIOMODE_UNKNOWN; break;
+ case 12: mode = ICellularRadio::RADIO_NETWORK_MODE_GSM_ONLY; break;
+ case 22: mode = ICellularRadio::RADIO_NETWORK_MODE_UMTS_ONLY; break;
+ case 25: mode = ICellularRadio::RADIO_NETWORK_MODE_AUTO; break;
+ default: mode = ICellularRadio::RADIO_NETWORK_MODE_UNKNOWN; break;
}
return SUCCESS;
}
-ICellularRadio::CODE TelitRadio::setRadioMode(RADIOMODE mode)
+ICellularRadio::CODE TelitRadio::setRadioNetworkMode(RADIO_NETWORK_MODE mode)
{
std::string value;
switch (mode) {
- case ICellularRadio::RADIOMODE_GSM_ONLY: value = "12"; break;
- case ICellularRadio::RADIOMODE_UMTS_ONLY: value = "22"; break;
- case ICellularRadio::RADIOMODE_AUTO: value = "25"; break;
+ case ICellularRadio::RADIO_NETWORK_MODE_GSM_ONLY: value = "12"; break;
+ case ICellularRadio::RADIO_NETWORK_MODE_UMTS_ONLY: value = "22"; break;
+ case ICellularRadio::RADIO_NETWORK_MODE_AUTO: value = "25"; break;
default: return FAILURE;
}
std::string sCmd("AT+WS46=");
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-24 09:18:17 +0000