Split the device controls into separate files

Author: r2jitu

app.js

@@ -2,7 +2,6 @@ var app = require('http').createServer(handler)
   , io = require('socket.io').listen(app)
   , fs = require('fs')
   , jf = require('jsonfile')
-  , arduino = require('duino')
   , util = require('util')
 
 if (process.argv.length < 3) {
@@ -11,6 +10,7 @@ if (process.argv.length < 3) {
 }
 
 var config = jf.readFileSync(process.argv[2]);
+console.log('Using config: ' + util.inspect(config));
 
 app.listen(8080);
 
@@ -27,65 +27,31 @@ function handler(req, res) {
   });
 }
 
-var boards = {};
-
+var devices = {};
 for (var deviceName in config.devices) {
-  var descriptor = config.devices[deviceName]
+  var descriptor = config.devices[deviceName];
   if (fs.existsSync(descriptor.device)) {
+    var deviceModule = require(descriptor.module);
+    devices[deviceName] = deviceModule.create(descriptor);
     console.log('Connected device: ' + deviceName);
-    boards[deviceName] = {
-      board: new arduino.Board({
-        debug: true,
-        device: descriptor.device
-      })
-    };
+  } else {
+    console.log('Device "' + deviceName + '" not found');
   }
 }
 
-var PWM_R = 5;
-var PWM_L = 10;
-var DIR_R = 4;
-var DIR_L = 12;
-var ROBOT_LED = 13;
-
 io.sockets.on('connection', function (socket) {
   socket.on('led toggle', function (data) {
-    var boardInfo = boards[data.device];
-    if (boardInfo) {
-      var board = boardInfo.board;
-      var isLedOn = boardInfo.isLedOn = !boardInfo.isLedOn;
+    var device = devices[data.device];
+    if (device && device.board) {
+      var board = device.board;
+      var isLedOn = device.isLedOn = !device.isLedOn;
       board.digitalWrite(13, isLedOn ? board.HIGH : board.LOW);
     }
   });
 
-  socket.on('analogWrite', function (data) {
-    console.log('analogWrite(11,' + data.value + ')');
-    board.analogWrite(11, data.value);
-  });
-
-  socket.on('robot', function (data) {
-    console.log(data)
-    if (boards['robot']) {
-      var boardInfo = boards['robot'];
-      var board = boardInfo.board;
-      if ('left' in data) {
-        if (data.left == 0) {
-          board.analogWrite(PWM_L, 0);
-        } else {
-          board.analogWrite(PWM_L, Math.abs(data.left));
-          board.digitalWrite(DIR_L, data.left < 0 ? board.HIGH : board.LOW);
-        }
-      }
-      if ('right' in data) {
-        if (data.right == 0) {
-          board.analogWrite(PWM_R, 0);
-        } else {
-          board.analogWrite(PWM_R, Math.abs(data.right));
-          board.digitalWrite(DIR_R, data.right < 0 ? board.HIGH : board.LOW);
-        }
-      }
-    }
-  });
+  if (devices['robot']) {
+    devices['robot'].bindSocket(socket);
+  }
 
   socket.on('disconnect', function () {
   });

config.macosx.json

@@ -1,10 +1,12 @@
 {
   "devices": {
     "light": {
-      "device": "/dev/tty.usbmodem1d1141"
+      "device": "/dev/tty.usbmodem1d1141",
+      "module": "./light.js"
     },
     "robot": {
-      "device": "/dev/tty.usbmodem1d1131"
+      "device": "/dev/tty.usbmodem1d1131",
+      "module": "./robot.js"
     }
   }
 }

config.raspi.json

@@ -1,10 +1,12 @@
 {
   "devices": {
     "light": {
-      "device": "/dev/serial/by-id/usb-Arduino__www.arduino.cc__0043_753303039343513031E1-if00"
+      "device": "/dev/serial/by-id/usb-Arduino__www.arduino.cc__0043_753303039343513031E1-if00",
+      "module": "./light.js"
     },
     "robot": {
-      "device": "/dev/serial/by-id/usb-Arduino__www.arduino.cc__0043_75330303934351202011-if00"
+      "device": "/dev/serial/by-id/usb-Arduino__www.arduino.cc__0043_75330303934351202011-if00",
+      "module": "./robot.js"
     }
   }
 }

index.html

@@ -12,10 +12,6 @@
       });
     }
 
-    function setAnalog(value) {
-      socket.emit('analogWrite', { value: value });
-    }
-
     function robot(data) {
       socket.emit('robot', data);
     }
@@ -25,9 +21,6 @@
   <button onclick="ledToggle('light')">Toggle LED - light</button>
   <button onclick="ledToggle('robot')">Toggle LED - robot</button>
   <hr>
-  <input id="analogVal" value="0">
-  <button onclick="setAnalog(parseInt(document.getElementById('analogVal').value))">Set analog</button>
-  <hr>
   <button style="width: 200px;" onclick="robot({left: 255})">Left forward</button>
   <button style="width: 200px;" onclick="robot({right: 255})">Right forward</button>
   <br>

light.js

@@ -0,0 +1,13 @@
+var arduino = require('duino')
+
+var Light = function (descriptor) {
+  this.board = new arduino.Board({
+    debug: true,
+    device: descriptor.device
+  });
+};
+
+exports.create = function (descriptor) {
+  return new Light(descriptor);
+};
+

robot.js

@@ -0,0 +1,48 @@
+var arduino = require('duino')
+
+var PWM_R = 5;
+var PWM_L = 10;
+var DIR_R = 4;
+var DIR_L = 12;
+var ROBOT_LED = 13;
+
+var Robot = function (descriptor) {
+  this.board = new arduino.Board({
+    debug: true,
+    device: descriptor.device
+  });
+};
+
+Robot.prototype.setLeft = function (value) {
+  if (value == 0) {
+    this.board.analogWrite(PWM_L, 0);
+  } else {
+    this.board.analogWrite(PWM_L, Math.abs(value));
+    this.board.digitalWrite(DIR_L, value < 0 ? this.board.HIGH : this.board.LOW);
+  }
+};
+
+Robot.prototype.setRight - function (value) {
+  if (value == 0) {
+    this.board.analogWrite(PWM_R, 0);
+  } else {
+    this.board.analogWrite(PWM_R, Math.abs(value));
+    this.board.digitalWrite(DIR_R, value < 0 ? this.board.HIGH : this.board.LOW);
+  }
+};
+
+Robot.prototype.bindSocket = function (socket) {
+  socket.on('robot', function (data) {
+    if ('left' in data) {
+      this.setLeft(data.left);
+    }
+    if ('right' in data) {
+      this.setRight(data.right);
+    }
+  });
+};
+
+exports.create = function (descriptor) {
+  return new Robot(descriptor);
+};
+