commont datapages: fix request page field mismatch

cujomalainey · Jan 30, 2022 · a11eb36 · a11eb36
1 parent fde4230
commit a11eb36
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/BaseClasses/ANTPLUS_BaseMasterProfile.cpp b/src/BaseClasses/ANTPLUS_BaseMasterProfile.cpp
@@ -31,9 +31,9 @@ void BaseMasterProfile::handleRequestDataPage(AcknowledgedData& msg) {
  // Datapage requested isn't supported, don't do anything
  return;
  }
- _requestedCount = dp.getRequestedPageCount();
+ _requestedCount = dp.getRequestedTransmissionResponseCount();
  _requestedPage = dp.getRequestedPageNumber();
- _isRequestAcknowledged = dp.getUseAcknowledgedMsgs();
+ _isRequestAcknowledged = dp.getRequestedTransmissionUseAcknowledged();
  _requestAcked = !dp.transmitTillAcknowledged();
  // TODO handle command type
 }

diff --git a/src/CommonDataPages/ANTPLUS_RequestDataPage.cpp b/src/CommonDataPages/ANTPLUS_RequestDataPage.cpp
@@ -36,14 +36,14 @@ uint8_t BaseRequestDataPage<T>::getDescriptorByte2() {
 }
 
 template<class T>
-uint8_t BaseRequestDataPage<T>::getRequestedPageCount() {
+uint8_t BaseRequestDataPage<T>::getRequestedTransmissionResponseCount() {
  return this->get8BitValue(
  REQUESTEDTRANSMISSIONRESPONSE_BYTE,
  REQUESTEDTRANSMISSIONRESPONSE_COUNT_MASK);
 }
 
 template<class T>
-uint8_t BaseRequestDataPage<T>::getUseAcknowledgedMsgs() {
+uint8_t BaseRequestDataPage<T>::getRequestedTransmissionUseAcknowledged() {
  return this->get8BitValue(
  REQUESTEDTRANSMISSIONRESPONSE_BYTE,
  REQUESTEDTRANSMISSIONRESPONSE_USEACKNOWLEDGED_MASK,

diff --git a/src/CommonDataPages/ANTPLUS_RequestDataPage.h b/src/CommonDataPages/ANTPLUS_RequestDataPage.h
@@ -13,8 +13,8 @@ class BaseRequestDataPage : virtual public CoreDataPage<T> {
  uint16_t getSlaveSerialNumber();
  uint8_t getDescriptorByte1();
  uint8_t getDescriptorByte2();
- uint8_t getRequestedPageCount();
- uint8_t getUseAcknowledgedMsgs();
+ uint8_t getRequestedTransmissionResponseCount();
+ uint8_t getRequestedTransmissionUseAcknowledged();
  uint8_t transmitTillAcknowledged();
  uint8_t getRequestedPageNumber();
  uint8_t getCommandType();