[GitHub] andrzej-kaczmarek commented on a change in pull request #904: ble service: Battery Service
andrzej-kaczmarek commented on a change in pull request #904: ble service: Battery Service URL: https://github.com/apache/mynewt-core/pull/904#discussion_r174080382 ## File path: net/nimble/host/services/bas/syscfg.yml ## @@ -0,0 +1,32 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +syscfg.defs: +BLE_SVC_BAS_BATTERY_LEVEL_PERM: +description: > +Defines permissions for writing "Battery Level" characteristics. Can +be zero to allow write without extra permissions or combination of: +BLE_GATT_CHR_F_READ_ENC +BLE_GATT_CHR_F_READ_AUTHEN +BLE_GATT_CHR_F_READ_AUTHOR +value: 0 +BLE_SVC_BAS_BATTERY_LEVEL_NOTIFY: +description: > +Set to BLE_GATT_CHR_F_NOTIFY to support notification, +or 0 to disable it. +value: BLE_GATT_CHR_F_NOTIFY Review comment: Based on some informations scattered in different places of spec, notifications should most likely follow permissions of CCCD. However, NimBLE does not allow to set them and obviously also does not enforce them so there's nothing to set here actually :) I'd leave this as NOTIFY_ENABLE 0/1 syscfg for now and I'll look into adding appropriate support in Mynewt - we can then add NOTIFY_PERM syscfg and update code accordingly. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] andrzej-kaczmarek commented on a change in pull request #904: ble service: Battery Service
andrzej-kaczmarek commented on a change in pull request #904: ble service: Battery Service URL: https://github.com/apache/mynewt-core/pull/904#discussion_r173956237 ## File path: net/nimble/host/services/bas/syscfg.yml ## @@ -0,0 +1,32 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +syscfg.defs: +BLE_SVC_BAS_BATTERY_LEVEL_PERM: +description: > +Defines permissions for writing "Battery Level" characteristics. Can +be zero to allow write without extra permissions or combination of: Review comment: +1 for READ_PERM This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] andrzej-kaczmarek commented on a change in pull request #904: ble service: Battery Service
andrzej-kaczmarek commented on a change in pull request #904: ble service: Battery Service URL: https://github.com/apache/mynewt-core/pull/904#discussion_r173956385 ## File path: net/nimble/host/services/bas/syscfg.yml ## @@ -0,0 +1,32 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +syscfg.defs: +BLE_SVC_BAS_BATTERY_LEVEL_PERM: +description: > +Defines permissions for writing "Battery Level" characteristics. Can +be zero to allow write without extra permissions or combination of: +BLE_GATT_CHR_F_READ_ENC +BLE_GATT_CHR_F_READ_AUTHEN +BLE_GATT_CHR_F_READ_AUTHOR +value: 0 +BLE_SVC_BAS_BATTERY_LEVEL_NOTIFY: +description: > +Set to BLE_GATT_CHR_F_NOTIFY to support notification, +or 0 to disable it. +value: BLE_GATT_CHR_F_NOTIFY Review comment: this should be a simple 0/1 value - it's not a permissions mask, just simple bool to either enable or disable notify prop This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] andrzej-kaczmarek commented on a change in pull request #904: ble service: Battery Service
andrzej-kaczmarek commented on a change in pull request #904: ble service:
Battery Service
URL: https://github.com/apache/mynewt-core/pull/904#discussion_r173956969
##
File path: net/nimble/host/services/bas/src/ble_svc_bas.c
##
@@ -0,0 +1,148 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#include
+#include
+
+#include "sysinit/sysinit.h"
+#include "syscfg/syscfg.h"
+#include "host/ble_hs.h"
+#include "host/ble_gap.h"
+#include "services/bas/ble_svc_bas.h"
+
+/* Charachteristic value handles */
+#if MYNEWT_VAL(BLE_SVC_BAS_BATTERY_LEVEL_NOTIFY) > 0
+static uint16_t ble_svc_bas_battery_handle;
+#endif
+
+/* Connection handle
+ *
+ * TODO: In order to support multiple connections we would need to save
+ * the handles for every connection, not just the most recent. Then
+ * we would need to notify each connection when needed.
+ * */
+static uint16_t ble_svc_bas_conn_handle;
+
+/* Battery level */
+uint8_t ble_svc_bas_battery_level;
+
+/* Access function */
+static int
+ble_svc_bas_access(uint16_t conn_handle, uint16_t attr_handle,
+ struct ble_gatt_access_ctxt *ctxt, void *arg);
+
+static const struct ble_gatt_svc_def ble_svc_bas_defs[] = {
+{
+/*** Battery Service. */
+.type = BLE_GATT_SVC_TYPE_PRIMARY,
+.uuid = BLE_UUID16_DECLARE(BLE_SVC_BAS_UUID16),
+.characteristics = (struct ble_gatt_chr_def[]) { {
+ /*** Battery level characteristic */
+.uuid = BLE_UUID16_DECLARE(BLE_SVC_BAS_CHR_UUID16_BATTERY_LEVEL),
+.access_cb = ble_svc_bas_access,
+#if MYNEWT_VAL(BLE_SVC_BAS_BATTERY_LEVEL_NOTIFY) > 0
+ .val_handle = _svc_bas_battery_handle,
+#endif
+.flags = BLE_GATT_CHR_F_READ |
+MYNEWT_VAL(BLE_SVC_BAS_BATTERY_LEVEL_PERM) |
+MYNEWT_VAL(BLE_SVC_BAS_BATTERY_LEVEL_NOTIFY),
+ }, {
+0, /* No more characteristics in this service. */
+} },
+},
+
+{
+0, /* No more services. */
+},
+};
+
+/**
+ * BAS access function
+ */
+static int
+ble_svc_bas_access(uint16_t conn_handle, uint16_t attr_handle,
+ struct ble_gatt_access_ctxt *ctxt,
+ void *arg)
+{
+uint16_t uuid16 = ble_uuid_u16(ctxt->chr->uuid);
+int rc;
+
+switch (uuid16) {
+case BLE_SVC_BAS_CHR_UUID16_BATTERY_LEVEL:
+assert(ctxt->op == BLE_GATT_ACCESS_OP_READ_CHR);
+rc = os_mbuf_append(ctxt->om, _svc_bas_battery_level,
+sizeof ble_svc_bas_battery_level);
+return rc == 0 ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES;
+
+default:
+assert(0);
+return BLE_ATT_ERR_UNLIKELY;
+}
+}
+
+/**
+ * This function must be called with the connection handle when a gap
+ * connect event is received in order to send notifications to the
+ * client.
+ *
+ * @params conn_handle The connection handle for the current
+ * connection.
+ */
+void
+ble_svc_bas_on_gap_connect(uint16_t conn_handle)
+{
+ble_svc_bas_conn_handle = conn_handle;
+}
+
+/**
+ * Set the battery level, must be between 0 and 100.
+ * If greater than 100, it will be silently set to 100.
+ */
+int
+ble_svc_bas_battery_level_set(uint8_t level) {
+if (level > 100)
+ level = 100;
+ble_svc_bas_battery_level = level;
+#if MYNEWT_VAL(BLE_SVC_BAS_BATTERY_LEVEL_NOTIFY) > 0
+return ble_gattc_notify(ble_svc_bas_conn_handle,
+ble_svc_bas_battery_handle);
Review comment:
we probably should not notify if value did not change, i.e. if
ble_svc_bas_battery_level == level
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
