Repository: incubator-mynewt-core Updated Branches: refs/heads/master f5c02fe01 -> 3bd1a0d09
MYNEWT-729 SensorAPI: Send sensor data over OIC - Revert mistaken changes 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/5c641d1f Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/5c641d1f Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/5c641d1f Branch: refs/heads/master Commit: 5c641d1f25afc96aa834ee4d79c421d4c9881ae5 Parents: 75e6561 Author: Vipul Rahane <vipulrah...@apache.org> Authored: Mon Apr 17 11:05:51 2017 -0700 Committer: Vipul Rahane <vipulrah...@apache.org> Committed: Mon Apr 17 16:14:20 2017 -0700 ---------------------------------------------------------------------- net/oic/src/api/oc_core_res.c | 4 ---- net/oic/src/port/mynewt/ble_adaptor.c | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/5c641d1f/net/oic/src/api/oc_core_res.c ---------------------------------------------------------------------- diff --git a/net/oic/src/api/oc_core_res.c b/net/oic/src/api/oc_core_res.c index 45b9768..ccb3896 100644 --- a/net/oic/src/api/oc_core_res.c +++ b/net/oic/src/api/oc_core_res.c @@ -230,11 +230,7 @@ oc_core_init_platform(const char *mfg_name, oc_core_init_platform_cb_t init_cb, } oc_rep_new(tmp); oc_rep_start_root_object(); -#if 0 oc_rep_set_string_array(root, rt, core_resources[OCF_P].types); -#else - oc_rep_set_text_string(root, rt, "oic.wk.p"); -#endif oc_core_encode_interfaces_mask(oc_rep_object(root), core_resources[OCF_P].interfaces); oc_rep_set_uint(root, p, core_resources[OCF_P].properties & ~OC_PERIODIC); http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/5c641d1f/net/oic/src/port/mynewt/ble_adaptor.c ---------------------------------------------------------------------- diff --git a/net/oic/src/port/mynewt/ble_adaptor.c b/net/oic/src/port/mynewt/ble_adaptor.c index 3ce44a7..056b11c 100644 --- a/net/oic/src/port/mynewt/ble_adaptor.c +++ b/net/oic/src/port/mynewt/ble_adaptor.c @@ -86,6 +86,7 @@ static int oc_gatt_chr_access(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt *ctxt, void *arg); static const struct ble_gatt_svc_def gatt_svr_svcs[] = { { + /* Service: newtmgr */ .type = BLE_GATT_SVC_TYPE_PRIMARY, .uuid = &oc_gatt_svc_uuid.u, .characteristics = (struct ble_gatt_chr_def[]) {
