From e7ef73dfaaa7c4e4333ba8a9b120d0c69b482301 Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Mon, 29 Jun 2020 09:41:30 -0700 Subject: [PATCH 1/3] examples: patch with new driver names ant-arduino v2.0.0 changes driver names, so patch examples accordingly --- examples/BicycleSpeedDisplay/BicycleSpeedDisplay.ino | 6 +++--- examples/DeviceSearch/DeviceSearch.ino | 4 ++-- examples/DynamicProfiles/DynamicProfiles.ino | 8 ++++---- examples/EnvironmentDisplay/EnvironmentDisplay.ino | 6 +++--- examples/HeartRateDisplay/HeartRateDisplay.ino | 6 +++--- examples/HeartRateMonitor/HeartRateMonitor.ino | 2 +- examples/LEVDisplay/LEVDisplay.ino | 6 +++--- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/examples/BicycleSpeedDisplay/BicycleSpeedDisplay.ino b/examples/BicycleSpeedDisplay/BicycleSpeedDisplay.ino index 4954243..ee4efc0 100644 --- a/examples/BicycleSpeedDisplay/BicycleSpeedDisplay.ino +++ b/examples/BicycleSpeedDisplay/BicycleSpeedDisplay.ino @@ -16,9 +16,9 @@ const uint8_t NETWORK_KEY[] = {0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77}; // get this from thisisant.com -AntWithCallbacks ant = AntWithCallbacks(); -AntPlusRouter router = AntPlusRouter(); -ProfileBicycleSpeedDisplay bikeSpeed = ProfileBicycleSpeedDisplay(); +ArduinoSerialAntWithCallbacks ant; +AntPlusRouter router; +ProfileBicycleSpeedDisplay bikeSpeed; void bicycleSpeedBaseDataPageHandler(AntRxDataResponse& msg, uintptr_t data); void batteryStatusDataPageHandler(BicycleSpeedBatteryStatus& msg, uintptr_t data); diff --git a/examples/DeviceSearch/DeviceSearch.ino b/examples/DeviceSearch/DeviceSearch.ino index efd4048..c216db3 100644 --- a/examples/DeviceSearch/DeviceSearch.ino +++ b/examples/DeviceSearch/DeviceSearch.ino @@ -18,8 +18,8 @@ const uint8_t NETWORK_KEY[] = {0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77}; uint32_t timeLastSwitch = 0; bool isSearching = false; -AntWithCallbacks ant = AntWithCallbacks(); -AntPlusRouter router = AntPlusRouter(); +ArduinoSerialAntWithCallbacks ant; +AntPlusRouter router; void searchCallback(uint16_t deviceNumber, uint8_t deviceType, uint8_t transmissionType, uint8_t rssi); void flipSearch(); diff --git a/examples/DynamicProfiles/DynamicProfiles.ino b/examples/DynamicProfiles/DynamicProfiles.ino index dafc166..9d3bbc9 100644 --- a/examples/DynamicProfiles/DynamicProfiles.ino +++ b/examples/DynamicProfiles/DynamicProfiles.ino @@ -21,10 +21,10 @@ const uint8_t NETWORK_KEY[] = {0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77}; uint32_t timeLastSwitch = 0; bool isHrProfileRunning = true; -AntWithCallbacks ant = AntWithCallbacks(); -AntPlusRouter router = AntPlusRouter(); -ProfileHeartRateDisplay hr = ProfileHeartRateDisplay(); -ProfileBicycleSpeedDisplay bikeSpeed = ProfileBicycleSpeedDisplay(); +ArduinoSerialAntWithCallbacks ant; +AntPlusRouter router; +ProfileHeartRateDisplay hr; +ProfileBicycleSpeedDisplay bikeSpeed; void heartRateBaseDataPageHandler(AntRxDataResponse& msg, uintptr_t data); void batteryStatusDataPageHandler(HeartRateBatteryStatus& msg, uintptr_t data); diff --git a/examples/EnvironmentDisplay/EnvironmentDisplay.ino b/examples/EnvironmentDisplay/EnvironmentDisplay.ino index 5dde807..d581c9f 100644 --- a/examples/EnvironmentDisplay/EnvironmentDisplay.ino +++ b/examples/EnvironmentDisplay/EnvironmentDisplay.ino @@ -16,9 +16,9 @@ const uint8_t NETWORK_KEY[] = {0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77}; // get this from thisisant.com -AntWithCallbacks ant = AntWithCallbacks(); -AntPlusRouter router = AntPlusRouter(); -ProfileEnvironmentDisplay env = ProfileEnvironmentDisplay(); +ArduinoSerialAntWithCallbacks ant; +AntPlusRouter router; +ProfileEnvironmentDisplay env; void generalInformationDataPageHandler(EnvironmentGeneralInformation& msg, uintptr_t data); void temperatureDataPageHandler(EnvironmentTemperature& msg, uintptr_t data); diff --git a/examples/HeartRateDisplay/HeartRateDisplay.ino b/examples/HeartRateDisplay/HeartRateDisplay.ino index b24f28c..465553b 100644 --- a/examples/HeartRateDisplay/HeartRateDisplay.ino +++ b/examples/HeartRateDisplay/HeartRateDisplay.ino @@ -16,9 +16,9 @@ const uint8_t NETWORK_KEY[] = {0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77}; // get this from thisisant.com -AntWithCallbacks ant = AntWithCallbacks(); -AntPlusRouter router = AntPlusRouter(); -ProfileHeartRateDisplay hr = ProfileHeartRateDisplay(); +ArduinoSerialAntWithCallbacks ant; +AntPlusRouter router; +ProfileHeartRateDisplay hr; void heartRateBaseDataPageHandler(AntRxDataResponse& msg, uintptr_t data); void batteryStatusDataPageHandler(HeartRateBatteryStatus& msg, uintptr_t data); diff --git a/examples/HeartRateMonitor/HeartRateMonitor.ino b/examples/HeartRateMonitor/HeartRateMonitor.ino index 50b4e3d..a2f090c 100644 --- a/examples/HeartRateMonitor/HeartRateMonitor.ino +++ b/examples/HeartRateMonitor/HeartRateMonitor.ino @@ -25,7 +25,7 @@ const uint8_t NETWORK_KEY[] = {0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77}; // get this from thisisant.com uint32_t flags = 0; -AntWithCallbacks ant; +ArduinoSerialAntWithCallbacks ant; AntPlusRouter router; ProfileHeartRateMonitor hr(123, 0, flags); diff --git a/examples/LEVDisplay/LEVDisplay.ino b/examples/LEVDisplay/LEVDisplay.ino index cfec549..7e49d00 100644 --- a/examples/LEVDisplay/LEVDisplay.ino +++ b/examples/LEVDisplay/LEVDisplay.ino @@ -17,9 +17,9 @@ const uint8_t NETWORK_KEY[] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77 }; -AntWithCallbacks ant = AntWithCallbacks(); -AntPlusRouter router = AntPlusRouter(); -ProfileLevDisplay lev = ProfileLevDisplay(); +ArduinoSerialAntWithCallbacks ant; +AntPlusRouter router; +ProfileLevDisplay lev; void levBaseDataPageHandler(AntRxDataResponse& msg, uintptr_t data); void levSpeedSystemInformation1Handler(LevSpeedSystemInformation1& msg, uintptr_t data); From e43f26f395323bc8efd1d58092549bbea5f60ddc Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Mon, 29 Jun 2020 09:46:23 -0700 Subject: [PATCH 2/3] travis: add missing examples to CI two examples weren't being built. Lets get those in the CI --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index c1df282..692bbfa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,6 +35,8 @@ cache: env: - PLATFORMIO_CI_SRC=examples/BicycleSpeedDisplay/BicycleSpeedDisplay.ino + - PLATFORMIO_CI_SRC=examples/DeviceSearch/DeviceSearch.ino + - PLATFORMIO_CI_SRC=examples/DynamicProfiles/DynamicProfiles.ino - PLATFORMIO_CI_SRC=examples/EnvironmentDisplay/EnvironmentDisplay.ino - PLATFORMIO_CI_SRC=examples/HeartRateDisplay/HeartRateDisplay.ino - PLATFORMIO_CI_SRC=examples/HeartRateMonitor/HeartRateMonitor.ino From bcb636cb28c90884ee2513cae6a3ffd146ef24d5 Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Mon, 29 Jun 2020 09:51:21 -0700 Subject: [PATCH 3/3] release version 1.1.1 fixup examples so they build with new driver --- library.json | 2 +- library.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library.json b/library.json index 3eb496f..750b1bf 100644 --- a/library.json +++ b/library.json @@ -7,7 +7,7 @@ "type": "git", "url": "https://github.com/cujomalainey/antplus-arduino.git" }, - "version": "1.1.0", + "version": "1.1.1", "frameworks": "*", "platforms": "*", "dependencies": diff --git a/library.properties b/library.properties index e4d274a..570c6b6 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=ANTPLUS-Arduino -version=1.1.0 +version=1.1.1 author=Curtis Malainey maintainer=Curtis Malainey sentence=Library for easy ANT+ integration