Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4B253200BBB for ; Thu, 10 Nov 2016 23:40:50 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 4A079160B21; Thu, 10 Nov 2016 22:40:50 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 09678160B1D for ; Thu, 10 Nov 2016 23:40:48 +0100 (CET) Received: (qmail 23551 invoked by uid 500); 10 Nov 2016 22:40:48 -0000 Mailing-List: contact commits-help@mynewt.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@mynewt.incubator.apache.org Delivered-To: mailing list commits@mynewt.incubator.apache.org Received: (qmail 23423 invoked by uid 99); 10 Nov 2016 22:40:48 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Nov 2016 22:40:48 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 9775EC023E for ; Thu, 10 Nov 2016 22:40:47 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.218 X-Spam-Level: X-Spam-Status: No, score=-6.218 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id LjIU_Hf_0s2e for ; Thu, 10 Nov 2016 22:40:46 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 644EF5FE16 for ; Thu, 10 Nov 2016 22:40:45 +0000 (UTC) Received: (qmail 13425 invoked by uid 99); 10 Nov 2016 22:38:14 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Nov 2016 22:38:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4C4B2EEE31; Thu, 10 Nov 2016 22:38:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ccollins@apache.org To: commits@mynewt.incubator.apache.org Date: Thu, 10 Nov 2016 22:38:35 -0000 Message-Id: <7206a524bf504be3ae2c2d1eff7f2ce5@git.apache.org> In-Reply-To: <5f91040c064d455e97696b8d24480b71@git.apache.org> References: <5f91040c064d455e97696b8d24480b71@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [23/50] incubator-mynewt-newt git commit: newtmgr; also do oic with newtmgr over ble. archived-at: Thu, 10 Nov 2016 22:40:50 -0000 newtmgr; also do oic with newtmgr over ble. Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/commit/22cf2700 Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/tree/22cf2700 Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/diff/22cf2700 Branch: refs/heads/master Commit: 22cf27005d16c278e03c3d75c94aa7294e8e9fa5 Parents: c2fe805 Author: Marko Kiiskila Authored: Tue Nov 1 12:18:33 2016 -0700 Committer: Marko Kiiskila Committed: Tue Nov 1 12:18:33 2016 -0700 ---------------------------------------------------------------------- newtmgr/transport/connble.go | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/22cf2700/newtmgr/transport/connble.go ---------------------------------------------------------------------- diff --git a/newtmgr/transport/connble.go b/newtmgr/transport/connble.go index f0ad978..e8bcb66 100644 --- a/newtmgr/transport/connble.go +++ b/newtmgr/transport/connble.go @@ -36,6 +36,10 @@ var CharDisc = make(chan bool) var newtmgrServiceId = gatt.MustParseUUID("8D53DC1D-1DB7-4CD3-868B-8A527460AA84") var newtmgrServiceCharId = gatt.MustParseUUID("DA2E7828-FBCE-4E01-AE9E-261174997C48") + +var newtmgrCoapServiceId = gatt.MustParseUUID("e3f9f9c4-8a83-4055-b647-728b769745d6") +var newtmgrCoapServiceCharId = gatt.MustParseUUID("e467fee6-d6bb-4956-94df-0090350631f5") + var deviceName string var deviceAddress []byte var deviceAddressType uint8 @@ -110,15 +114,25 @@ func onPeriphConnected(p gatt.Peripheral, err error) { return } + var isCoap bool = false + for _, service := range services { - if service.UUID().Equal(newtmgrServiceId) { + if service.UUID().Equal(newtmgrServiceId) || + service.UUID().Equal(newtmgrCoapServiceId) { log.Debugf("Newtmgr Service Found %s", service.Name()) + if service.UUID().Equal(newtmgrCoapServiceId) { + isCoap = true + } + cs, _ := p.DiscoverCharacteristics(nil, service) for _, c := range cs { - if c.UUID().Equal(newtmgrServiceCharId) { + if (isCoap == false && + c.UUID().Equal(newtmgrServiceCharId)) || + (isCoap == true && + c.UUID().Equal(newtmgrCoapServiceCharId)) { log.Debugf("Newtmgr Characteristic Found") p.SetNotifyValue(c, newtmgrNotifyCB) deviceChar = c