Switching to wiringpi-node and add the final routing

Author: vietk

Dockerfile

@@ -1,10 +1,20 @@
-FROM node:latest
+FROM hypriot/rpi-node:6.10.0
 MAINTAINER Kevin Viet <[email protected]>
 
+RUN apt-get update && apt-get install -y -q \
+    git \
+    make \
+    gcc \
+    python \
+    g++ \ 
+ && rm -rf /var/lib/apt/lists/*
+
 RUN mkdir -p /usr
 WORKDIR /app
-COPY . /app
+COPY package.json /app
+RUN npm install
+COPY app.js /app
+COPY chaconEmitter.js /app
 
 EXPOSE 8080
-RUN npm install
-CMD ["npm", "start"]
+CMD ["npm", "start"]

app.js

@@ -4,38 +4,38 @@ var path = require('path');
 
 var pin = 0
 
-// var index = require('./routes/index');
-// var users = require('./routes/users');
-
-
-var router = express.Router();
 var app = express();
 
-router.put('switch/:device_id/emitterId:emiter_id/', function(req, res) {
-    var deviceId = req.parameter.device_id;
-    var emiterId = req.parameter.emiter_id;
-
-    res.status(200);
-});
+chaconEmitter.init();
 
-//app.get('/', router);
-app.get('/switch/:deviceId/:emitterId/:state/:dim', function (req, res) {
-    var deviceId = req.params.deviceId;
-    var emiterId = req.params.emiterId;
+app.get('/switch/:deviceId/:emitterId/:state', function (req, res) {
+    var deviceId = parseInt(req.params.deviceId);
+    var emitterId = parseInt(req.params.emitterId);
     var state = req.params.state;
 
+    // console.log(req.route);
+
+    // console.log('deviceId:%s', deviceId);
+    // console.log('emitterId:%s', emitterId);
+    // console.log('state:%s', state); 
+
     if (state == 'on') {
-        chaconEmitter.transmit(chaconEmitter.buildOrder(emiterId, deviceId, true));
+        chaconEmitter.transmit(chaconEmitter.buildOrder(emitterId, deviceId, true));
     }
     else if (state == 'off') {
-        chaconEmitter.transmit(chaconEmitter.buildOrder(emiterId, deviceId, false));
+        chaconEmitter.transmit(chaconEmitter.buildOrder(emitterId, deviceId, false));
     }
     else if (state == 'dim') {
-        var dim = parseInt(req.params.dim);
-        chaconEmitter.transmit(chaconEmitter.buildDimOrder(emiterId, deviceId, dim));
+        var dimValue = parseInt(req.query.value);
+	// console.log('dimValue:%s', dimValue);
+	if (0 <= dimValue && dimValue <= 100) {
+	   // console.log('dimming!');
+           chaconEmitter.transmit(chaconEmitter.buildDimOrder(emitterId, deviceId, dimValue), true);
+	}
     }
 
     res.status(200);
     res.send();
-})
-app.listen(8080);
+});
+
+app.listen(8089);

chaconEmitter.js

@@ -10,7 +10,7 @@ function init(GPIOPin) {
   }
   wpi.setup('wpi');
   wpi.pinMode(pin, wpi.OUTPUT);
-  //console.log('wpi setup on PIN :' + pin);
+  console.log('wpi setup on PIN :' + pin);
 }
 
 function setWPI(awpi) {
@@ -137,7 +137,7 @@ function doTransmit(order, dimmer) {
   wpi.digitalWrite(pin, wpi.HIGH);
   wpi.delayMicroseconds(275);
   wpi.digitalWrite(pin, wpi.LOW);
-  //console.log('transmit finished');
+  // console.log('transmit finished');
 }
 
 // exports

package.json

@@ -8,6 +8,6 @@
   "dependencies": {
     "debug": "~2.6.9",
     "express": "~4.15.5",
-    "wiring-pi": "^2.4.4"
+    "wiringpi-node": "^2.4.4"
   }
 }