[11/50] [abbrv] incubator-mynewt-core git commit: bletiny - Account for addition of adv. duration.

[cc...@apache.org]

bletiny - Account for addition of adv. duration.


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/2c37b7b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/2c37b7b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/2c37b7b2

Branch: refs/heads/ble_hs_api
Commit: 2c37b7b2bcd15cb4671ad570c2f3ec8a63120a38
Parents: b92ddcd
Author: Christopher Collins <cc...@apache.org>
Authored: Thu Jun 23 16:28:19 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Mon Jul 11 16:43:31 2016 -0700

----------------------------------------------------------------------
 apps/bletiny/src/bletiny.h |  2 +-
 apps/bletiny/src/cmd.c     | 15 ++++++++++++++-
 apps/bletiny/src/main.c    | 12 ++++++++----
 3 files changed, 23 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2c37b7b2/apps/bletiny/src/bletiny.h
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/bletiny.h b/apps/bletiny/src/bletiny.h
index 9694744..e70effd 100644
--- a/apps/bletiny/src/bletiny.h
+++ b/apps/bletiny/src/bletiny.h
@@ -155,7 +155,7 @@ int bletiny_write_long(uint16_t conn_handle, uint16_t attr_handle,
 int bletiny_write_reliable(uint16_t conn_handle, struct ble_gatt_attr *attrs,
                             int num_attrs);
 int bletiny_adv_start(uint8_t own_addr_type, uint8_t peer_addr_type,
-                      const uint8_t *peer_addr,
+                      const uint8_t *peer_addr, int32_t duration_ms,
                       const struct ble_gap_adv_params *params);
 int bletiny_adv_stop(void);
 int bletiny_conn_initiate(uint8_t own_addr_type,

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2c37b7b2/apps/bletiny/src/cmd.c
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/cmd.c b/apps/bletiny/src/cmd.c
index c6f2019..18cf51d 100644
--- a/apps/bletiny/src/cmd.c
+++ b/apps/bletiny/src/cmd.c
@@ -260,6 +260,7 @@ static int
 cmd_adv(int argc, char **argv)
 {
     struct ble_gap_adv_params params;
+    int32_t duration_ms;
     uint8_t peer_addr_type;
     uint8_t own_addr_type;
     uint8_t peer_addr[8];
@@ -332,7 +333,19 @@ cmd_adv(int argc, char **argv)
         return rc;
     }
 
-    rc = bletiny_adv_start(own_addr_type, peer_addr_type, peer_addr, &params);
+    params.high_duty_cycle = parse_arg_long_bounds_default("hd", 0, 1, 0, &rc);
+    if (rc != 0) {
+        return rc;
+    }
+
+    duration_ms = parse_arg_long_bounds_default("dur", 1, INT32_MAX,
+                                                BLE_HS_FOREVER, &rc);
+    if (rc != 0) {
+        return rc;
+    }
+
+    rc = bletiny_adv_start(own_addr_type, peer_addr_type, peer_addr,
+                           duration_ms, &params);
     if (rc != 0) {
         console_printf("advertise fail: %d\n", rc);
         return rc;

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2c37b7b2/apps/bletiny/src/main.c
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/main.c b/apps/bletiny/src/main.c
index c4b2856..d8b1912 100755
--- a/apps/bletiny/src/main.c
+++ b/apps/bletiny/src/main.c
@@ -891,7 +891,6 @@ bletiny_gap_event(int event, struct ble_gap_conn_ctxt *ctxt, void *arg)
 
     switch (event) {
     case BLE_GAP_EVENT_CONNECT:
-        
         console_printf("connection %s; status=%d ",
                        ctxt->connect.status == 0 ? "established" : "failed",
                        ctxt->connect.status);
@@ -912,6 +911,10 @@ bletiny_gap_event(int event, struct ble_gap_conn_ctxt *ctxt, void *arg)
         }
         return 0;
 
+    case BLE_GAP_EVENT_ADV_COMPLETE:
+        console_printf("advertising complete.\n");
+        return 0;
+
     case BLE_GAP_EVENT_CONN_CANCEL:
         console_printf("connection procedure cancelled.\n");
         return 0;
@@ -953,6 +956,7 @@ bletiny_gap_event(int event, struct ble_gap_conn_ctxt *ctxt, void *arg)
         print_bytes(ctxt->notify.attr_data, ctxt->notify.attr_len);
         console_printf("\n");
         return 0;
+
     default:
         return 0;
     }
@@ -1247,13 +1251,13 @@ bletiny_adv_stop(void)
 
 int
 bletiny_adv_start(uint8_t own_addr_type, uint8_t peer_addr_type,
-                  const uint8_t *peer_addr,
+                  const uint8_t *peer_addr, int32_t duration_ms,
                   const struct ble_gap_adv_params *params)
 {
     int rc;
 
-    rc = ble_gap_adv_start(own_addr_type, peer_addr_type, peer_addr, params,
-                           bletiny_gap_event, NULL);
+    rc = ble_gap_adv_start(own_addr_type, peer_addr_type, peer_addr,
+                           duration_ms, params, bletiny_gap_event, NULL);
     return rc;
 }