From 9116cee5590b974ed1b4ff78bcd27c5c7e35512e Mon Sep 17 00:00:00 2001 From: cabrol Date: Wed, 7 Jun 2023 13:38:28 +0200 Subject: [PATCH] Duplicated message id is not tolerated * remove one of the RXM-PMREQ commands Signed-off-by: cabrol --- lang/cpp/src/messages/ACK.cpp | 2 +- lang/cpp/src/messages/ACK.hpp | 2 +- lang/cpp/src/messages/CFG.cpp | 2 +- lang/cpp/src/messages/CFG.hpp | 2 +- lang/cpp/src/messages/ESF.cpp | 2 +- lang/cpp/src/messages/ESF.hpp | 2 +- lang/cpp/src/messages/LOG.cpp | 2 +- lang/cpp/src/messages/LOG.hpp | 2 +- lang/cpp/src/messages/MGA.cpp | 2 +- lang/cpp/src/messages/MGA.hpp | 2 +- lang/cpp/src/messages/MON.cpp | 2 +- lang/cpp/src/messages/MON.hpp | 2 +- lang/cpp/src/messages/NAV.cpp | 2 +- lang/cpp/src/messages/NAV.hpp | 2 +- lang/cpp/src/messages/RXM.cpp | 40 ++++++++----------------- lang/cpp/src/messages/RXM.hpp | 51 ++++++++------------------------ lang/cpp/src/messages/TEST.cpp | 2 +- lang/cpp/src/messages/TEST.hpp | 2 +- lang/cpp/src/messages/TIM.cpp | 2 +- lang/cpp/src/messages/TIM.hpp | 2 +- lang/cpp/src/parseUbxMessage.cpp | 7 +---- lang/cpp/src/parseUbxMessage.hpp | 2 +- ubx/UBX/RXM.py | 10 ------- 23 files changed, 44 insertions(+), 102 deletions(-) diff --git a/lang/cpp/src/messages/ACK.cpp b/lang/cpp/src/messages/ACK.cpp index d99186a..beb03a7 100644 --- a/lang/cpp/src/messages/ACK.cpp +++ b/lang/cpp/src/messages/ACK.cpp @@ -1,5 +1,5 @@ // File lang/cpp/src/messages/ACK.cpp -// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T12:40:39.296368 +// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T13:38:14.186856 // See https://github.com/mayeranalytics/pyUBX // DO NOT MODIFY THIS FILE! diff --git a/lang/cpp/src/messages/ACK.hpp b/lang/cpp/src/messages/ACK.hpp index f6cb58f..b4e5fbf 100644 --- a/lang/cpp/src/messages/ACK.hpp +++ b/lang/cpp/src/messages/ACK.hpp @@ -1,5 +1,5 @@ // File lang/cpp/src/messages/ACK.hpp -// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T12:40:39.295852 +// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T13:38:14.186296 // See https://github.com/mayeranalytics/pyUBX // DO NOT MODIFY THIS FILE! diff --git a/lang/cpp/src/messages/CFG.cpp b/lang/cpp/src/messages/CFG.cpp index 0b3f9e5..35a2ee0 100644 --- a/lang/cpp/src/messages/CFG.cpp +++ b/lang/cpp/src/messages/CFG.cpp @@ -1,5 +1,5 @@ // File lang/cpp/src/messages/CFG.cpp -// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T12:40:39.298573 +// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T13:38:14.189260 // See https://github.com/mayeranalytics/pyUBX // DO NOT MODIFY THIS FILE! diff --git a/lang/cpp/src/messages/CFG.hpp b/lang/cpp/src/messages/CFG.hpp index fe1eaf6..1a581c9 100644 --- a/lang/cpp/src/messages/CFG.hpp +++ b/lang/cpp/src/messages/CFG.hpp @@ -1,5 +1,5 @@ // File lang/cpp/src/messages/CFG.hpp -// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T12:40:39.296661 +// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T13:38:14.187228 // See https://github.com/mayeranalytics/pyUBX // DO NOT MODIFY THIS FILE! diff --git a/lang/cpp/src/messages/ESF.cpp b/lang/cpp/src/messages/ESF.cpp index 3d5b959..08595dc 100644 --- a/lang/cpp/src/messages/ESF.cpp +++ b/lang/cpp/src/messages/ESF.cpp @@ -1,5 +1,5 @@ // File lang/cpp/src/messages/ESF.cpp -// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T12:40:39.300739 +// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T13:38:14.191321 // See https://github.com/mayeranalytics/pyUBX // DO NOT MODIFY THIS FILE! diff --git a/lang/cpp/src/messages/ESF.hpp b/lang/cpp/src/messages/ESF.hpp index a73fee3..0bd6e0a 100644 --- a/lang/cpp/src/messages/ESF.hpp +++ b/lang/cpp/src/messages/ESF.hpp @@ -1,5 +1,5 @@ // File lang/cpp/src/messages/ESF.hpp -// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T12:40:39.300282 +// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T13:38:14.190985 // See https://github.com/mayeranalytics/pyUBX // DO NOT MODIFY THIS FILE! diff --git a/lang/cpp/src/messages/LOG.cpp b/lang/cpp/src/messages/LOG.cpp index 016123b..f3b8cc0 100644 --- a/lang/cpp/src/messages/LOG.cpp +++ b/lang/cpp/src/messages/LOG.cpp @@ -1,5 +1,5 @@ // File lang/cpp/src/messages/LOG.cpp -// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T12:40:39.302028 +// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T13:38:14.192858 // See https://github.com/mayeranalytics/pyUBX // DO NOT MODIFY THIS FILE! diff --git a/lang/cpp/src/messages/LOG.hpp b/lang/cpp/src/messages/LOG.hpp index ad9071a..83b2dd4 100644 --- a/lang/cpp/src/messages/LOG.hpp +++ b/lang/cpp/src/messages/LOG.hpp @@ -1,5 +1,5 @@ // File lang/cpp/src/messages/LOG.hpp -// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T12:40:39.301002 +// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T13:38:14.191586 // See https://github.com/mayeranalytics/pyUBX // DO NOT MODIFY THIS FILE! diff --git a/lang/cpp/src/messages/MGA.cpp b/lang/cpp/src/messages/MGA.cpp index a754c7d..a82e2ab 100644 --- a/lang/cpp/src/messages/MGA.cpp +++ b/lang/cpp/src/messages/MGA.cpp @@ -1,5 +1,5 @@ // File lang/cpp/src/messages/MGA.cpp -// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T12:40:39.303679 +// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T13:38:14.194355 // See https://github.com/mayeranalytics/pyUBX // DO NOT MODIFY THIS FILE! diff --git a/lang/cpp/src/messages/MGA.hpp b/lang/cpp/src/messages/MGA.hpp index 55c3eee..e1a7ac0 100644 --- a/lang/cpp/src/messages/MGA.hpp +++ b/lang/cpp/src/messages/MGA.hpp @@ -1,5 +1,5 @@ // File lang/cpp/src/messages/MGA.hpp -// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T12:40:39.302912 +// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T13:38:14.193760 // See https://github.com/mayeranalytics/pyUBX // DO NOT MODIFY THIS FILE! diff --git a/lang/cpp/src/messages/MON.cpp b/lang/cpp/src/messages/MON.cpp index 2f0291b..3935577 100644 --- a/lang/cpp/src/messages/MON.cpp +++ b/lang/cpp/src/messages/MON.cpp @@ -1,5 +1,5 @@ // File lang/cpp/src/messages/MON.cpp -// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T12:40:39.304788 +// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T13:38:14.195522 // See https://github.com/mayeranalytics/pyUBX // DO NOT MODIFY THIS FILE! diff --git a/lang/cpp/src/messages/MON.hpp b/lang/cpp/src/messages/MON.hpp index 21b0680..1d6fec7 100644 --- a/lang/cpp/src/messages/MON.hpp +++ b/lang/cpp/src/messages/MON.hpp @@ -1,5 +1,5 @@ // File lang/cpp/src/messages/MON.hpp -// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T12:40:39.304129 +// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T13:38:14.194813 // See https://github.com/mayeranalytics/pyUBX // DO NOT MODIFY THIS FILE! diff --git a/lang/cpp/src/messages/NAV.cpp b/lang/cpp/src/messages/NAV.cpp index e2afe98..6d608fe 100644 --- a/lang/cpp/src/messages/NAV.cpp +++ b/lang/cpp/src/messages/NAV.cpp @@ -1,5 +1,5 @@ // File lang/cpp/src/messages/NAV.cpp -// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T12:40:39.306677 +// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T13:38:14.197503 // See https://github.com/mayeranalytics/pyUBX // DO NOT MODIFY THIS FILE! diff --git a/lang/cpp/src/messages/NAV.hpp b/lang/cpp/src/messages/NAV.hpp index d987d99..47f7acd 100644 --- a/lang/cpp/src/messages/NAV.hpp +++ b/lang/cpp/src/messages/NAV.hpp @@ -1,5 +1,5 @@ // File lang/cpp/src/messages/NAV.hpp -// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T12:40:39.305465 +// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T13:38:14.196247 // See https://github.com/mayeranalytics/pyUBX // DO NOT MODIFY THIS FILE! diff --git a/lang/cpp/src/messages/RXM.cpp b/lang/cpp/src/messages/RXM.cpp index 7998424..4f0b1e7 100644 --- a/lang/cpp/src/messages/RXM.cpp +++ b/lang/cpp/src/messages/RXM.cpp @@ -1,5 +1,5 @@ // File lang/cpp/src/messages/RXM.cpp -// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T12:40:39.308685 +// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T13:38:14.199462 // See https://github.com/mayeranalytics/pyUBX // DO NOT MODIFY THIS FILE! @@ -75,7 +75,7 @@ std::string ubx::RXM::PMREQ::getMessageName(void) const { return std::string("PM std::string ubx::RXM::PMREQ::getDescription(void) const { std::stringstream ret; ret << "{\"classId\":" << std::to_string(getClassId()) << ",\"messageId\":" << std::to_string(getMessageId()) << ",\"classIdName\":\"" << getClassName() << "\",\"messageIdName\":\"" << getMessageName() << "\""; - ret << ", \"duration\":" << std::to_string(data.duration) << ", \"flags\":" << std::to_string(data.flags) << ", \"_flags\":{\"backup\":" << std::to_string(data.flags_backup()) << "}"; + ret << ", \"version\":" << std::to_string(data.version) << ", \"reserved1\":" << "0" << ", \"duration\":" << std::to_string(data.duration) << ", \"flags\":" << std::to_string(data.flags) << ", \"_flags\":{\"backup\":" << std::to_string(data.flags_backup()) << ", \"force\":" << std::to_string(data.flags_force()) << "}" << ", \"wakeupSources\":" << std::to_string(data.wakeupSources) << ", \"_wakeupSources\":{\"uartrx\":" << std::to_string(data.wakeupSources_uartrx()) << ", \"extint0\":" << std::to_string(data.wakeupSources_extint0()) << ", \"extint1\":" << std::to_string(data.wakeupSources_extint1()) << ", \"spics\":" << std::to_string(data.wakeupSources_spics()) << "}"; ret << "}"; return ret.str(); } @@ -84,33 +84,17 @@ uint16_t ubx::RXM::PMREQ::getDataSize(void) const { return sizeof(data); } void ubx::RXM::PMREQ::_data::flags_backup(uint8_t val){ UBX_CHANGE_VAR_BIT(flags, val, RXM_PMREQ_FLAGS_BACKUP_MASK, RXM_PMREQ_FLAGS_BACKUP_OFFSET); } uint8_t ubx::RXM::PMREQ::_data::flags_backup()const{ return UBX_GET_VAR_BIT(flags, RXM_PMREQ_FLAGS_BACKUP_MASK, RXM_PMREQ_FLAGS_BACKUP_OFFSET); } -uint8_t ubx::RXM::PMREQ2::getClassId(void) const { return ubx::RXM::classID; } -uint8_t ubx::RXM::PMREQ2::getMessageId(void) const { return messageID; } -const std::string &ubx::RXM::PMREQ2::getClassName(void) const { return classIDName; } -std::string ubx::RXM::PMREQ2::getMessageName(void) const { return std::string("PMREQ2"); }; -std::string ubx::RXM::PMREQ2::getDescription(void) const { - std::stringstream ret; - ret << "{\"classId\":" << std::to_string(getClassId()) << ",\"messageId\":" << std::to_string(getMessageId()) << ",\"classIdName\":\"" << getClassName() << "\",\"messageIdName\":\"" << getMessageName() << "\""; - ret << ", \"version\":" << std::to_string(data.version) << ", \"reserved1\":" << "0" << ", \"duration\":" << std::to_string(data.duration) << ", \"flags\":" << std::to_string(data.flags) << ", \"_flags\":{\"backup\":" << std::to_string(data.flags_backup()) << ", \"force\":" << std::to_string(data.flags_force()) << "}" << ", \"wakeupSources\":" << std::to_string(data.wakeupSources) << ", \"_wakeupSources\":{\"uartrx\":" << std::to_string(data.wakeupSources_uartrx()) << ", \"extint0\":" << std::to_string(data.wakeupSources_extint0()) << ", \"extint1\":" << std::to_string(data.wakeupSources_extint1()) << ", \"spics\":" << std::to_string(data.wakeupSources_spics()) << "}"; - ret << "}"; - return ret.str(); -} -uint8_t* ubx::RXM::PMREQ2::getDataStartAddress(void) const { return (uint8_t*)&data; } -uint16_t ubx::RXM::PMREQ2::getDataSize(void) const { return sizeof(data); } - -void ubx::RXM::PMREQ2::_data::flags_backup(uint8_t val){ UBX_CHANGE_VAR_BIT(flags, val, RXM_PMREQ2_FLAGS_BACKUP_MASK, RXM_PMREQ2_FLAGS_BACKUP_OFFSET); } -uint8_t ubx::RXM::PMREQ2::_data::flags_backup()const{ return UBX_GET_VAR_BIT(flags, RXM_PMREQ2_FLAGS_BACKUP_MASK, RXM_PMREQ2_FLAGS_BACKUP_OFFSET); } -void ubx::RXM::PMREQ2::_data::flags_force(uint8_t val){ UBX_CHANGE_VAR_BIT(flags, val, RXM_PMREQ2_FLAGS_FORCE_MASK, RXM_PMREQ2_FLAGS_FORCE_OFFSET); } -uint8_t ubx::RXM::PMREQ2::_data::flags_force()const{ return UBX_GET_VAR_BIT(flags, RXM_PMREQ2_FLAGS_FORCE_MASK, RXM_PMREQ2_FLAGS_FORCE_OFFSET); } +void ubx::RXM::PMREQ::_data::flags_force(uint8_t val){ UBX_CHANGE_VAR_BIT(flags, val, RXM_PMREQ_FLAGS_FORCE_MASK, RXM_PMREQ_FLAGS_FORCE_OFFSET); } +uint8_t ubx::RXM::PMREQ::_data::flags_force()const{ return UBX_GET_VAR_BIT(flags, RXM_PMREQ_FLAGS_FORCE_MASK, RXM_PMREQ_FLAGS_FORCE_OFFSET); } -void ubx::RXM::PMREQ2::_data::wakeupSources_uartrx(uint8_t val){ UBX_CHANGE_VAR_BIT(wakeupSources, val, RXM_PMREQ2_WAKEUPSOURCES_UARTRX_MASK, RXM_PMREQ2_WAKEUPSOURCES_UARTRX_OFFSET); } -uint8_t ubx::RXM::PMREQ2::_data::wakeupSources_uartrx()const{ return UBX_GET_VAR_BIT(wakeupSources, RXM_PMREQ2_WAKEUPSOURCES_UARTRX_MASK, RXM_PMREQ2_WAKEUPSOURCES_UARTRX_OFFSET); } -void ubx::RXM::PMREQ2::_data::wakeupSources_extint0(uint8_t val){ UBX_CHANGE_VAR_BIT(wakeupSources, val, RXM_PMREQ2_WAKEUPSOURCES_EXTINT0_MASK, RXM_PMREQ2_WAKEUPSOURCES_EXTINT0_OFFSET); } -uint8_t ubx::RXM::PMREQ2::_data::wakeupSources_extint0()const{ return UBX_GET_VAR_BIT(wakeupSources, RXM_PMREQ2_WAKEUPSOURCES_EXTINT0_MASK, RXM_PMREQ2_WAKEUPSOURCES_EXTINT0_OFFSET); } -void ubx::RXM::PMREQ2::_data::wakeupSources_extint1(uint8_t val){ UBX_CHANGE_VAR_BIT(wakeupSources, val, RXM_PMREQ2_WAKEUPSOURCES_EXTINT1_MASK, RXM_PMREQ2_WAKEUPSOURCES_EXTINT1_OFFSET); } -uint8_t ubx::RXM::PMREQ2::_data::wakeupSources_extint1()const{ return UBX_GET_VAR_BIT(wakeupSources, RXM_PMREQ2_WAKEUPSOURCES_EXTINT1_MASK, RXM_PMREQ2_WAKEUPSOURCES_EXTINT1_OFFSET); } -void ubx::RXM::PMREQ2::_data::wakeupSources_spics(uint8_t val){ UBX_CHANGE_VAR_BIT(wakeupSources, val, RXM_PMREQ2_WAKEUPSOURCES_SPICS_MASK, RXM_PMREQ2_WAKEUPSOURCES_SPICS_OFFSET); } -uint8_t ubx::RXM::PMREQ2::_data::wakeupSources_spics()const{ return UBX_GET_VAR_BIT(wakeupSources, RXM_PMREQ2_WAKEUPSOURCES_SPICS_MASK, RXM_PMREQ2_WAKEUPSOURCES_SPICS_OFFSET); } +void ubx::RXM::PMREQ::_data::wakeupSources_uartrx(uint8_t val){ UBX_CHANGE_VAR_BIT(wakeupSources, val, RXM_PMREQ_WAKEUPSOURCES_UARTRX_MASK, RXM_PMREQ_WAKEUPSOURCES_UARTRX_OFFSET); } +uint8_t ubx::RXM::PMREQ::_data::wakeupSources_uartrx()const{ return UBX_GET_VAR_BIT(wakeupSources, RXM_PMREQ_WAKEUPSOURCES_UARTRX_MASK, RXM_PMREQ_WAKEUPSOURCES_UARTRX_OFFSET); } +void ubx::RXM::PMREQ::_data::wakeupSources_extint0(uint8_t val){ UBX_CHANGE_VAR_BIT(wakeupSources, val, RXM_PMREQ_WAKEUPSOURCES_EXTINT0_MASK, RXM_PMREQ_WAKEUPSOURCES_EXTINT0_OFFSET); } +uint8_t ubx::RXM::PMREQ::_data::wakeupSources_extint0()const{ return UBX_GET_VAR_BIT(wakeupSources, RXM_PMREQ_WAKEUPSOURCES_EXTINT0_MASK, RXM_PMREQ_WAKEUPSOURCES_EXTINT0_OFFSET); } +void ubx::RXM::PMREQ::_data::wakeupSources_extint1(uint8_t val){ UBX_CHANGE_VAR_BIT(wakeupSources, val, RXM_PMREQ_WAKEUPSOURCES_EXTINT1_MASK, RXM_PMREQ_WAKEUPSOURCES_EXTINT1_OFFSET); } +uint8_t ubx::RXM::PMREQ::_data::wakeupSources_extint1()const{ return UBX_GET_VAR_BIT(wakeupSources, RXM_PMREQ_WAKEUPSOURCES_EXTINT1_MASK, RXM_PMREQ_WAKEUPSOURCES_EXTINT1_OFFSET); } +void ubx::RXM::PMREQ::_data::wakeupSources_spics(uint8_t val){ UBX_CHANGE_VAR_BIT(wakeupSources, val, RXM_PMREQ_WAKEUPSOURCES_SPICS_MASK, RXM_PMREQ_WAKEUPSOURCES_SPICS_OFFSET); } +uint8_t ubx::RXM::PMREQ::_data::wakeupSources_spics()const{ return UBX_GET_VAR_BIT(wakeupSources, RXM_PMREQ_WAKEUPSOURCES_SPICS_MASK, RXM_PMREQ_WAKEUPSOURCES_SPICS_OFFSET); } uint8_t ubx::RXM::RAWX::getClassId(void) const { return ubx::RXM::classID; } uint8_t ubx::RXM::RAWX::getMessageId(void) const { return messageID; } const std::string &ubx::RXM::RAWX::getClassName(void) const { return classIDName; } diff --git a/lang/cpp/src/messages/RXM.hpp b/lang/cpp/src/messages/RXM.hpp index 18a7ec2..b935b42 100644 --- a/lang/cpp/src/messages/RXM.hpp +++ b/lang/cpp/src/messages/RXM.hpp @@ -1,5 +1,5 @@ // File lang/cpp/src/messages/RXM.hpp -// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T12:40:39.307741 +// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T13:38:14.198572 // See https://github.com/mayeranalytics/pyUBX // DO NOT MODIFY THIS FILE! @@ -147,6 +147,17 @@ struct __attribute__((packed)) MEASX : public SerializeCommon #define RXM_PMREQ_FLAGS_BACKUP_OFFSET (1) #define RXM_PMREQ_FLAGS_BACKUP_MASK (2) +#define RXM_PMREQ_FLAGS_FORCE_OFFSET (2) +#define RXM_PMREQ_FLAGS_FORCE_MASK (4) + +#define RXM_PMREQ_WAKEUPSOURCES_UARTRX_OFFSET (3) +#define RXM_PMREQ_WAKEUPSOURCES_UARTRX_MASK (8) +#define RXM_PMREQ_WAKEUPSOURCES_EXTINT0_OFFSET (5) +#define RXM_PMREQ_WAKEUPSOURCES_EXTINT0_MASK (32) +#define RXM_PMREQ_WAKEUPSOURCES_EXTINT1_OFFSET (6) +#define RXM_PMREQ_WAKEUPSOURCES_EXTINT1_MASK (64) +#define RXM_PMREQ_WAKEUPSOURCES_SPICS_OFFSET (7) +#define RXM_PMREQ_WAKEUPSOURCES_SPICS_MASK (128) /* Power management request */ struct __attribute__((packed)) PMREQ : public SerializeCommon @@ -161,44 +172,6 @@ struct __attribute__((packed)) PMREQ : public SerializeCommon static constexpr uint8_t messageID = 65; - struct __attribute__((packed)) _data { - uint32_t duration; - uint32_t flags; - - - void flags_backup(uint8_t val); - uint8_t flags_backup() const; - } data; -}; - - -#define RXM_PMREQ2_FLAGS_BACKUP_OFFSET (1) -#define RXM_PMREQ2_FLAGS_BACKUP_MASK (2) -#define RXM_PMREQ2_FLAGS_FORCE_OFFSET (2) -#define RXM_PMREQ2_FLAGS_FORCE_MASK (4) - -#define RXM_PMREQ2_WAKEUPSOURCES_UARTRX_OFFSET (3) -#define RXM_PMREQ2_WAKEUPSOURCES_UARTRX_MASK (8) -#define RXM_PMREQ2_WAKEUPSOURCES_EXTINT0_OFFSET (5) -#define RXM_PMREQ2_WAKEUPSOURCES_EXTINT0_MASK (32) -#define RXM_PMREQ2_WAKEUPSOURCES_EXTINT1_OFFSET (6) -#define RXM_PMREQ2_WAKEUPSOURCES_EXTINT1_MASK (64) -#define RXM_PMREQ2_WAKEUPSOURCES_SPICS_OFFSET (7) -#define RXM_PMREQ2_WAKEUPSOURCES_SPICS_MASK (128) -/* Power management request - */ -struct __attribute__((packed)) PMREQ2 : public SerializeCommon -{ - virtual uint8_t getClassId(void) const override; - virtual uint8_t getMessageId(void) const override; - virtual const std::string &getClassName(void) const override; - virtual std::string getMessageName(void) const override; - virtual std::string getDescription(void) const override; - virtual uint8_t* getDataStartAddress(void) const override; - virtual uint16_t getDataSize(void) const override; - - static constexpr uint8_t messageID = 65; - struct __attribute__((packed)) _data { uint8_t version; uint8_t reserved1[3]; diff --git a/lang/cpp/src/messages/TEST.cpp b/lang/cpp/src/messages/TEST.cpp index 728169b..8ac96f5 100644 --- a/lang/cpp/src/messages/TEST.cpp +++ b/lang/cpp/src/messages/TEST.cpp @@ -1,5 +1,5 @@ // File lang/cpp/src/messages/TEST.cpp -// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T12:40:39.309824 +// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T13:38:14.200578 // See https://github.com/mayeranalytics/pyUBX // DO NOT MODIFY THIS FILE! diff --git a/lang/cpp/src/messages/TEST.hpp b/lang/cpp/src/messages/TEST.hpp index 6647c7e..d78b2e5 100644 --- a/lang/cpp/src/messages/TEST.hpp +++ b/lang/cpp/src/messages/TEST.hpp @@ -1,5 +1,5 @@ // File lang/cpp/src/messages/TEST.hpp -// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T12:40:39.309493 +// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T13:38:14.200245 // See https://github.com/mayeranalytics/pyUBX // DO NOT MODIFY THIS FILE! diff --git a/lang/cpp/src/messages/TIM.cpp b/lang/cpp/src/messages/TIM.cpp index 32f2036..93b2fff 100644 --- a/lang/cpp/src/messages/TIM.cpp +++ b/lang/cpp/src/messages/TIM.cpp @@ -1,5 +1,5 @@ // File lang/cpp/src/messages/TIM.cpp -// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T12:40:39.310354 +// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T13:38:14.201122 // See https://github.com/mayeranalytics/pyUBX // DO NOT MODIFY THIS FILE! diff --git a/lang/cpp/src/messages/TIM.hpp b/lang/cpp/src/messages/TIM.hpp index f931638..b314e7c 100644 --- a/lang/cpp/src/messages/TIM.hpp +++ b/lang/cpp/src/messages/TIM.hpp @@ -1,5 +1,5 @@ // File lang/cpp/src/messages/TIM.hpp -// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T12:40:39.310074 +// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T13:38:14.200836 // See https://github.com/mayeranalytics/pyUBX // DO NOT MODIFY THIS FILE! diff --git a/lang/cpp/src/parseUbxMessage.cpp b/lang/cpp/src/parseUbxMessage.cpp index 49ddd60..6b1f91b 100644 --- a/lang/cpp/src/parseUbxMessage.cpp +++ b/lang/cpp/src/parseUbxMessage.cpp @@ -1,5 +1,5 @@ // File lang/cpp/src/parseUbxMessage.cpp -// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T12:40:39.310776 +// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T13:38:14.201552 // See https://github.com/mayeranalytics/pyUBX // DO NOT MODIFY THIS FILE! #include @@ -335,11 +335,6 @@ std::shared_ptr ParseUbxMessage::createUbx(const uint8_t *buf, ret = shared_ptr(new RXM::PMREQ); break; } - case RXM::PMREQ2::messageID: // Message RXM-PMREQ2 - { - ret = shared_ptr(new RXM::PMREQ2); - break; - } case RXM::RAWX::messageID: // Message RXM-RAWX { ret = shared_ptr(new RXM::RAWX); diff --git a/lang/cpp/src/parseUbxMessage.hpp b/lang/cpp/src/parseUbxMessage.hpp index 79b2d71..ace1b08 100644 --- a/lang/cpp/src/parseUbxMessage.hpp +++ b/lang/cpp/src/parseUbxMessage.hpp @@ -1,5 +1,5 @@ // File lang/cpp/src/parseUbxMessage.hpp -// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T12:40:39.310583 +// Auto-generated by pyUBX generateCPP.py v0.2 on 2023-06-07T13:38:14.201354 // See https://github.com/mayeranalytics/pyUBX // DO NOT MODIFY THIS FILE! diff --git a/ubx/UBX/RXM.py b/ubx/UBX/RXM.py index 66c12cd..92888e5 100644 --- a/ubx/UBX/RXM.py +++ b/ubx/UBX/RXM.py @@ -56,16 +56,6 @@ class Fields: pass class PMREQ: - u"""Power management request""" - - _id = 0x41 - - class Fields: - duration = U4(1) - flags = X4(2,bitfield={ - "backup": 1}) - - class PMREQ2: """Power management request""" _id = 0x41