BicycleSpeed: DataPages: Refactor Motion and Speed

Move to new data API

Author: cujomalainey

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

@@ -0,0 +1,15 @@
+#include <Profiles/BicycleSpeed/DataPages/Base/ANTPLUS_BicycleSpeedBaseMotionAndSpeed.h>
+#include <Profiles/BicycleSpeed/ANTPLUS_BicycleSpeedPrivateDefines.h>
+
+template<class T>
+BicycleSpeedBaseMotionAndSpeed<T>::BicycleSpeedBaseMotionAndSpeed() : CoreDataPage<T>() {
+}
+
+template<class T>
+uint8_t BicycleSpeedBaseMotionAndSpeed<T>::getFlags() {
+ return this->get8BitValue(
+ ANTPLUS_BICYCLESPEED_DATAPAGE_MOTIONANDSPEED_FLAGS_BYTE);
+}
+
+template class BicycleSpeedBaseMotionAndSpeed<BroadcastData>;
+template class BicycleSpeedBaseMotionAndSpeed<BroadcastDataMsg>;

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

@@ -0,0 +1,15 @@
+#ifndef ANTPLUS_BICYCLESPEEDBASEMOTIONANDSPEED_h
+#define ANTPLUS_BICYCLESPEEDBASEMOTIONANDSPEED_h
+
+#include <BaseClasses/ANTPLUS_CoreDataPage.h>
+
+#include "ANT.h"
+
+template<class T>
+class BicycleSpeedBaseMotionAndSpeed : virtual public CoreDataPage<T> {
+public:
+ BicycleSpeedBaseMotionAndSpeed();
+ uint8_t getFlags();
+};
+
+#endif // ANTPLUS_BICYCLESPEEDBASEMOTIONANDSPEED_h

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

@@ -2,10 +2,4 @@
 #include <Profiles/BicycleSpeed/ANTPLUS_BicycleSpeedPrivateDefines.h>
 
 BicycleSpeedMotionAndSpeed::BicycleSpeedMotionAndSpeed(AntRxDataResponse& dp) : BicycleSpeedBaseMainDataPage(dp) {
-
-}
-
-uint8_t BicycleSpeedMotionAndSpeed::getFlags() {
- return getData(ANTPLUS_BICYCLESPEED_DATAPAGE_MOTIONANDSPEED_FLAGS_BYTE);
 }
-

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

@@ -2,11 +2,11 @@
 #define ANTPLUS_BICYCLESPEEDMOTIONANDSPEED_h
 
 #include <Profiles/BicycleSpeed/DataPages/Base/ANTPLUS_BicycleSpeedBaseMainDataPage.h>
+#include <Profiles/BicycleSpeed/DataPages/Base/ANTPLUS_BicycleSpeedBaseMotionAndSpeed.h>
 
-class BicycleSpeedMotionAndSpeed : public BicycleSpeedBaseMainDataPage {
+class BicycleSpeedMotionAndSpeed : public BicycleSpeedBaseMainDataPage, public BicycleSpeedBaseMotionAndSpeed<BroadcastData> {
 public:
  BicycleSpeedMotionAndSpeed(AntRxDataResponse& dp);
- uint8_t getFlags();
 };
 
 #endif // ANTPLUS_BICYCLESPEEDMOTIONANDSPEED_h