Remove channel config magic numbers

Author: cujomalainey

src/Profiles/HeartRate/ANTPLUS_HeartRatePrivateDefines.h

@@ -1,6 +1,13 @@
 #ifndef ANTPLUS_HEARTRATEPROFILEPRIVATEDEFINES_h
 #define ANTPLUS_HEARTRATEPROFILEPRIVATEDEFINES_h
 
+/* Channel Config */
+#define ANTPLUS_HEARTRATE_CHANNELTYPE CHANNEL_TYPE_BIDIRECTIONAL_RECEIVE
+#define ANTPLUS_HEARTRATE_DEVICETYPE 120
+#define ANTPLUS_HEARTRATE_CHANNELPERIOD 8070
+// 30 / 2.5 = 12
+#define ANTPLUS_HEARTRATE_SEARCHTIMEOUT 12
+
 /* Base DataPage */
 #define ANTPLUS_HEARTRATE_DATAPAGEBASE_DATAPAGE_BYTE 0
 #define ANTPLUS_HEARTRATE_DATAPAGEBASE_TOGGLE_BYTE   0

src/Profiles/HeartRate/Monitor/ANTPLUS_ProfileHeartRateMonitor.cpp

@@ -4,24 +4,15 @@
 #include <CommonDataPages/ANTPLUS_CommonDataPageDefines.h>
 
 ProfileHeartRateMonitor::ProfileHeartRateMonitor() : BaseSlaveProfile() {
-    // TODO remove magic numbers
-    setDeviceNumber(0);
-    setChannelType(CHANNEL_TYPE_BIDIRECTIONAL_RECEIVE);
-    setDeviceType(120);
-    setTransmissionType(0);
-    setChannelPeriod(8070);
-    // 30 / 2.5 = 12
-    setSearchTimeout(12);
+    setChannelConfig();
 }
 
 ProfileHeartRateMonitor::ProfileHeartRateMonitor(uint16_t deviceNumber) : BaseSlaveProfile(deviceNumber) {
-    // TODO remove magic numbers
-    setChannelType(CHANNEL_TYPE_BIDIRECTIONAL_RECEIVE);
-    setDeviceType(120);
-    setTransmissionType(0);
-    setChannelPeriod(8070);
-    // 30 / 2.5 = 12
-    setSearchTimeout(12);
+    setChannelConfig();
+}
+
+ProfileHeartRateMonitor::ProfileHeartRateMonitor(uint16_t deviceNumber, uint8_t transmissionType) : BaseSlaveProfile(deviceNumber, transmissionType) {
+    setChannelConfig();
 }
 
 void ProfileHeartRateMonitor::onBroadcastData(BroadcastData& msg) {
@@ -75,6 +66,13 @@ void ProfileHeartRateMonitor::stop() {
     closeChannel();
 }
 
+void ProfileHeartRateMonitor::setChannelConfig() {
+    setChannelType(ANTPLUS_HEARTRATE_CHANNELTYPE);
+    setDeviceType(ANTPLUS_HEARTRATE_DEVICETYPE);
+    setChannelPeriod(ANTPLUS_HEARTRATE_CHANNELPERIOD);
+    setSearchTimeout(ANTPLUS_HEARTRATE_SEARCHTIMEOUT);
+}
+
 bool ProfileHeartRateMonitor::handleBatteryStatus(HeartRateBaseMainDataPage& dataPage) {
     HeartRateBatteryStatus dp = HeartRateBatteryStatus(dataPage);
     return _onHeartRateBatteryStatus.call(dp);

src/Profiles/HeartRate/Monitor/ANTPLUS_ProfileHeartRateMonitor.h

@@ -31,6 +31,7 @@ class ProfileHeartRateMonitor : public BaseSlaveProfile {
     void onBroadcastData(BroadcastData& msg);
 
 private:
+    void setChannelConfig();
     bool handleBatteryStatus(HeartRateBaseMainDataPage& dataPage);
     bool handleCapabilities(HeartRateBaseMainDataPage& dataPage);
     bool handleCumulativeOperatingTime(HeartRateBaseMainDataPage& dataPage);