Merge branch 'develop'

cujomalainey · Jun 29, 2020 · 20ea984 · 20ea984
2 parents ce66d47 + bcb636c
commit 20ea984
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 21 deletions.
diff --git 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

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);

diff --git 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
@@ -1,5 +1,5 @@
 name=ANTPLUS-Arduino
-version=1.1.0
+version=1.1.1
 author=Curtis Malainey <[email protected]>
 maintainer=Curtis Malainey <[email protected]>
 sentence=Library for easy ANT+ integration