[PATCH 1/3] android/client: Fix help for gatt server commands

[PATCH 1/3] android/client: Fix help for gatt server commands

[Andrei Emeltchenko]

From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>

---
 android/client/if-gatt.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/android/client/if-gatt.c b/android/client/if-gatt.c
index 5f0eb1c..72f97ba 100644
--- a/android/client/if-gatt.c
+++ b/android/client/if-gatt.c
@@ -1894,7 +1894,11 @@ static void gatts_send_response_p(int argc, const char *argv[])
 static struct method server_methods[] = {
 	GATTS_METHODH(register_server, "[<uuid>]"),
 	GATTS_METHODCH(unregister_server, "<server_if>"),
+#if ANDROID_VERSION >= PLATFORM_VER(5, 0, 0)
+	GATTS_METHODCH(connect, "<server_if> <addr> [<is_direct>] [<transport>]"),
+#else
 	GATTS_METHODCH(connect, "<server_if> <addr> [<is_direct>]"),
+#endif
 	GATTS_METHODCH(disconnect, "<server_if> <addr> <conn_id>"),
 	GATTS_METHODCH(add_service, "<server_if> <srvc_id> <num_handles>"),
 	GATTS_METHODCH(add_included_service,
-- 
1.9.1

[PATCH 2/3] android/client: Fix help for gatt client commands

[Andrei Emeltchenko]

From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>

---
 android/client/if-gatt.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/android/client/if-gatt.c b/android/client/if-gatt.c
index 72f97ba..301262b 100644
--- a/android/client/if-gatt.c
+++ b/android/client/if-gatt.c
@@ -1503,8 +1503,13 @@ static void test_command_p(int argc, const char **argv)
 static struct method client_methods[] = {
 	STD_METHODH(register_client, "[<uuid>]"),
 	STD_METHODCH(unregister_client, "<client_if>"),
+#if ANDROID_VERSION >= PLATFORM_VER(5, 0, 0)
+	STD_METHODCH(scan, "[1|0]"),
+	STD_METHODCH(connect, "<client_if> <addr> [<is_direct>] [<transport]"),
+#else
 	STD_METHODCH(scan, "<client_if> [1|0]"),
 	STD_METHODCH(connect, "<client_if> <addr> [<is_direct>]"),
+#endif
 	STD_METHODCH(disconnect, "<client_if> <addr> <conn_id>"),
 	STD_METHODCH(refresh, "<client_if> <addr>"),
 	STD_METHODCH(search_service, "<conn_id> [<uuid>]"),
-- 
1.9.1

[PATCH 3/3] android/client: Fix help for bt create_bond() command

[Andrei Emeltchenko]

From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>

---
 android/client/if-bt.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/android/client/if-bt.c b/android/client/if-bt.c
index f83e148..2b9c455 100644
--- a/android/client/if-bt.c
+++ b/android/client/if-bt.c
@@ -876,7 +876,11 @@ static struct method methods[] = {
 	STD_METHODCH(get_remote_services, "<addr>"),
 	STD_METHOD(start_discovery),
 	STD_METHOD(cancel_discovery),
+#if ANDROID_VERSION >= PLATFORM_VER(5, 0, 0)
+	STD_METHODCH(create_bond, "<addr> [<transport>]"),
+#else
 	STD_METHODCH(create_bond, "<addr>"),
+#endif
 	STD_METHODCH(remove_bond, "<addr>"),
 	STD_METHODCH(cancel_bond, "<addr>"),
 	STD_METHODCH(pin_reply, "<address> [<pin>]"),
-- 
1.9.1

Re: [PATCH 1/3] android/client: Fix help for gatt server commands

[Szymon Janc]

Hi Andrei,

On Wednesday 12 of November 2014 11:09:19 Andrei Emeltchenko wrote:
> From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> 
> ---
>  android/client/if-gatt.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/android/client/if-gatt.c b/android/client/if-gatt.c
> index 5f0eb1c..72f97ba 100644
> --- a/android/client/if-gatt.c
> +++ b/android/client/if-gatt.c
> @@ -1894,7 +1894,11 @@ static void gatts_send_response_p(int argc, const char *argv[])
>  static struct method server_methods[] = {
>  	GATTS_METHODH(register_server, "[<uuid>]"),
>  	GATTS_METHODCH(unregister_server, "<server_if>"),
> +#if ANDROID_VERSION >= PLATFORM_VER(5, 0, 0)
> +	GATTS_METHODCH(connect, "<server_if> <addr> [<is_direct>] [<transport>]"),
> +#else
>  	GATTS_METHODCH(connect, "<server_if> <addr> [<is_direct>]"),
> +#endif
>  	GATTS_METHODCH(disconnect, "<server_if> <addr> <conn_id>"),
>  	GATTS_METHODCH(add_service, "<server_if> <srvc_id> <num_handles>"),
>  	GATTS_METHODCH(add_included_service,

All patches applied, thanks. 

-- 
Best regards, 
Szymon Janc