From 050834e3cdd0f5f56ba15b09ca568ac6312c7699 Mon Sep 17 00:00:00 2001 From: sdesai Date: Wed, 15 Mar 2023 15:22:04 -0500 Subject: GP-139:Support Portal Case #5086148: use Cellular Radio timeas alternative to GPS or NTP --- include/mts/MTS_IO_ICellularRadio.h | 2 +- include/mts/MTS_IO_QuectelRadio.h | 2 +- include/mts/MTS_IO_SequansRadio.h | 2 +- include/mts/MTS_IO_TelitRadio.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'include/mts') diff --git a/include/mts/MTS_IO_ICellularRadio.h b/include/mts/MTS_IO_ICellularRadio.h index 0523236..da8e130 100644 --- a/include/mts/MTS_IO_ICellularRadio.h +++ b/include/mts/MTS_IO_ICellularRadio.h @@ -717,7 +717,7 @@ namespace MTS { * CODE::FAILURE otherwise. */ virtual CODE getDiagnostics(std::string& sDiagReport) = 0; - + virtual CODE getTimeUTC(void) = 0; }; } } diff --git a/include/mts/MTS_IO_QuectelRadio.h b/include/mts/MTS_IO_QuectelRadio.h index 4315cb3..7015acb 100644 --- a/include/mts/MTS_IO_QuectelRadio.h +++ b/include/mts/MTS_IO_QuectelRadio.h @@ -86,7 +86,7 @@ namespace MTS { CODE setRxDiversity(const Json::Value& jArgs) override; const std::vector& getDiagCommands(bool bIsSimReady = true) override; - + CODE getTimeUTC(void) override; private: // private variable to save old firmware versions during FOTA std::string m_sQuectelFirmware; diff --git a/include/mts/MTS_IO_SequansRadio.h b/include/mts/MTS_IO_SequansRadio.h index 11f2c91..d61ae67 100644 --- a/include/mts/MTS_IO_SequansRadio.h +++ b/include/mts/MTS_IO_SequansRadio.h @@ -49,7 +49,7 @@ namespace MTS { CODE setRxDiversity(const Json::Value& jArgs) override; const std::vector getRegistrationCommands() override; - + CODE getTimeUTC(void) override; protected: SequansRadio(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 d198969..01897ac 100644 --- a/include/mts/MTS_IO_TelitRadio.h +++ b/include/mts/MTS_IO_TelitRadio.h @@ -51,7 +51,7 @@ namespace MTS { CODE fumoLocalApply(UpdateCb& stepCb) override; CODE getSelectedBandsRaw(std::string& sRawBands) override; - + CODE getTimeUTC(void) override; protected: TelitRadio(const std::string& sName, const std::string& sRadioPort); -- cgit v1.2.3 From 8fce7442bbc63b744905f9febc21aad9cf5074fd Mon Sep 17 00:00:00 2001 From: sdesai Date: Mon, 20 Mar 2023 14:32:37 -0500 Subject: Support Portal Case #5086148: use Cellular Radio timeas alternative to GPS or NTP --- include/mts/MTS_IO_CellularRadio.h | 1 + include/mts/MTS_IO_ICellularRadio.h | 1 - include/mts/MTS_IO_QuectelRadio.h | 2 +- include/mts/MTS_IO_SequansRadio.h | 3 ++- include/mts/MTS_IO_TelitRadio.h | 3 +-- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'include/mts') diff --git a/include/mts/MTS_IO_CellularRadio.h b/include/mts/MTS_IO_CellularRadio.h index 68c1394..0af531b 100644 --- a/include/mts/MTS_IO_CellularRadio.h +++ b/include/mts/MTS_IO_CellularRadio.h @@ -277,6 +277,7 @@ namespace MTS { * @return the list of AT commands (strings). */ virtual const std::vector& getDiagCommands(bool bIsSimReady = true) = 0; + virtual CODE setTimeFormat () = 0; class RadioBandMap : public MTS::NonCopyable { public: diff --git a/include/mts/MTS_IO_ICellularRadio.h b/include/mts/MTS_IO_ICellularRadio.h index da8e130..d5b5f18 100644 --- a/include/mts/MTS_IO_ICellularRadio.h +++ b/include/mts/MTS_IO_ICellularRadio.h @@ -717,7 +717,6 @@ namespace MTS { * CODE::FAILURE otherwise. */ virtual CODE getDiagnostics(std::string& sDiagReport) = 0; - virtual CODE getTimeUTC(void) = 0; }; } } diff --git a/include/mts/MTS_IO_QuectelRadio.h b/include/mts/MTS_IO_QuectelRadio.h index 7015acb..a8d37f2 100644 --- a/include/mts/MTS_IO_QuectelRadio.h +++ b/include/mts/MTS_IO_QuectelRadio.h @@ -86,7 +86,7 @@ namespace MTS { CODE setRxDiversity(const Json::Value& jArgs) override; const std::vector& getDiagCommands(bool bIsSimReady = true) override; - CODE getTimeUTC(void) override; + CODE setTimeFormat() override; private: // private variable to save old firmware versions during FOTA std::string m_sQuectelFirmware; diff --git a/include/mts/MTS_IO_SequansRadio.h b/include/mts/MTS_IO_SequansRadio.h index d61ae67..30f4875 100644 --- a/include/mts/MTS_IO_SequansRadio.h +++ b/include/mts/MTS_IO_SequansRadio.h @@ -49,7 +49,7 @@ namespace MTS { CODE setRxDiversity(const Json::Value& jArgs) override; const std::vector getRegistrationCommands() override; - CODE getTimeUTC(void) override; + protected: SequansRadio(const std::string& sName, const std::string& sRadioPort); @@ -57,6 +57,7 @@ namespace MTS { CODE getSimLockAttempts(int& iAttemptsPin, int& iAttemptsPuk) override; const std::vector& getDiagCommands(bool bIsSimReady = true) override; + virtual CODE setTimeFormat() override; private: /* diff --git a/include/mts/MTS_IO_TelitRadio.h b/include/mts/MTS_IO_TelitRadio.h index 01897ac..7011ef3 100644 --- a/include/mts/MTS_IO_TelitRadio.h +++ b/include/mts/MTS_IO_TelitRadio.h @@ -51,7 +51,6 @@ namespace MTS { CODE fumoLocalApply(UpdateCb& stepCb) override; CODE getSelectedBandsRaw(std::string& sRawBands) override; - CODE getTimeUTC(void) override; protected: TelitRadio(const std::string& sName, const std::string& sRadioPort); @@ -76,7 +75,7 @@ namespace MTS { const std::vector& getDiagCommands(bool bIsSimReady = true) override; static bool isContainsSignChar(const std::string& str); - + virtual CODE setTimeFormat() override; private: virtual CODE getSimLockAttempts(int& iAttemptsPin, int& iAttemptsPuk, const std::string& sLockStatus); ICellularRadio::CODE wdsList(std::set &wds); -- cgit v1.2.3 From 91c623896442013d82f59e6e06e70523e9046b8c Mon Sep 17 00:00:00 2001 From: sdesai Date: Thu, 23 Mar 2023 16:37:24 -0500 Subject: Support Portal Case #5086148: use Cellular Radio time as alternative to GPS or NTP --- include/mts/MTS_IO_CellularRadio.h | 2 +- include/mts/MTS_IO_QuectelRadio.h | 6 ++++++ include/mts/MTS_IO_SequansRadio.h | 4 +++- include/mts/MTS_IO_TelitRadio.h | 7 ++++++- 4 files changed, 16 insertions(+), 3 deletions(-) (limited to 'include/mts') diff --git a/include/mts/MTS_IO_CellularRadio.h b/include/mts/MTS_IO_CellularRadio.h index 0af531b..555a5a7 100644 --- a/include/mts/MTS_IO_CellularRadio.h +++ b/include/mts/MTS_IO_CellularRadio.h @@ -277,7 +277,7 @@ namespace MTS { * @return the list of AT commands (strings). */ virtual const std::vector& getDiagCommands(bool bIsSimReady = true) = 0; - virtual CODE setTimeFormat () = 0; + virtual CODE setTimeFormat() = 0; class RadioBandMap : public MTS::NonCopyable { public: diff --git a/include/mts/MTS_IO_QuectelRadio.h b/include/mts/MTS_IO_QuectelRadio.h index a8d37f2..5f1d70c 100644 --- a/include/mts/MTS_IO_QuectelRadio.h +++ b/include/mts/MTS_IO_QuectelRadio.h @@ -69,16 +69,21 @@ namespace MTS { QuectelRadio(const std::string& sName, const std::string& sRadioPort); CODE getIsSimInserted(bool& bData) override; + CODE getSimLockAttempts(int& iAttemptsPin, int& iAttemptsPuk) override; virtual CODE getServiceDomain(SERVICEDOMAIN& sd); + virtual CODE convertToActiveBand(const std::string& sQuectelBand, ACTIVEBAND& band); virtual CODE uploadFile(int fd, const std::string& sTargetFilename, UpdateCb& stepCb); + 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); static bool isContainsSignChar(const std::string& str); @@ -86,6 +91,7 @@ namespace MTS { CODE setRxDiversity(const Json::Value& jArgs) override; const std::vector& getDiagCommands(bool bIsSimReady = true) override; + CODE setTimeFormat() override; private: // private variable to save old firmware versions during FOTA diff --git a/include/mts/MTS_IO_SequansRadio.h b/include/mts/MTS_IO_SequansRadio.h index 30f4875..d3efda5 100644 --- a/include/mts/MTS_IO_SequansRadio.h +++ b/include/mts/MTS_IO_SequansRadio.h @@ -54,10 +54,12 @@ namespace MTS { SequansRadio(const std::string& sName, const std::string& sRadioPort); CODE getIsSimInserted(bool& bData) override; + CODE getSimLockAttempts(int& iAttemptsPin, int& iAttemptsPuk) override; const std::vector& getDiagCommands(bool bIsSimReady = true) override; - virtual CODE setTimeFormat() override; + + CODE setTimeFormat() override; private: /* diff --git a/include/mts/MTS_IO_TelitRadio.h b/include/mts/MTS_IO_TelitRadio.h index 7011ef3..dc8ece8 100644 --- a/include/mts/MTS_IO_TelitRadio.h +++ b/include/mts/MTS_IO_TelitRadio.h @@ -55,9 +55,11 @@ namespace MTS { TelitRadio(const std::string& sName, const std::string& sRadioPort); bool getCarrierFromFirmware(const std::string& sFirmware, std::string& sCarrier) override; + bool getHardwareVersionFromFirmware(const std::string& sFirmware, std::string& sHardware) override; CODE getIsSimInserted(bool& bData) override; + CODE getSimLockAttempts(int& iAttemptsPin, int& iAttemptsPuk) override; enum FOTA_GROUP : uint8_t { @@ -69,13 +71,16 @@ namespace MTS { }; virtual FOTA_GROUP getFotaGroup(); + virtual CODE fumoWriteGroupsABD(int fd, UpdateCb& stepCb); + //virtual CODE fumoWriteGroupC(int fd, UpdateCb& stepCb); const std::vector& getDiagCommands(bool bIsSimReady = true) override; static bool isContainsSignChar(const std::string& str); - virtual CODE setTimeFormat() override; + + CODE setTimeFormat() override; private: virtual CODE getSimLockAttempts(int& iAttemptsPin, int& iAttemptsPuk, const std::string& sLockStatus); ICellularRadio::CODE wdsList(std::set &wds); -- cgit v1.2.3 From a7c338b07cbdb706998ccead56673a3dd1cbdb0e Mon Sep 17 00:00:00 2001 From: sdesai Date: Thu, 23 Mar 2023 16:50:31 -0500 Subject: Support Portal Case #5086148: use Cellular Radio time as alternative to GPS or NTP --- include/mts/MTS_IO_CellularRadio.h | 1 + include/mts/MTS_IO_QuectelRadio.h | 1 + include/mts/MTS_IO_TelitRadio.h | 1 + 3 files changed, 3 insertions(+) (limited to 'include/mts') diff --git a/include/mts/MTS_IO_CellularRadio.h b/include/mts/MTS_IO_CellularRadio.h index 555a5a7..c2aa346 100644 --- a/include/mts/MTS_IO_CellularRadio.h +++ b/include/mts/MTS_IO_CellularRadio.h @@ -277,6 +277,7 @@ namespace MTS { * @return the list of AT commands (strings). */ virtual const std::vector& getDiagCommands(bool bIsSimReady = true) = 0; + virtual CODE setTimeFormat() = 0; class RadioBandMap : public MTS::NonCopyable { diff --git a/include/mts/MTS_IO_QuectelRadio.h b/include/mts/MTS_IO_QuectelRadio.h index 5f1d70c..b7796d9 100644 --- a/include/mts/MTS_IO_QuectelRadio.h +++ b/include/mts/MTS_IO_QuectelRadio.h @@ -93,6 +93,7 @@ namespace MTS { const std::vector& getDiagCommands(bool bIsSimReady = true) override; CODE setTimeFormat() override; + private: // private variable to save old firmware versions during FOTA std::string m_sQuectelFirmware; diff --git a/include/mts/MTS_IO_TelitRadio.h b/include/mts/MTS_IO_TelitRadio.h index dc8ece8..305a764 100644 --- a/include/mts/MTS_IO_TelitRadio.h +++ b/include/mts/MTS_IO_TelitRadio.h @@ -81,6 +81,7 @@ namespace MTS { static bool isContainsSignChar(const std::string& str); CODE setTimeFormat() override; + private: virtual CODE getSimLockAttempts(int& iAttemptsPin, int& iAttemptsPuk, const std::string& sLockStatus); ICellularRadio::CODE wdsList(std::set &wds); -- cgit v1.2.3 From 83344ddef6063f0bfcbb96dae171237eae5ca3ba Mon Sep 17 00:00:00 2001 From: sdesai Date: Fri, 24 Mar 2023 17:43:49 -0500 Subject: Support Portal Case #5086148: use Cellular Radio time as alternative to GPS or NTP --- include/mts/MTS_IO_SequansRadio.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/mts') diff --git a/include/mts/MTS_IO_SequansRadio.h b/include/mts/MTS_IO_SequansRadio.h index d3efda5..804d473 100644 --- a/include/mts/MTS_IO_SequansRadio.h +++ b/include/mts/MTS_IO_SequansRadio.h @@ -54,7 +54,6 @@ namespace MTS { SequansRadio(const std::string& sName, const std::string& sRadioPort); CODE getIsSimInserted(bool& bData) override; - CODE getSimLockAttempts(int& iAttemptsPin, int& iAttemptsPuk) override; const std::vector& getDiagCommands(bool bIsSimReady = true) override; -- cgit v1.2.3 From 5a0bc9dda829197048155380c3e344e28365aebc Mon Sep 17 00:00:00 2001 From: sdesai Date: Mon, 27 Mar 2023 09:00:20 -0500 Subject: Support Portal Case #5086148: use Cellular Radio time as alternative to GPS or NTP --- include/mts/MTS_IO_QuectelRadio.h | 5 ----- include/mts/MTS_IO_TelitRadio.h | 5 +---- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'include/mts') diff --git a/include/mts/MTS_IO_QuectelRadio.h b/include/mts/MTS_IO_QuectelRadio.h index b7796d9..8e75c12 100644 --- a/include/mts/MTS_IO_QuectelRadio.h +++ b/include/mts/MTS_IO_QuectelRadio.h @@ -69,21 +69,16 @@ namespace MTS { QuectelRadio(const std::string& sName, const std::string& sRadioPort); CODE getIsSimInserted(bool& bData) override; - CODE getSimLockAttempts(int& iAttemptsPin, int& iAttemptsPuk) override; virtual CODE getServiceDomain(SERVICEDOMAIN& sd); - virtual CODE convertToActiveBand(const std::string& sQuectelBand, ACTIVEBAND& band); virtual CODE uploadFile(int fd, const std::string& sTargetFilename, UpdateCb& stepCb); - 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); static bool isContainsSignChar(const std::string& str); diff --git a/include/mts/MTS_IO_TelitRadio.h b/include/mts/MTS_IO_TelitRadio.h index 305a764..d5e8bac 100644 --- a/include/mts/MTS_IO_TelitRadio.h +++ b/include/mts/MTS_IO_TelitRadio.h @@ -51,15 +51,14 @@ namespace MTS { CODE fumoLocalApply(UpdateCb& stepCb) override; CODE getSelectedBandsRaw(std::string& sRawBands) override; + protected: TelitRadio(const std::string& sName, const std::string& sRadioPort); bool getCarrierFromFirmware(const std::string& sFirmware, std::string& sCarrier) override; - bool getHardwareVersionFromFirmware(const std::string& sFirmware, std::string& sHardware) override; CODE getIsSimInserted(bool& bData) override; - CODE getSimLockAttempts(int& iAttemptsPin, int& iAttemptsPuk) override; enum FOTA_GROUP : uint8_t { @@ -71,9 +70,7 @@ namespace MTS { }; virtual FOTA_GROUP getFotaGroup(); - virtual CODE fumoWriteGroupsABD(int fd, UpdateCb& stepCb); - //virtual CODE fumoWriteGroupC(int fd, UpdateCb& stepCb); const std::vector& getDiagCommands(bool bIsSimReady = true) override; -- cgit v1.2.3