Merge pull request #5 from hardillb/master

Added node for Ti SensorTag BLE device

hardware/digiRGB/78-digiRGB.html

@@ -42,7 +42,7 @@
    <!-- This content appears in the Info sidebar when a node is selected     -->
    <!-- The first <p> is used as the pop-up tool tip when hovering over a    -->
    <!-- node in the palette.                                                 -->
-   <p>Simple outputput node to drive digispark RGB</p>
+   <p>Simple output node to drive digispark RGB</p>
    <p>Requires msg.payload to be of the form 'r,g,b'</p>
 </script>
 

hardware/sensorTag/79-sensorTag.html

@@ -0,0 +1,107 @@
+<!--
+  Copyright 2013 IBM Corp.
+
+  Licensed 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.
+-->
+
+
+<!-- First, the content of the edit dialog is defined.                       -->
+
+<script type="text/x-red" data-template-name="sensorTag">
+   <!-- data-template-name identifies the node type this is for              -->
+
+   <!-- Each of the following divs creates a field in the edit dialog.       -->
+   <!-- Generally, there should be an input for each property of the node.   -->
+   <!-- The for and id attributes identify the corresponding property        --> 
+   <!-- (with the 'node-input-' prefix).                                     -->
+   <!-- The available icon classes are defined in Twitter Bootstrap          -->
+
+    <!-- By convention, most nodes have a 'name' property. The following div -->
+    <!-- provides the necessary field.                                       -->
+    <div class="form-row">
+        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
+    <div class="form-row">
+        <label for="node-input-name"><i class="icon-tag"></i> Topic</label>
+        <input type="text" id="node-input-topic" >
+    </div>
+    <div class="form-row">
+        <label for="node-input-name"><i class="icon-tag"></i> Temperature</label>
+        <input type="checkbox" id="node-input-temperature" placeholder="">
+    </div>
+    <div class="form-row">
+        <label for="node-input-name"><i class="icon-tag"></i> Humidity</label>
+        <input type="checkbox" id="node-input-humidity" >
+    </div>
+    <div class="form-row">
+        <label for="node-input-name"><i class="icon-tag"></i> Pressure</label>
+        <input type="checkbox" id="node-input-pressure" >
+    </div>
+    <div class="form-row">
+        <label for="node-input-name"><i class="icon-tag"></i> Magnetometer</label>
+        <input type="checkbox" id="node-input-magnetometer" >
+    </div>
+    <div class="form-row">
+        <label for="node-input-name"><i class="icon-tag"></i> Accelerometer</label>
+        <input type="checkbox" id="node-input-accelerometer" >
+    </div>
+    <div class="form-row">
+        <label for="node-input-name"><i class="icon-tag"></i> Gyroscope</label>
+        <input type="checkbox" id="node-input-gyroscope" >
+    </div>
+    <div class="form-row">
+        <label for="node-input-name"><i class="icon-tag"></i> Keys</label>
+        <input type="checkbox" id="node-input-keys" >
+    </div>
+</script>
+
+
+<!-- Next, some simple help text is provided for the node.                   -->
+<script type="text/x-red" data-help-name="sensorTag">
+   <!-- data-help-name identifies the node type this help is for             -->
+   <!-- This content appears in the Info sidebar when a node is selected     -->
+   <!-- The first <p> is used as the pop-up tool tip when hovering over a    -->
+   <!-- node in the palette.                                                 -->
+   <p>Simple outputput node to drive digispark RGB</p>
+   <p>Requires msg.payload to be of the form 'r,g,b'</p>
+</script>
+
+<!-- Finally, the node type is registered along with all of its properties   -->
+<!-- The example below shows a small subset of the properties that can be set-->
+<script type="text/javascript">
+    RED.nodes.registerType('sensorTag',{
+        category: 'advanced',      // the palette category
+        color:"GoldenRod",
+        defaults: {             // defines the editable properties of the node
+            name: {value:"sensorTag"},   //  along with default values.
+            topic: {value:"sensorTag"},
+            temperature: {value:true},
+            humidity: {value:true},
+            pressure: {value:true},
+            magnetometer: {value:true},
+            accelerometer: {value:true},
+            gyroscope: {value:true},
+            keys: {value:true}
+        },
+        inputs:0,                // set the number of inputs - only 0 or 1
+        outputs:1,               // set the number of outputs - 0 to n
+        icon: "bluetooth.png",    // set the icon (held in public/icons)
+        label: function() {      // sets the default label contents
+            return this.name||this.topic||"sensorTag";
+        },
+        labelStyle: function() { // sets the class to apply to the label
+            return this.name?"node_label_italic":"";
+        }
+    });
+</script>

hardware/sensorTag/79-sensorTag.js

