diff --git a/ANT+_Android_SDK/API/AntPluginLib_Javadoc_3-5-0.zip.zip b/ANT+_Android_SDK/API/AntPluginLib_Javadoc_3-5-0.zip.zip
deleted file mode 100644
index 72fa8d0..0000000
Binary files a/ANT+_Android_SDK/API/AntPluginLib_Javadoc_3-5-0.zip.zip and /dev/null differ
diff --git a/ANT+_Android_SDK/API/AntPluginLib_Javadoc_3-6-0.zip b/ANT+_Android_SDK/API/AntPluginLib_Javadoc_3-6-0.zip
new file mode 100644
index 0000000..5f84d5b
Binary files /dev/null and b/ANT+_Android_SDK/API/AntPluginLib_Javadoc_3-6-0.zip differ
diff --git a/ANT+_Android_SDK/API/antpluginlib_3-5-0.jar b/ANT+_Android_SDK/API/antpluginlib_3-6-0.jar
similarity index 79%
rename from ANT+_Android_SDK/API/antpluginlib_3-5-0.jar
rename to ANT+_Android_SDK/API/antpluginlib_3-6-0.jar
index a8e5b3c..06627a9 100644
Binary files a/ANT+_Android_SDK/API/antpluginlib_3-5-0.jar and b/ANT+_Android_SDK/API/antpluginlib_3-6-0.jar differ
diff --git a/ANT+_Android_SDK/API/fit_14.10.jar b/ANT+_Android_SDK/API/fit_14.10.jar
deleted file mode 100644
index 86b2343..0000000
Binary files a/ANT+_Android_SDK/API/fit_14.10.jar and /dev/null differ
diff --git a/ANT+_Android_SDK/API/fit_16.00.jar b/ANT+_Android_SDK/API/fit_16.00.jar
new file mode 100644
index 0000000..af9c071
Binary files /dev/null and b/ANT+_Android_SDK/API/fit_16.00.jar differ
diff --git a/ANT+_Android_SDK/README.md b/ANT+_Android_SDK/README.md
index de8dcfa..4cd9bd1 100644
--- a/ANT+_Android_SDK/README.md
+++ b/ANT+_Android_SDK/README.md
@@ -1,4 +1,4 @@
-# Android ANT+ SDK v.P.B4 - 20 Mar 2015
+# Android ANT+ SDK v.P.B5 - 31 Aug 2015
This software development kit provides the resources needed to develop an Android application which uses the defined ANT+ profiles to communicate wirelessly with the millions of existing ANT+ devices. It includes instructions, API and documentation, and reference sample applications. The PDF _Creating ANT+ Android Applications_ explains how to get started.
If you are trying to develop an application to use ANT wireless technology freely outside of the defined ANT+ profiles, you must use the ANT Android SDK instead.
@@ -30,13 +30,13 @@ This SDK is available from:
* Creating ANT+ Android Applications
* API
- * PluginLib 3.5.0 (.jar and Javadoc)
- * FIT 14.10 (.jar)
+ * PluginLib 3.6.0 (.jar and Javadoc)
+ * FIT 16.00 (.jar)
* Services
- * ANT+ Plugins Service 3.5.0 (.apk)
+ * ANT+ Plugins Service 3.6.0 (.apk)
* Plugin Manager Launcher 1.1.0 (.apk)
* Sample Applications
- * Plugin Sampler 3.5.0 (.apk and source)
+ * Plugin Sampler 3.6.0 (.apk and source)
* ANT+ Demo 3.2.0 (.apk)
* Heart Rate Grapher 4.0.0 (.apk)
@@ -44,6 +44,24 @@ This SDK is available from:
Android ANT+ SDK Changelog
=============================================
+v.P.B5 - 31 Aug 2015
+--------------------------------------------------
+
+> Ant+ Plugins Service and ANT+ PluginLib Changelog - v.3.6.0
+> -----------------------------------------------------------------------------------
+> * Fix some issues preventing connecting to combined speed and cadence bike sensors [Lib + Service]
+> * Fix some crashes during searching [Service]
+> * Add ability to send manufacturer specific pages on profiles that support it [Lib + Service]
+> * Fix a crash when old apps request combined speed and cadence bike sensors [Service]
+> * Improve Javadoc relating to SEARCHING and DEAD states [Lib]
+> * Update to AntLib 4.14.0 [Lib + Service]
+> * Update to FitLib 16.00 [Lib + Service]
+>
+> Ant+ Plugin Sampler - v.3.6.0
+> -----------------------------------------------------------------------------------
+> * Update to PluginLib v.3.6.0
+
+
v.P.B4 - 20 Mar 2015
--------------------------------------------------
diff --git a/ANT+_Android_SDK/Sample/ANT+ Plugin Sampler/Android_AntPlusPluginSampler_3-5-0.apk b/ANT+_Android_SDK/Sample/ANT+ Plugin Sampler/Android_AntPlusPluginSampler_3-5-0.apk
deleted file mode 100644
index 92dd4cd..0000000
Binary files a/ANT+_Android_SDK/Sample/ANT+ Plugin Sampler/Android_AntPlusPluginSampler_3-5-0.apk and /dev/null differ
diff --git a/ANT+_Android_SDK/Sample/ANT+ Plugin Sampler/Android_AntPlusPluginSampler_3-6-0.apk b/ANT+_Android_SDK/Sample/ANT+ Plugin Sampler/Android_AntPlusPluginSampler_3-6-0.apk
new file mode 100644
index 0000000..45bb41b
Binary files /dev/null and b/ANT+_Android_SDK/Sample/ANT+ Plugin Sampler/Android_AntPlusPluginSampler_3-6-0.apk differ
diff --git a/ANT+_Android_SDK/Sample/ANT+ Plugin Sampler/source/AndroidManifest.xml b/ANT+_Android_SDK/Sample/ANT+ Plugin Sampler/source/AndroidManifest.xml
index e2ba8d2..347b5cd 100644
--- a/ANT+_Android_SDK/Sample/ANT+ Plugin Sampler/source/AndroidManifest.xml
+++ b/ANT+_Android_SDK/Sample/ANT+ Plugin Sampler/source/AndroidManifest.xml
@@ -10,8 +10,8 @@ All rights reserved.
-->
+ android:versionCode="030600"
+ android:versionName="3.6.0" >
eventFlags, final byte[] rawDataBytes) {
+ runOnUiThread(new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ tv_estTimestamp.setText(String.valueOf(estTimestamp));
+
+ StringBuffer hexString = new StringBuffer();
+ for (int i = 0; i < rawDataBytes.length; i++)
+ {
+ hexString
+ .append("[")
+ .append(String.format("%02X",
+ rawDataBytes[i] & 0xFF)).append("]");
+ }
+ //tv_manufacturerSpecificData.setText(hexString.toString());
+ }
+ });
+ }
+ });
}
};
diff --git a/ANT+_Android_SDK/Services/Android_AntPlusPlugins_3-5-0.apk b/ANT+_Android_SDK/Services/Android_AntPlusPlugins_3-5-0.apk
deleted file mode 100644
index 779507c..0000000
Binary files a/ANT+_Android_SDK/Services/Android_AntPlusPlugins_3-5-0.apk and /dev/null differ
diff --git a/ANT+_Android_SDK/Services/Android_AntPlusPlugins_3-6-0.apk b/ANT+_Android_SDK/Services/Android_AntPlusPlugins_3-6-0.apk
new file mode 100644
index 0000000..f01a496
Binary files /dev/null and b/ANT+_Android_SDK/Services/Android_AntPlusPlugins_3-6-0.apk differ
diff --git a/ANT_Android_SDK/API/Android_ANTLib_Javadoc_4-12-0.zip b/ANT_Android_SDK/API/Android_ANTLib_Javadoc_4-12-0.zip
deleted file mode 100644
index 6e52093..0000000
Binary files a/ANT_Android_SDK/API/Android_ANTLib_Javadoc_4-12-0.zip and /dev/null differ
diff --git a/ANT_Android_SDK/API/Android_ANTLib_Javadoc_4-14-0.zip b/ANT_Android_SDK/API/Android_ANTLib_Javadoc_4-14-0.zip
new file mode 100644
index 0000000..01bdc7e
Binary files /dev/null and b/ANT_Android_SDK/API/Android_ANTLib_Javadoc_4-14-0.zip differ
diff --git a/ANT_Android_SDK/API/android_antlib_4-12-0.jar b/ANT_Android_SDK/API/android_antlib_4-14-0.jar
similarity index 72%
rename from ANT_Android_SDK/API/android_antlib_4-12-0.jar
rename to ANT_Android_SDK/API/android_antlib_4-14-0.jar
index a1fa495..062ffd9 100644
Binary files a/ANT_Android_SDK/API/android_antlib_4-12-0.jar and b/ANT_Android_SDK/API/android_antlib_4-14-0.jar differ
diff --git a/ANT_Android_SDK/README.md b/ANT_Android_SDK/README.md
index 63cd488..1dd4633 100644
--- a/ANT_Android_SDK/README.md
+++ b/ANT_Android_SDK/README.md
@@ -1,4 +1,4 @@
-# Android ANT SDK v.C.B5 - 26 Feb 2015
+# Android ANT SDK v.C.B6 - 31 Aug 2015
This software development kit provides the resources needed to develop an Android application which uses ANT technology to communicate wirelessly between ANT enabled devices. It includes instructions, API and documentation, and reference sample applications. The PDF _Creating ANT Android Applications_ explains how to get started.
If you are trying to develop an application to connect to ANT+ devices on the ANT+ network, you must use the ANT+ Android SDK instead.
@@ -27,9 +27,9 @@ This SDK is available from:
* Creating ANT Android Applications (.pdf)
* API
- * ANT Lib 4.12.0 (.jar and Javadoc)
+ * ANT Lib 4.14.0 (.jar and Javadoc)
* Services
- * ANT Radio Service 4.12.0 (.apk)
+ * ANT Radio Service 4.14.0 (.apk)
* ANT USB Service 1.4.0 (.apk)
* Sample Applications
* Acquire Channels Sample 1.2.0 (.apk and source)
@@ -47,6 +47,22 @@ If you have any questions about developing ANT applications or need help visit t
Android ANT SDK Changelog
==========================================
+v.C.B6 - 31 Aug 2015
+-----------------------------------------
+> ANT Radio Service and ANTLib - v.4.14.0
+> -----------------------------------------------------
+> * IMPORTANT BEHAVIOUR CHANGE: Add Channel Not Available Exception if getAdapterInfo is called before service is not initialized instead of returning blank list [ARS + AntLib]
+> * IMPORTANT BEHAVIOUR CHANGE: Only perform error recovery channel release when channel closes with an ack in progress on adapters with firmware affected by this bug (see Javadoc for startSendAcknowledgedData) [ARS]
+> * Added logic to ignore built-in ANT adapters which never properly initialize making legacy apps never able to access USB adapters [ARS]
+> * Add support for fast channel initiation feature in extended assignment [ARS + AntLib]
+> * Add support for search uplink optimization feature [ARS + AntLib]
+> * Add finalizer to ANT channel to prevent apps from leaking channels [AntLib]
+> * Improve Javadoc explanations of search time outs [AntLib]
+> * Fix search priority capability being reported properly in capabilities [ARS + AntLib]
+> * Fix some exceptions during service intialization and shutdown [ARS]
+> * Always send ChannelsAvailable broadcast even if no apps are actively using channels [ARS]
+
+
v.C.B5 - 26 Feb 2015
-----------------------------------------
> ANT Radio Service and ANTLib - v.4.12.0
diff --git a/ANT_Android_SDK/Services/Android_ANTRadioService_4-12-0.apk b/ANT_Android_SDK/Services/Android_ANTRadioService_4-12-0.apk
deleted file mode 100644
index f45b7eb..0000000
Binary files a/ANT_Android_SDK/Services/Android_ANTRadioService_4-12-0.apk and /dev/null differ
diff --git a/ANT_Android_SDK/Services/Android_ANTRadioService_4-14-0.apk b/ANT_Android_SDK/Services/Android_ANTRadioService_4-14-0.apk
new file mode 100644
index 0000000..b6036e5
Binary files /dev/null and b/ANT_Android_SDK/Services/Android_ANTRadioService_4-14-0.apk differ
diff --git a/README.md b/README.md
index 1731d6b..7faf0b6 100644
--- a/README.md
+++ b/README.md
@@ -14,8 +14,8 @@ This SDK is available from:
* https://github.com/ant-wireless/ANT-Android-SDKs (subscribe as a watcher to be notified of updates)
# Current Versions:
-* Android ANT SDK v.C.B5 - 26 Feb 2015
-* Android ANT+ SDK v.P.B4 - 20 Mar 2015
+* Android ANT SDK v.C.B6 - 31 Aug 2015
+* Android ANT+ SDK v.P.B5 - 31 Aug 2015
# Changelog
See the README.md file in each respective SDK directory for a detailed changelog.