Merge branch 'hotfix/1.0.1'

Author: Daisuke Baba

README.md

@@ -266,6 +266,9 @@ sudo hcidump -t -x
 Set `GENERIC_BLE_TRACE=true` on starting Node-RED and you can find the precise log in `/var/log/syslog`.
 
 # Revision History
+* 1.0.1
+  - Fix an issue where custom characteristics cannot be listed on the Generic BLE config node dialog
+
 * 1.0.0
   - Fix an issue where some devices cannot be discovered within a specific time window even after they can be connected
   - Fix an issue where the Scan Result select widget didn't show the same item as the stored device info

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-generic-ble",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Node-RED nodes for generic BLE devices",
   "license": "Apache-2.0",
   "repository": {

src/generic-ble.js

@@ -592,20 +592,17 @@ function toApiObject(peripheral) {
   });
 }
 
-function toDetailedObject(peripheral) {
+function toDetailedObject(peripheral, RED) {
   let p = Promise.resolve();
   return toApiObject(peripheral).then(obj => {
     if (peripheral.services) {
       obj.characteristics = [];
       peripheral.services.map((s) => {
         obj.characteristics = obj.characteristics.concat((s.characteristics || []).map((c) => {
-          if (!c.type) {
-            return null;
-          }
           let characteristic = {
             uuid: c.uuid,
-            name: c.name,
-            type: c.type,
+            name: c.name || RED._('generic-ble.label.unnamedChr'),
+            type: c.type || RED._('generic-ble.label.customType'),
             notifiable: c.properties.indexOf('notify') >= 0,
             readable: c.properties.indexOf('read') >= 0,
             writable: c.properties.indexOf('write') >= 0,
@@ -918,7 +915,7 @@ export default function(RED) {
     }
 
     let task = () => {
-      return toDetailedObject(peripheral).then(bleDevice => {
+      return toDetailedObject(peripheral, RED).then(bleDevice => {
         if (TRACE) {
           RED.log.info(`/__bledev/${address} OUTPUT`, JSON.stringify(bleDevice, null, 2));
         }

src/locales/en-US/generic-ble.yml

@@ -13,6 +13,8 @@ generic-ble:
     characteristics: GATT Characteristics
     notAvailable: (not available)
     notification: Emit notify events
+    customType: (Custom Type)
+    unnamedChr: <Unnamed>
   placeholder:
     localName: BLE device name
     address: aa:11:bb:22:cc:33 (case insensitive)