@@ -0,0 +1,146 @@
+/**
+ * Copyright 2013 IBM Corp.
+ *
+ * Licensed 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.
+ **/
+
+// Sample Node-RED node file
+
+// Require main module
+var RED = require("../../red/red");
+var SensorTag = require('sensortag');
+var stag;
+var node;
+
+// The main node definition - most things happen in here
+function sensorTagNode(n) {
+    // Create a RED node
+    RED.nodes.createNode(this,n);
+    this.name = n.name;
+    this.topic = n.topic;
+    this.temperature = n.temperature;
+    this.pressure = n.pressure;
+    this.humidity = n.humidity;
+    this.accelerometer = n.accelerometer;
+    this.magnetometer = n.magnetometer;
+    this.gyroscope = n.gyroscope;
+    this.keys = n.keys;
+    node=this;
+    
+    if ( typeof stag == "undefined") {
+    //console.log("starting");
+    SensorTag.discover(function(sensorTag){ 
+        stag = sensorTag;
+        sensorTag.connect(function(){
+            //console.log("connected");
+            sensorTag.discoverServicesAndCharacteristics(function(){
+                sensorTag.enableIrTemperature(function(){});
+                sensorTag.on('irTemperatureChange', 
+                function(objectTemperature, ambientTemperature){
+                  var msg = {'topic': node.topic + '/tempature'};
+                  msg.payload = {'object': objectTemperature.toFixed(1),
+                  'ambient':ambientTemperature.toFixed(1)
+                  };
+                  node.send(msg);
+                });
+                sensorTag.enableBarometricPressure(function(){});
+                sensorTag.on('barometricPressureChange', function(pressure){
+                    var msg = {'topic': node.topic + '/pressure'};
+                    msg.payload = {'pres': pressure.toFixed(1)};
+                    node.send(msg);
+                });
+                sensorTag.enableHumidity(function(){});
+                sensorTag.on('humidityChange', function(temp, humidity) {
+                    var msg = {'topic': node.topic + '/humidity'};
+                    msg.payload = {'temp': temp.toFixed(1),
+                    'humidity': humidity.toFixed(1)
+                    };
+                    node.send(msg);
+                });
+                sensorTag.enableAccelerometer(function(){});
+                sensorTag.on('accelerometerChange', function(x,y,z){
+                   var msg = {'topic': node.topic + '/accelerometer'};
+                   msg.payload = {'x': x, 'y': y, 'z': z};
+                   node.send(msg);
+                });
+                sensorTag.enableMagnetometer(function() {});
+                sensorTag.on('magnetometerChange', function(x,y,z){
+                   var msg = {'topic': node.topic + '/magnetometer'};
+                   msg.payload = {'x': x, 'y': y, 'z': z};
+                   node.send(msg);
+                });
+                sensorTag.enableGyroscope(function(){});
+                sensorTag.on('gyroscopeChange', function(x,y,z){
+                   var msg = {'topic': node.topic + '/gyroscope'};
+                   msg.payload = {'x': x, 'y': y, 'z': z};
+                   node.send(msg);
+                });
+                sensorTag.on('simpleKeyChange', function(left, right){
+                   var msg = {'topic': node.topic + '/keys'};
+                   msg.payload = {'left': left, 'right': right};
+                   node.send(msg);
+                });
+                enable();
+            });
+        });
+    });
+    } else {
+      //console.log("reconfig");
+      enable();
+    }
+
+    
+}
+
+function enable() {
+                if (node.temperature) {
+                  stag.notifyIrTemperature(function(){});
+                } else {
+                  stag.unnotifyIrTemperature(function(){});
+                }
+                if (node.pressure) {
+                  stag.notifyBarometricPressure(function(){});
+                } else {
+                  stag.unnotifyBarometricPressure(function(){});
+                }
+                if (node.humidity) {
+                  stag.notifyHumidity(function() {});
+                } else {
+                  stag.unnotifyHumidity(function() {});
+                }
+                if (node.accelometer){
+                  stag.notifyAccelerometer(function() {});
+                } else {
+                  stag.unnotifyAccelerometer(function() {});
+                }
+                if (node.magnetometer) {
+                  stag.notifyMagnetometer(function() {});
+                } else {
+                  stag.unnotifyMagnetometer(function() {});
+                }
+                if (node.gyroscope) {
+                  stag.notifyGyroscope(function() {});
+                } else {
+                  stag.unnotifyGyroscope(function() {});
+                }
+                if (node.keys) {
+                  stag.notifySimpleKey(function() {});
+                } else {
+                  stag.unnotifySimpleKey(function() {});
+                }
+}
+
+// Register the node by name. This must be called before overriding any of the
+// Node functions.
+RED.nodes.registerType("sensorTag",sensorTagNode);
+

hardware/sensorTag/README

@@ -0,0 +1,5 @@
+This currently requires a slightly modified sensortag library
+
+To install use the following command in the Node-Red directory
+
+npm install sensortag@https://api.github.com/repos/hardillb/node-sensortag/tarball