BicycleSpeed: DataPages: Refactor Manufacturer ID

Move to new data API

Author: cujomalainey

src/Profiles/BicycleSpeed/ANTPLUS_BicycleSpeedPrivateDefines.h

@@ -36,10 +36,8 @@
 #define ANTPLUS_BICYCLESPEED_DATAPAGE_MANUFACTURERID_NUMBER 2
 
 #define ANTPLUS_BICYCLESPEED_DATAPAGE_MANUFACTURERINFORMATION_MANUFACTUREREID_BYTE 1
-#define ANTPLUS_BICYCLESPEED_DATAPAGE_MANUFACTURERINFORMATION_SERIALNUMBERLSB_BYTE 2
-#define ANTPLUS_BICYCLESPEED_DATAPAGE_MANUFACTURERINFORMATION_SERIALNUMBERMSB_BYTE 3
-
-#define ANTPLUS_BICYCLESPEED_DATAPAGE_MANUFACTURERINFORMATION_SERIALNUMBERMSB_SHIFT 8
+#define ANTPLUS_BICYCLESPEED_DATAPAGE_MANUFACTURERINFORMATION_SERIALNUMBER_LSB_BYTE 2
+#define ANTPLUS_BICYCLESPEED_DATAPAGE_MANUFACTURERINFORMATION_SERIALNUMBER_MSB_BYTE 3
 
 /* Product ID */
 #define ANTPLUS_BICYCLESPEED_DATAPAGE_PRODUCTID_NUMBER 3

src/Profiles/BicycleSpeed/DataPages/Base/ANTPLUS_BicycleSpeedBaseManufacturerID.cpp

@@ -0,0 +1,22 @@
+#include <Profiles/BicycleSpeed/DataPages/Base/ANTPLUS_BicycleSpeedBaseManufacturerID.h>
+#include <Profiles/BicycleSpeed/ANTPLUS_BicycleSpeedPrivateDefines.h>
+
+template<class T>
+BicycleSpeedBaseManufacturerID<T>::BicycleSpeedBaseManufacturerID() : CoreDataPage<T>() {
+}
+
+template<class T>
+uint8_t BicycleSpeedBaseManufacturerID<T>::getManufacturerId() {
+ return this->get8BitValue(
+ ANTPLUS_BICYCLESPEED_DATAPAGE_MANUFACTURERINFORMATION_MANUFACTUREREID_BYTE);
+}
+
+template<class T>
+uint16_t BicycleSpeedBaseManufacturerID<T>::getSerialNumber() {
+ return this->get16BitValue(
+ ANTPLUS_BICYCLESPEED_DATAPAGE_MANUFACTURERINFORMATION_SERIALNUMBER_LSB_BYTE,
+ ANTPLUS_BICYCLESPEED_DATAPAGE_MANUFACTURERINFORMATION_SERIALNUMBER_MSB_BYTE);
+}
+
+template class BicycleSpeedBaseManufacturerID<BroadcastData>;
+template class BicycleSpeedBaseManufacturerID<BroadcastDataMsg>;

src/Profiles/BicycleSpeed/DataPages/Base/ANTPLUS_BicycleSpeedBaseManufacturerID.h

@@ -0,0 +1,16 @@
+#ifndef ANTPLUS_BICYCLESPEEDBASEMANUFACTURERID_h
+#define ANTPLUS_BICYCLESPEEDBASEMANUFACTURERID_h
+
+#include <BaseClasses/ANTPLUS_CoreDataPage.h>
+
+#include "ANT.h"
+
+template<class T>
+class BicycleSpeedBaseManufacturerID : virtual public CoreDataPage<T> {
+public:
+ BicycleSpeedBaseManufacturerID();
+ uint8_t getManufacturerId();
+ uint16_t getSerialNumber();
+};
+
+#endif // ANTPLUS_BICYCLESPEEDBASEMANUFACTURERID_h

src/Profiles/BicycleSpeed/DataPages/RX/ANTPLUS_BicycleSpeedDefault.cpp

@@ -1,5 +1,4 @@
 #include <Profiles/BicycleSpeed/DataPages/RX/ANTPLUS_BicycleSpeedDefault.h>
 
 BicycleSpeedDefault::BicycleSpeedDefault(AntRxDataResponse& dp) : BicycleSpeedBaseMainDataPage(dp) {
-
 }

src/Profiles/BicycleSpeed/DataPages/RX/ANTPLUS_BicycleSpeedManufacturerID.cpp

@@ -1,14 +1,5 @@
 #include <Profiles/BicycleSpeed/DataPages/RX/ANTPLUS_BicycleSpeedManufacturerID.h>
 #include <Profiles/BicycleSpeed/ANTPLUS_BicycleSpeedPrivateDefines.h>
 
-BicycleSpeedManufacturerID::BicycleSpeedManufacturerID(AntRxDataResponse& dp) : BicycleSpeedBaseMainDataPage(dp) {
-
-}
-
-uint8_t BicycleSpeedManufacturerID::getManufacturerId() {
- return getData(ANTPLUS_BICYCLESPEED_DATAPAGE_MANUFACTURERINFORMATION_MANUFACTUREREID_BYTE);
-}
-
-uint16_t BicycleSpeedManufacturerID::getSerialNumber() {
- return getData(ANTPLUS_BICYCLESPEED_DATAPAGE_MANUFACTURERINFORMATION_SERIALNUMBERLSB_BYTE) | (getData(ANTPLUS_BICYCLESPEED_DATAPAGE_MANUFACTURERINFORMATION_SERIALNUMBERMSB_BYTE) << ANTPLUS_BICYCLESPEED_DATAPAGE_MANUFACTURERINFORMATION_SERIALNUMBERMSB_SHIFT);
+BicycleSpeedManufacturerID::BicycleSpeedManufacturerID(AntRxDataResponse& dp) : BicycleSpeedBaseMainDataPage(dp), BicycleSpeedBaseManufacturerID<BroadcastData>() {
 }

src/Profiles/BicycleSpeed/DataPages/RX/ANTPLUS_BicycleSpeedManufacturerID.h

@@ -2,12 +2,11 @@
 #define ANTPLUS_BICYCLESPEEDMANUFACTURERID_h
 
 #include <Profiles/BicycleSpeed/DataPages/Base/ANTPLUS_BicycleSpeedBaseMainDataPage.h>
+#include <Profiles/BicycleSpeed/DataPages/Base/ANTPLUS_BicycleSpeedBaseManufacturerID.h>
 
-class BicycleSpeedManufacturerID : public BicycleSpeedBaseMainDataPage {
+class BicycleSpeedManufacturerID : public BicycleSpeedBaseMainDataPage, public BicycleSpeedBaseManufacturerID<BroadcastData> {
 public:
  BicycleSpeedManufacturerID(AntRxDataResponse& dp);
- uint8_t getManufacturerId();
- uint16_t getSerialNumber();
 };
 
 #endif // ANTPLUS_BICYCLESPEEDMANUFACTURERID_h