ant: fixup for 2.0.0 changes

ant-arduino is getting some breaking changes, this will pick those up
and integrate them

Author: cujomalainey

library.json

@@ -13,7 +13,8 @@
   "dependencies":
   [
       {
-          "name":"ANT"
+          "name":"ANT",
+          "version": ">=2.0.0"
       }
   ]
  }

platformio.ini

@@ -35,3 +35,10 @@ platform = espressif32
 framework = arduino
 board = featheresp32
 lib_deps = ANT
+
+[env:nrf52_express]
+board = adafruit_feather_nrf52840_s340
+framework = arduino
+platform = nordicnrf52
+platform_packages = framework-arduinoadafruitnrf52 @ https://github.com/cujomalainey/Adafruit_nRF52_Arduino
+lib_deps = https://github.com/cujomalainey/ant-arduino.git#develop

src/BaseClasses/ANTPLUS_BaseProfile.cpp

@@ -128,7 +128,7 @@ void BaseProfile::checkProfileStatus() {
 }
 
 void BaseProfile::send(AcknowledgedDataMsg& msg) {
-    msg.setChannelNumber(_channel);
+    msg.setChannel(_channel);
     _router->send(msg);
 }
 

src/BaseClasses/ANTPLUS_BaseProfile.h

@@ -98,10 +98,10 @@ class BaseProfile {
 private:
     void checkProfileStatus();
     AntPlusRouter* _router = NULL;
-    Callback<AntRxDataResponse&> _onDataPage;
-    Callback<AntRxDataResponse&> _onOtherDataPage;
-    Callback<ChannelEventResponse&> _onChannelEvent;
-    Callback<ChannelIdResponse&> _onChannelIdResponse;
+    AntCallback<AntRxDataResponse&> _onDataPage;
+    AntCallback<AntRxDataResponse&> _onOtherDataPage;
+    AntCallback<ChannelEventResponse&> _onChannelEvent;
+    AntCallback<ChannelIdResponse&> _onChannelIdResponse;
     uint8_t _channel = 0;
     uint8_t _channelType = 0;
     uint16_t _channelPeriod = 0;

src/Profiles/BicycleSpeed/Display/ANTPLUS_ProfileBicycleSpeedDisplay.h

@@ -31,12 +31,12 @@ class ProfileBicycleSpeedDisplay : public BaseSlaveProfile {
     bool handleManufacturerID(BicycleSpeedBaseMainDataPage& dataPage);
     bool handleMotionAndSpeed(BicycleSpeedBaseMainDataPage& dataPage);
     bool handleProductID(BicycleSpeedBaseMainDataPage& dataPage);
-    Callback<BicycleSpeedBatteryStatus&> _onBicycleSpeedBatteryStatus;
-    Callback<BicycleSpeedCumulativeOperatingTime&> _onBicycleSpeedCumulativeOperatingTime;
-    Callback<BicycleSpeedDefault&> _onBicycleSpeedDefault;
-    Callback<BicycleSpeedManufacturerID&> _onBicycleSpeedManufacturerID;
-    Callback<BicycleSpeedMotionAndSpeed&> _onBicycleSpeedMotionAndSpeed;
-    Callback<BicycleSpeedProductID&> _onBicycleSpeedProductID;
+    AntCallback<BicycleSpeedBatteryStatus&> _onBicycleSpeedBatteryStatus;
+    AntCallback<BicycleSpeedCumulativeOperatingTime&> _onBicycleSpeedCumulativeOperatingTime;
+    AntCallback<BicycleSpeedDefault&> _onBicycleSpeedDefault;
+    AntCallback<BicycleSpeedManufacturerID&> _onBicycleSpeedManufacturerID;
+    AntCallback<BicycleSpeedMotionAndSpeed&> _onBicycleSpeedMotionAndSpeed;
+    AntCallback<BicycleSpeedProductID&> _onBicycleSpeedProductID;
 };
 
 #endif // ANTPLUS_PROFILEBICYCLESPEEDDISPLAY_h

src/Profiles/Environment/Display/ANTPLUS_ProfileEnvironmentDisplay.h

@@ -28,10 +28,10 @@ class ProfileEnvironmentDisplay : public BaseSlaveProfile {
     bool handleTemperature(EnvironmentBaseDataPage& dataPage);
     bool handleManufacturersInformation(EnvironmentBaseDataPage& dataPage);
     bool handleProductInformation(EnvironmentBaseDataPage& dataPage);
-    Callback<EnvironmentGeneralInformation&> _onEnvironmentGeneralInformation;
-    Callback<EnvironmentTemperature&> _onEnvironmentTemperature;
-    Callback<ManufacturersInformation&> _onManufacturersInformation;
-    Callback<ProductInformation&> _onProductInformation;
+    AntCallback<EnvironmentGeneralInformation&> _onEnvironmentGeneralInformation;
+    AntCallback<EnvironmentTemperature&> _onEnvironmentTemperature;
+    AntCallback<ManufacturersInformation&> _onManufacturersInformation;
+    AntCallback<ProductInformation&> _onProductInformation;
 };
 
 #endif // ANTPLUS_PROFILEENVIRONMENTDISPLAY_h

src/Profiles/HeartRate/Display/ANTPLUS_ProfileHeartRateDisplay.h

@@ -36,14 +36,14 @@ class ProfileHeartRateDisplay : public BaseSlaveProfile {
     bool handlePreviousHeartBeat(HeartRateBaseMainDataPage& dataPage);
     bool handleProductInformation(HeartRateBaseMainDataPage& dataPage);
     bool handleSwimIntervalSummary(HeartRateBaseMainDataPage& dataPage);
-    Callback<HeartRateBatteryStatus&> _onHeartRateBatteryStatus;
-    Callback<HeartRateCapabilities&> _onHeartRateCapabilities;
-    Callback<HeartRateCumulativeOperatingTime&> _onHeartRateCumulativeOperatingTime;
-    Callback<HeartRateDefault&> _onHeartRateDefault;
-    Callback<HeartRateManufacturerInformation&> _onHeartRateManufacturerInformation;
-    Callback<HeartRatePreviousHeartBeat&> _onHeartRatePreviousHeartBeat;
-    Callback<HeartRateProductInformation&> _onHeartRateProductInformation;
-    Callback<HeartRateSwimIntervalSummary&> _onHeartRateSwimIntervalSummary;
+    AntCallback<HeartRateBatteryStatus&> _onHeartRateBatteryStatus;
+    AntCallback<HeartRateCapabilities&> _onHeartRateCapabilities;
+    AntCallback<HeartRateCumulativeOperatingTime&> _onHeartRateCumulativeOperatingTime;
+    AntCallback<HeartRateDefault&> _onHeartRateDefault;
+    AntCallback<HeartRateManufacturerInformation&> _onHeartRateManufacturerInformation;
+    AntCallback<HeartRatePreviousHeartBeat&> _onHeartRatePreviousHeartBeat;
+    AntCallback<HeartRateProductInformation&> _onHeartRateProductInformation;
+    AntCallback<HeartRateSwimIntervalSummary&> _onHeartRateSwimIntervalSummary;
 };
 
 #endif // ANTPLUS_PROFILEHEARTRATEDISPLAY_h

src/Profiles/HeartRate/Monitor/ANTPLUS_ProfileHeartRateMonitor.h

@@ -80,16 +80,16 @@ class ProfileHeartRateMonitor : public BaseMasterProfile {
     bool handleModeSettings(HeartRateBaseMainDataPage& dataPage);
     bool handleRequestDataPage(HeartRateBaseMainDataPage& dataPage);
     uint8_t getNextBackgroundPage(uint8_t currentPage);
-    Callback<RequestDataPage&> _onRequestDataPage;
-    Callback<ModeSettings&> _onModeSettings;
-    Callback<HeartRateDefaultMsg&> _createHeartRateDefaultMsg;
-    Callback<HeartRateCumulativeOperatingTimeMsg&> _createHeartRateCumulativeOperatingTimeMsg;
-    Callback<HeartRateManufacturerInformationMsg&> _createHeartRateManufacturerInformationMsg;
-    Callback<HeartRateProductInformationMsg&> _createHeartRateProductInformationMsg;
-    Callback<HeartRatePreviousHeartBeatMsg&> _createHeartRatePreviousHeartBeatMsg;
-    Callback<HeartRateSwimIntervalSummaryMsg&> _createHeartRateSwimIntervalSummaryMsg;
-    Callback<HeartRateCapabilitiesMsg&> _createHeartRateCapabilitiesMsg;
-    Callback<HeartRateBatteryStatusMsg&> _createHeartRateBatteryStatusMsg;
+    AntCallback<RequestDataPage&> _onRequestDataPage;
+    AntCallback<ModeSettings&> _onModeSettings;
+    AntCallback<HeartRateDefaultMsg&> _createHeartRateDefaultMsg;
+    AntCallback<HeartRateCumulativeOperatingTimeMsg&> _createHeartRateCumulativeOperatingTimeMsg;
+    AntCallback<HeartRateManufacturerInformationMsg&> _createHeartRateManufacturerInformationMsg;
+    AntCallback<HeartRateProductInformationMsg&> _createHeartRateProductInformationMsg;
+    AntCallback<HeartRatePreviousHeartBeatMsg&> _createHeartRatePreviousHeartBeatMsg;
+    AntCallback<HeartRateSwimIntervalSummaryMsg&> _createHeartRateSwimIntervalSummaryMsg;
+    AntCallback<HeartRateCapabilitiesMsg&> _createHeartRateCapabilitiesMsg;
+    AntCallback<HeartRateBatteryStatusMsg&> _createHeartRateBatteryStatusMsg;
     uint8_t _nextBackgroundPage;
     uint8_t _sportsMode = ANTPLUS_COMMON_DATAPAGE_MODESETTINGS_SPORTSMODE_RUNNING;
     uint32_t _flags = 0;

src/Profiles/Lev/Display/ANTPLUS_ProfileLevDisplay.h

@@ -37,14 +37,14 @@ class ProfileLevDisplay : public BaseSlaveProfile {
     bool handleManufacturersInformation(LevBaseMainDataPage& dataPage);
     bool handleProductInformation(LevBaseMainDataPage& dataPage);
 
-    Callback<LevSpeedSystemInformation1&> _onLevSpeedSystemInformation1;
-    Callback<LevSpeedDistanceInformation&> _onLevSpeedDistanceInformation;
-    Callback<LevAltSpeedDistanceInformation&> _onLevAltSpeedDistanceInformation;
-    Callback<LevSpeedSystemInformation2&> _onLevSpeedSystemInformation2;
-    Callback<LevBatteryInformation&> _onLevBatteryInformation;
-    Callback<LevCapabilities&> _onLevCapabilities;
-    Callback<ManufacturersInformation&> _onManufacturersInformation;
-    Callback<ProductInformation&> _onProductInformation;
+    AntCallback<LevSpeedSystemInformation1&> _onLevSpeedSystemInformation1;
+    AntCallback<LevSpeedDistanceInformation&> _onLevSpeedDistanceInformation;
+    AntCallback<LevAltSpeedDistanceInformation&> _onLevAltSpeedDistanceInformation;
+    AntCallback<LevSpeedSystemInformation2&> _onLevSpeedSystemInformation2;
+    AntCallback<LevBatteryInformation&> _onLevBatteryInformation;
+    AntCallback<LevCapabilities&> _onLevCapabilities;
+    AntCallback<ManufacturersInformation&> _onManufacturersInformation;
+    AntCallback<ProductInformation&> _onProductInformation;
 };
 
 #endif // ANTPLUS_PROFILELEVDISPLAY_h