Skip to content

Commit 88146e0

Browse files
committed
Merge branch 'develop'
2 parents 757abfd + 17e68e0 commit 88146e0

File tree

149 files changed

+6323
-2680
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+6323
-2680
lines changed

.gitignore

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,15 @@
22
/deploy.sh
33
.DS_Store
44
.pioenvs
5+
6+
# ignore any soft device source for testing
7+
nrf_*
8+
ant_error.h
9+
ant_parameters.h
10+
ant_interface.h
11+
12+
# ide files
13+
.tags*
14+
.ycm*
15+
.platformio*
16+
*.swp

.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,12 @@ cache:
2929
- "~/.platformio"
3030

3131
env:
32+
- PLATFORMIO_CI_SRC=examples/AntVersion/AntVersion.ino
33+
- PLATFORMIO_CI_SRC=examples/Callbacks/Callbacks.ino
3234
- PLATFORMIO_CI_SRC=examples/OpenChannel/OpenChannel.ino
35+
- PLATFORMIO_CI_SRC=examples/ProximitySearch/ProximitySearch.ino
36+
- PLATFORMIO_CI_SRC=examples/SearchList/SearchList.ino
3337
- PLATFORMIO_CI_SRC=examples/SoftwareSerialOpenChannel/SoftwareSerialOpenChannel.ino
34-
- PLATFORMIO_CI_SRC=examples/AntVersion/AntVersion.ino
3538
- PLATFORMIO_CI_SRC=examples/TxCounter/TxCounter.ino
3639

3740
install:

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ Arduino library for communicating with ANT radios, with support for nrf51 device
88

99
## News
1010

11+
* 09/10/2017 System refactor complete
1112
* 12/26/2016 More examples and Tx added
1213
* 06/08/2016 Initial Experimental Rx only release
1314
* 04/21/2016 Project forked from Andrew Wrapp xbee-arduino
1415

1516
## Roadmap
1617

17-
* v1.0 system refactor (in progress)
18-
* v1.5 callback system implemented
18+
* v1.5 callback system implemented (partially implemented in current release)
1919
* ~~v1.6 SPI support~~ (Arduino has no support for being a SPI slave, maybe mbed)
2020
* v2.0 compile switch to handle running natively on an nRF52 dev board
2121

0 commit comments

Comments
 (0)