Merge branch 'develop'

merge in release v2.0.0

Author: cujomalainey

.gitignore

@@ -2,6 +2,7 @@
 /deploy.sh
 .DS_Store
 .pioenvs
+.pio
 tags
 
 # ignore any soft device source for testing
@@ -18,3 +19,9 @@ ant_interface.h
 
 # ignore main file for testing
 src/main.cpp
+.pio/build/project.checksum
+.vscode/c_cpp_properties.json
+.vscode/extensions.json
+.vscode/launch.json
+/*.cpp
+/zephyr

.travis.yml

@@ -29,14 +29,14 @@ cache:
         - "~/.platformio"
 
 env:
-    - PLATFORMIO_CI_SRC=examples/AntVersion/AntVersion.ino
-    - PLATFORMIO_CI_SRC=examples/Callbacks/Callbacks.ino
-    - PLATFORMIO_CI_SRC=examples/OpenChannel/OpenChannel.ino
-    - PLATFORMIO_CI_SRC=examples/ProximitySearch/ProximitySearch.ino
-    - PLATFORMIO_CI_SRC=examples/RSSIScan/RSSIScan.ino
-    - PLATFORMIO_CI_SRC=examples/SearchList/SearchList.ino
-    - PLATFORMIO_CI_SRC=examples/SoftwareSerialOpenChannel/SoftwareSerialOpenChannel.ino
-    - PLATFORMIO_CI_SRC=examples/TxCounter/TxCounter.ino
+    - PLATFORMIO_CI_SRC=examples/Arduino/AntVersion/AntVersion.ino
+    - PLATFORMIO_CI_SRC=examples/Arduino/Callbacks/Callbacks.ino
+    - PLATFORMIO_CI_SRC=examples/Arduino/OpenChannel/OpenChannel.ino
+    - PLATFORMIO_CI_SRC=examples/Arduino/ProximitySearch/ProximitySearch.ino
+    - PLATFORMIO_CI_SRC=examples/Arduino/RSSIScan/RSSIScan.ino
+    - PLATFORMIO_CI_SRC=examples/Arduino/SearchList/SearchList.ino
+    - PLATFORMIO_CI_SRC=examples/Arduino/SoftwareSerialOpenChannel/SoftwareSerialOpenChannel.ino
+    - PLATFORMIO_CI_SRC=examples/Arduino/TxCounter/TxCounter.ino
 
 install:
     - pip install -U platformio

COPYING

@@ -6,10 +6,10 @@ Arduino library for communicating with ANT radios, with support for nRF51 device
 
 [![Build Status](https://travis-ci.org/cujomalainey/ant-arduino.svg?branch=master)](https://travis-ci.org/cujomalainey/ant-arduino)
 [![Test Status](https://img.shields.io/circleci/build/github/cujomalainey/ant-arduino?label=test)](https://circleci.com/gh/cujomalainey/ant-arduino)
-[![BCH compliance](https://bettercodehub.com/edge/badge/cujomalainey/ant-arduino?branch=master)](https://bettercodehub.com/)
 
 ## News
 
+* 06/28/2020 ant-arduino v2.0.0 released with mbed support
 * 10/01/2017 [Antplus-arduino](https://github.com/cujomalainey/antplus-arduino) released
 * 09/30/2017 Callback system complete, v1.0.0 released
 * 09/10/2017 System refactor complete

README.md

@@ -9,7 +9,7 @@
 
 #include "ANT.h"
 #define BAUD_RATE 9600
-Ant ant = Ant();
+ArduinoSerialAnt ant;
 
 void parseMessage();
 void parseEventMessage(uint8_t code);

examples/AntVersion/AntVersion.ino examples/Arduino/AntVersion/AntVersion.ino

@@ -9,7 +9,7 @@
 
 #include "ANT.h"
 #define BAUD_RATE 9600
-AntWithCallbacks ant = AntWithCallbacks();
+ArduinoSerialAntWithCallbacks ant;
 
 // Arbitrary key, if you want to connect to ANT+, you must get the key from thisisant.com
 const uint8_t NETWORK_KEY[] = {0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77};
@@ -166,4 +166,4 @@ void handleChannelEventResponse(ChannelEventResponse& cer, uintptr_t data) {
 bool itsAlive(StartUpMessage& sm, uintptr_t data) {
     Serial.println("Radio Reset!");
     return true;
-}
+}

examples/Callbacks/Callbacks.ino examples/Arduino/Callbacks/Callbacks.ino

@@ -12,7 +12,7 @@
 
 #include "ANT.h"
 #define BAUD_RATE 9600
-Ant ant = Ant();
+ArduinoSerialAnt ant;
 
 // Arbitrary key, if you want to connect to ANT+, you must get the key from thisisant.com
 const uint8_t NETWORK_KEY[] = {0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77};

examples/OpenChannel/OpenChannel.ino examples/Arduino/OpenChannel/OpenChannel.ino

@@ -12,7 +12,7 @@
 
 #include "ANT.h"
 #define BAUD_RATE 9600
-Ant ant = Ant();
+ArduinoSerialAnt ant;
 
 // Arbitrary key, if you want to connect to ANT+, you must get the key from thisisant.com
 const uint8_t NETWORK_KEY[] = {0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77};

examples/ProximitySearch/ProximitySearch.ino examples/Arduino/ProximitySearch/ProximitySearch.ino

@@ -10,7 +10,7 @@
 
 #include "ANT.h"
 #define BAUD_RATE 9600
-Ant ant = Ant();
+ArduinoSerialAnt ant;
 
 const uint8_t NETWORK_KEY[] = {0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77};
 
@@ -41,13 +41,13 @@ void setup()
     ant.send(snk);
     parseMessage();
 
-    ac.setChannel(0);
+    ac.setChannel(OPEN_RX_SCAN_MODE_CHANNEL);
     ac.setChannelType(CHANNEL_TYPE_BIDIRECTIONAL_RECEIVE); //can't wildcard this
     ac.setChannelNetwork(0);
     ant.send(ac);
     parseMessage();
 
-    ci.setChannel(0);
+    ci.setChannel(OPEN_RX_SCAN_MODE_CHANNEL);
     ci.setDeviceNumber(0);
     ci.setDeviceType(0);
     ci.setTransmissionType(0);
@@ -58,7 +58,7 @@ void setup()
     ant.send(lb);
     parseMessage();
 
-    crf.setChannel(0);
+    crf.setChannel(OPEN_RX_SCAN_MODE_CHANNEL);
     crf.setRfFrequency(0); //can't wildcard this
     ant.send(crf);
     parseMessage();

examples/RSSIScan/RSSIScan.ino examples/Arduino/RSSIScan/RSSIScan.ino

@@ -23,7 +23,7 @@
 #define DEVICE_TYPE_HR 120
 #define ANTPLUS_FREQUENCY 57
 
-Ant ant = Ant();
+ArduinoSerialAnt ant;
 
 // Arbitrary key, if you want to connect to ANT+, you must get the key from thisisant.com
 const uint8_t NETWORK_KEY[] = {0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77};
@@ -68,12 +68,12 @@ void setup()
     snk.setKey((uint8_t*)NETWORK_KEY);
     ant.send(snk);
     parseMessage();
-    
+
     // open all channels
     for (uint8_t i = 0; i < maxChannels; i++) {
         ac = AssignChannel();
         ac.setChannel(i);
-        ac.setChannelType(CHANNEL_TYPE_BIDIRECTIONAL_RECEIVE); 
+        ac.setChannelType(CHANNEL_TYPE_BIDIRECTIONAL_RECEIVE);
         ac.setChannelNetwork(0);
         ant.send(ac);
         parseMessage();

examples/SearchList/SearchList.ino examples/Arduino/SearchList/SearchList.ino

@@ -15,7 +15,7 @@
 #define BAUD_RATE 9600
 #define SOFT_RX_PIN 2
 #define SOFT_TX_PIN 3
-Ant ant = Ant();
+ArduinoSerialAnt ant;
 SoftwareSerial soft(SOFT_RX_PIN, SOFT_TX_PIN);
 
 // Arbitrary key, if you want to connect to ANT+, you must get the key from thisisant.com