Restructure base profile channel config

Author: cujomalainey

src/ANTPLUS_PrivateDefines.h

@@ -1,10 +1,15 @@
 #ifndef ANTPLUS_PRIVATEDEFINES_h
 #define ANTPLUS_PRIVATEDEFINES_h
 
+/* Channel config stuff */
 #define ANTPLUS_CHANNEL_FREQUENCY 57
+#define ANTPLUS_DEVICENUMBER_WILDCARD 0
+#define ANTPLUS_TRANSMISSIONTYPE_WILDCARD 0
 
 #define ANTPLUS_DEFAULT_DATAPAGE_BYTE 0
 
 #define ANTPLUS_DEFAULT_BYTE_MASK 0xFF
 
+#define ANTPLUS_PAIRING_BIT_MASK 0x80
+
 #endif // ANTPLUS_PRIVATEDEFINES_h

src/BaseClasses/ANTPLUS_BaseMasterProfile.cpp

@@ -1,6 +1,6 @@
 #include <BaseClasses/ANTPLUS_BaseMasterProfile.h>
 
-BaseMasterProfile::BaseMasterProfile(uint16_t deviceNumber) : BaseProfile(deviceNumber) {
+BaseMasterProfile::BaseMasterProfile(uint16_t deviceNumber, uint8_t transmissionType) : BaseProfile(deviceNumber, transmissionType) {
 
 }
 

src/BaseClasses/ANTPLUS_BaseMasterProfile.h

@@ -5,7 +5,7 @@
 
 class BaseMasterProfile : public BaseProfile {
 public:
-    BaseMasterProfile(uint16_t deviceNumber);
+    BaseMasterProfile(uint16_t deviceNumber, uint8_t transmissionType);
     /******************************************
      *LIBRARY INTERNAL ONLY FUNCTIONS BELOW
      ******************************************/

src/BaseClasses/ANTPLUS_BaseProfile.cpp

@@ -1,8 +1,9 @@
 #include <BaseClasses/ANTPLUS_BaseProfile.h>
 #include <ANTPLUS_PrivateDefines.h>
 
-BaseProfile::BaseProfile(uint8_t deviceNumber) {
-
+BaseProfile::BaseProfile(uint16_t deviceNumber, uint8_t transmissionType) {
+    setDeviceNumber(deviceNumber);
+    setTransmissionType(transmissionType);
 }
 
 uint8_t BaseProfile::getChannelStatus() {
@@ -47,8 +48,7 @@ void BaseProfile::setChannelPeriod(uint16_t channelPeriod) {
 
 void BaseProfile::pushChannelConfig() {
     AssignChannel ac = AssignChannel(_channel, _channelType, ANTPLUS_NETWORKKEY_INDEX);
-    // TODO deal with magic numbers
-    ChannelId ci = ChannelId(_channel, _deviceNumber, _deviceType, 0x80 & _deviceType, _transmissionType);
+    ChannelId ci = ChannelId(_channel, _deviceNumber, _deviceType, ANTPLUS_PAIRING_BIT_MASK & _deviceType, _transmissionType);
     ChannelPeriod cp = ChannelPeriod(_channel, _channelPeriod);
     ChannelRfFrequency crf = ChannelRfFrequency(_channel, ANTPLUS_CHANNEL_FREQUENCY);
     SearchTimeout st = SearchTimeout(_channel, _searchTimeout);

src/BaseClasses/ANTPLUS_BaseProfile.h

@@ -9,9 +9,7 @@ class AntPlusRouter;
 
 class BaseProfile {
 public:
-    BaseProfile();
-    BaseProfile(uint8_t deviceNumber);
-    BaseProfile(uint8_t deviceNumber, uint8_t transmissionType);
+    BaseProfile(uint16_t deviceNumber, uint8_t transmissionType);
     /**
      * Called on every message incoming before any other predefined callback is called
      */
@@ -26,6 +24,7 @@ class BaseProfile {
      * Callback when an even on the radio occurs
      */
     void onChannelEvent(void (*func)(ChannelEventResponse&, uintptr_t), uintptr_t data = 0) { _onChannelEvent.set(func, data); }
+    // TODO on channel config change callback (used for when wildcarding to identify when actual information has been found)
     /**
      * Set the channel deviceNumber, wildcard for searching is 0
      */

src/BaseClasses/ANTPLUS_BaseSlaveProfile.cpp

@@ -1,5 +1,14 @@
 #include <BaseClasses/ANTPLUS_BaseSlaveProfile.h>
+#include <ANTPLUS_PrivateDefines.h>
 
-BaseSlaveProfile::BaseSlaveProfile(uint16_t deviceNumber) : BaseProfile(deviceNumber) {
+BaseSlaveProfile::BaseSlaveProfile() : BaseProfile(ANTPLUS_DEVICENUMBER_WILDCARD, ANTPLUS_TRANSMISSIONTYPE_WILDCARD) {
+
+}
+
+BaseSlaveProfile::BaseSlaveProfile(uint16_t deviceNumber) : BaseProfile(deviceNumber, ANTPLUS_TRANSMISSIONTYPE_WILDCARD) {
+
+}
+
+BaseSlaveProfile::BaseSlaveProfile(uint16_t deviceNumber, uint8_t transmissionType) : BaseProfile(deviceNumber, transmissionType) {
 
 }

src/BaseClasses/ANTPLUS_BaseSlaveProfile.h

@@ -7,6 +7,7 @@ class BaseSlaveProfile : public BaseProfile {
 public:
     BaseSlaveProfile();
     BaseSlaveProfile(uint16_t deviceNumber);
+    BaseSlaveProfile(uint16_t deviceNumber, uint8_t transmissionType);
 
 private:
 };

src/BaseClasses/ANTPLUS_CoreDataPage.cpp

@@ -1,4 +1,5 @@
 #include <BaseClasses/ANTPLUS_CoreDataPage.h>
+#include <ANTPLUS_PrivateDefines.h>
 
 #include "ANT.h"
 
@@ -9,9 +10,8 @@ CoreDataPage<T>::CoreDataPage() : T() {
 
 template<class T>
 uint8_t CoreDataPage<T>::getDataPageNumber() {
-    // TODO remove magic number
     // TODO handle shared channels
-    return this->getData(0);
+    return this->getData(ANTPLUS_DEFAULT_DATAPAGE_BYTE);
 }
 
 template class CoreDataPage<BroadcastData>;

src/Profiles/HeartRate/Monitor/ANTPLUS_ProfileHeartRateMonitor.h

@@ -11,6 +11,7 @@ class ProfileHeartRateMonitor : public BaseSlaveProfile {
 public:
     ProfileHeartRateMonitor();
     ProfileHeartRateMonitor(uint16_t deviceNumber);
+    ProfileHeartRateMonitor(uint16_t deviceNumber, uint8_t transmissionType);
     void onHeartRateBatteryStatus(void (*func)(HeartRateBatteryStatus&, uintptr_t), uintptr_t data = 0) { _onHeartRateBatteryStatus.set(func, data); }
     void onHeartRateCapabilities(void (*func)(HeartRateCapabilities&, uintptr_t), uintptr_t data = 0) { _onHeartRateCapabilities.set(func, data); }
     void onHeartRateCumulativeOperatingTime(void (*func)(HeartRateCumulativeOperatingTime&, uintptr_t), uintptr_t data = 0) { _onHeartRateCumulativeOperatingTime.set(func, data); }