This is an automated email from the ASF dual-hosted git repository.
ccollins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-newtmgr.git
commit 40b9104897e90d1a7e4ac93e423dcb73a4a507c6
Author: Christopher Collins <ccoll...@apache.org>
AuthorDate: Wed Jul 12 16:12:03 2017 -0700
newtmgr revendor
---
newtmgr/Godeps/Godeps.json | 48 +++++++++++-----------
.../newtmgr/nmxact/bledefs/bledefs.go | 12 ++++--
.../newtmgr/nmxact/nmble/ble_oic_sesn.go | 14 ++-----
.../mynewt.apache.org/newtmgr/nmxact/nmp/log.go | 2 +-
.../mynewt.apache.org/newtmgr/nmxact/scan/scan.go | 4 +-
5 files changed, 38 insertions(+), 42 deletions(-)
diff --git a/newtmgr/Godeps/Godeps.json b/newtmgr/Godeps/Godeps.json
index b550138..a30f60f 100644
--- a/newtmgr/Godeps/Godeps.json
+++ b/newtmgr/Godeps/Godeps.json
@@ -126,63 +126,63 @@
},
{
"ImportPath":
"mynewt.apache.org/newtmgr/nmxact/bledefs",
- "Comment": "mynewt_0_9_0_tag-543-g29157f2",
- "Rev": "29157f2faf564233a6fb6922b1f037493ccd7bf4"
+ "Comment": "mynewt_0_9_0_tag-547-gf24b504",
+ "Rev": "f24b504146dabab8247096e523561a21f3330e13"
},
{
"ImportPath": "mynewt.apache.org/newtmgr/nmxact/nmble",
- "Comment": "mynewt_0_9_0_tag-543-g29157f2",
- "Rev": "29157f2faf564233a6fb6922b1f037493ccd7bf4"
+ "Comment": "mynewt_0_9_0_tag-547-gf24b504",
+ "Rev": "f24b504146dabab8247096e523561a21f3330e13"
},
{
"ImportPath": "mynewt.apache.org/newtmgr/nmxact/nmp",
- "Comment": "mynewt_0_9_0_tag-543-g29157f2",
- "Rev": "29157f2faf564233a6fb6922b1f037493ccd7bf4"
+ "Comment": "mynewt_0_9_0_tag-547-gf24b504",
+ "Rev": "f24b504146dabab8247096e523561a21f3330e13"
},
{
"ImportPath":
"mynewt.apache.org/newtmgr/nmxact/nmserial",
- "Comment": "mynewt_0_9_0_tag-543-g29157f2",
- "Rev": "29157f2faf564233a6fb6922b1f037493ccd7bf4"
+ "Comment": "mynewt_0_9_0_tag-547-gf24b504",
+ "Rev": "f24b504146dabab8247096e523561a21f3330e13"
},
{
"ImportPath":
"mynewt.apache.org/newtmgr/nmxact/nmxutil",
- "Comment": "mynewt_0_9_0_tag-543-g29157f2",
- "Rev": "29157f2faf564233a6fb6922b1f037493ccd7bf4"
+ "Comment": "mynewt_0_9_0_tag-547-gf24b504",
+ "Rev": "f24b504146dabab8247096e523561a21f3330e13"
},
{
"ImportPath": "mynewt.apache.org/newtmgr/nmxact/oic",
- "Comment": "mynewt_0_9_0_tag-543-g29157f2",
- "Rev": "29157f2faf564233a6fb6922b1f037493ccd7bf4"
+ "Comment": "mynewt_0_9_0_tag-547-gf24b504",
+ "Rev": "f24b504146dabab8247096e523561a21f3330e13"
},
{
"ImportPath": "mynewt.apache.org/newtmgr/nmxact/omp",
- "Comment": "mynewt_0_9_0_tag-543-g29157f2",
- "Rev": "29157f2faf564233a6fb6922b1f037493ccd7bf4"
+ "Comment": "mynewt_0_9_0_tag-547-gf24b504",
+ "Rev": "f24b504146dabab8247096e523561a21f3330e13"
},
{
"ImportPath": "mynewt.apache.org/newtmgr/nmxact/scan",
- "Comment": "mynewt_0_9_0_tag-543-g29157f2",
- "Rev": "29157f2faf564233a6fb6922b1f037493ccd7bf4"
+ "Comment": "mynewt_0_9_0_tag-547-gf24b504",
+ "Rev": "f24b504146dabab8247096e523561a21f3330e13"
},
{
"ImportPath": "mynewt.apache.org/newtmgr/nmxact/sesn",
- "Comment": "mynewt_0_9_0_tag-543-g29157f2",
- "Rev": "29157f2faf564233a6fb6922b1f037493ccd7bf4"
+ "Comment": "mynewt_0_9_0_tag-547-gf24b504",
+ "Rev": "f24b504146dabab8247096e523561a21f3330e13"
},
{
"ImportPath": "mynewt.apache.org/newtmgr/nmxact/udp",
- "Comment": "mynewt_0_9_0_tag-543-g29157f2",
- "Rev": "29157f2faf564233a6fb6922b1f037493ccd7bf4"
+ "Comment": "mynewt_0_9_0_tag-547-gf24b504",
+ "Rev": "f24b504146dabab8247096e523561a21f3330e13"
},
{
"ImportPath": "mynewt.apache.org/newtmgr/nmxact/xact",
- "Comment": "mynewt_0_9_0_tag-543-g29157f2",
- "Rev": "29157f2faf564233a6fb6922b1f037493ccd7bf4"
+ "Comment": "mynewt_0_9_0_tag-547-gf24b504",
+ "Rev": "f24b504146dabab8247096e523561a21f3330e13"
},
{
"ImportPath": "mynewt.apache.org/newtmgr/nmxact/xport",
- "Comment": "mynewt_0_9_0_tag-543-g29157f2",
- "Rev": "29157f2faf564233a6fb6922b1f037493ccd7bf4"
+ "Comment": "mynewt_0_9_0_tag-547-gf24b504",
+ "Rev": "f24b504146dabab8247096e523561a21f3330e13"
}
]
}
diff --git a/newtmgr/vendor/mynewt.apache.org/newtmgr/nmxact/bledefs/bledefs.go
b/newtmgr/vendor/mynewt.apache.org/newtmgr/nmxact/bledefs/bledefs.go
index b61ca91..eeb310f 100644
--- a/newtmgr/vendor/mynewt.apache.org/newtmgr/nmxact/bledefs/bledefs.go
+++ b/newtmgr/vendor/mynewt.apache.org/newtmgr/nmxact/bledefs/bledefs.go
@@ -33,10 +33,14 @@ const BLE_ATT_MTU_DFLT = 23
const NmpPlainSvcUuid = "8D53DC1D-1DB7-4CD3-868B-8A527460AA84"
const NmpPlainChrUuid = "DA2E7828-FBCE-4E01-AE9E-261174997C48"
-const IotivitySvcUuid = "ADE3D529-C784-4F63-A987-EB69F70EE816"
-const OmpSvcUuid = 0x9923
-const OmpReqChrUuid = "AD7B334F-4637-4B86-90B6-9D787F03D218"
-const OmpRspChrUuid = "E9241982-4580-42C4-8831-95048216B256"
+
+const OmpUnsecSvcUuid = "ADE3D529-C784-4F63-A987-EB69F70EE816"
+const OmpUnsecReqChrUuid = "AD7B334F-4637-4B86-90B6-9D787F03D218"
+const OmpUnsecRspChrUuid = "E9241982-4580-42C4-8831-95048216B256"
+
+const OmpSecSvcUuid = 0xfe18
+const OmpSecReqChrUuid = 0x1000
+const OmpSecRspChrUuid = 0x1001
type BleAddrType int
diff --git
a/newtmgr/vendor/mynewt.apache.org/newtmgr/nmxact/nmble/ble_oic_sesn.go
b/newtmgr/vendor/mynewt.apache.org/newtmgr/nmxact/nmble/ble_oic_sesn.go
index d93ab63..9db1c84 100644
--- a/newtmgr/vendor/mynewt.apache.org/newtmgr/nmxact/nmble/ble_oic_sesn.go
+++ b/newtmgr/vendor/mynewt.apache.org/newtmgr/nmxact/nmble/ble_oic_sesn.go
@@ -32,21 +32,13 @@ func NewBleOicSesn(bx *BleXport, cfg sesn.SesnCfg)
*BleOicSesn {
onCloseCb: cfg.OnCloseCb,
}
- iotUuid, err := ParseUuid(IotivitySvcUuid)
+ iotUuid, _ := ParseUuid(OmpUnsecSvcUuid)
svcUuids := []BleUuid{
- {U16: OmpSvcUuid},
iotUuid,
}
- reqChrUuid, err := ParseUuid(OmpReqChrUuid)
- if err != nil {
- panic(err.Error())
- }
-
- rspChrUuid, err := ParseUuid(OmpRspChrUuid)
- if err != nil {
- panic(err.Error())
- }
+ reqChrUuid, _ := ParseUuid(OmpUnsecReqChrUuid)
+ rspChrUuid, _ := ParseUuid(OmpUnsecRspChrUuid)
bos.bf = NewBleFsm(BleFsmParams{
Bx: bx,
diff --git a/newtmgr/vendor/mynewt.apache.org/newtmgr/nmxact/nmp/log.go
b/newtmgr/vendor/mynewt.apache.org/newtmgr/nmxact/nmp/log.go
index e03376f..b2b34a7 100644
--- a/newtmgr/vendor/mynewt.apache.org/newtmgr/nmxact/nmp/log.go
+++ b/newtmgr/vendor/mynewt.apache.org/newtmgr/nmxact/nmp/log.go
@@ -215,7 +215,7 @@ type LogLevelListReq struct {
type LogLevelListRsp struct {
NmpBase
Rc int `codec:"rc" codec:",omitempty"`
- Map map[string]int `codec:"module_map"`
+ Map map[string]int `codec:"level_map"`
}
func NewLogLevelListReq() *LogLevelListReq {
diff --git a/newtmgr/vendor/mynewt.apache.org/newtmgr/nmxact/scan/scan.go
b/newtmgr/vendor/mynewt.apache.org/newtmgr/nmxact/scan/scan.go
index 162feb9..318e777 100644
--- a/newtmgr/vendor/mynewt.apache.org/newtmgr/nmxact/scan/scan.go
+++ b/newtmgr/vendor/mynewt.apache.org/newtmgr/nmxact/scan/scan.go
@@ -52,12 +52,12 @@ func BleOmpScanCfg(ScanCb ScanFn) Cfg {
Ble: CfgBle{
ScanPred: func(adv bledefs.BleAdvReport) bool {
for _, u := range adv.Fields.Uuids16 {
- if u == bledefs.OmpSvcUuid {
+ if u == bledefs.OmpSecSvcUuid {
return true
}
}
- iotUuid, _ :=
bledefs.ParseUuid(bledefs.IotivitySvcUuid)
+ iotUuid, _ :=
bledefs.ParseUuid(bledefs.OmpUnsecSvcUuid)
for _, u128 := range adv.Fields.Uuids128 {
u := bledefs.BleUuid{U128: u128}
if bledefs.CompareUuids(u, iotUuid) ==
0 {
--
To stop receiving notification emails like this one, please contact
"commits@mynewt.apache.org" <commits@mynewt.apache.org>.
