aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorANT-Shane <shane.gallup@thisisant.com>2014-02-20 11:46:47 -0700
committerANT-Shane <shane.gallup@thisisant.com>2014-02-20 11:46:47 -0700
commit7eabf6784467e0b06512c691c13327d38275cec4 (patch)
treed26526c9abec25cf7866838e4b97c80f327c3dae
parent9200d293c0a7d518f582b182f58efd3179aed58c (diff)
downloadandroid_external_ant-wireless_ant_native-7eabf6784467e0b06512c691c13327d38275cec4.tar.gz
android_external_ant-wireless_ant_native-7eabf6784467e0b06512c691c13327d38275cec4.tar.bz2
android_external_ant-wireless_ant_native-7eabf6784467e0b06512c691c13327d38275cec4.zip
Version 1.7.0
-Update readme -Log the correct time when retrying a TX -Increment version for official release (from now on the only changes on the master branch should be official releases)
-rw-r--r--README.md8
-rw-r--r--src/bluez_hci/ant_native_hci.c4
-rw-r--r--src/common/inc/ant_version.h4
3 files changed, 9 insertions, 7 deletions
diff --git a/README.md b/README.md
index 7b0fe5a..2c8500d 100644
--- a/README.md
+++ b/README.md
@@ -7,9 +7,9 @@ This repository contains the source to build the ANT HAL library (antradio_libra
### master ###
Versions that have been tested and are suitable for consumer devices.
-### development ###
-The latest, untested, development versions. These are made available for silicon vendors to verify code changes on parts/boards not available to ANT Wireless engineers.
+### features/_branch name_ ###
+The latest, untested, development versions of new features and fixes. These are made available for silicon vendors to verify code changes on new parts/boards not yet available to ANT Wireless engineers.
-### <X>_debug ###
-Unmaintained, unsupported and untested code. These branches are purely used as a means of distributing in-progress work between engineers at different sites. They generally contain features and fixes developed by third parties.
+### Third party submissions ###
+If you have code changes (new features, improvements or bug fixes), you should submit a pull request to master. These will be considered, and added to master if accepted, or a features branch if further verification is required.
diff --git a/src/bluez_hci/ant_native_hci.c b/src/bluez_hci/ant_native_hci.c
index 55cde44..f247534 100644
--- a/src/bluez_hci/ant_native_hci.c
+++ b/src/bluez_hci/ant_native_hci.c
@@ -791,6 +791,9 @@ ANTStatus ant_tx_message(ANT_U8 ucLen, ANT_U8 *pucMesg)
case ANT_STATUS_TRANSPORT_UNSPECIFIED_ERROR:
{
ANT_DEBUG_D("Command Complete: ANT_STATUS_UNSPECIFIED_ERROR");
+
+ // Give the chip a break before we try to resend data.
+ nanosleep((struct timespec[]){{0, 50000000}}, NULL);
time_t currentTime = time(NULL);
@@ -798,7 +801,6 @@ ANTStatus ant_tx_message(ANT_U8 ucLen, ANT_U8 *pucMesg)
{
if(currentTime < endTime)
{
- nanosleep((struct timespec[]){{0, 50000000}}, NULL);
ANT_DEBUG_V("Retrying. Current time = %d. "
"End time = %d", (int)currentTime, (int)endTime);
diff --git a/src/common/inc/ant_version.h b/src/common/inc/ant_version.h
index 47a6b6f..3620908 100644
--- a/src/common/inc/ant_version.h
+++ b/src/common/inc/ant_version.h
@@ -20,8 +20,8 @@
#define __ANT_VERSION_H
#define LIBANT_STACK_MAJOR "1"
-#define LIBANT_STACK_MINOR "6"
-#define LIBANT_STACK_INCRE "3"
+#define LIBANT_STACK_MINOR "7"
+#define LIBANT_STACK_INCRE "0"
#endif // __ANT_VERSION_H