PR 요청 드립니다.

.gitignore

@@ -10,3 +10,4 @@ dump.rdb
 client/.idea/*
 .idea/*
 tags
+sftp-config.json

lib/middleware/websocketServer.js

@@ -28,7 +28,7 @@ module.exports = function websocketServer(appServer, topic){
       });
 
       try {
-        logger.debug('[WebsocketServer] emitting data', data);
+        logger.debug('[WebsocketServer] emitting data[', topic || 'data', ']', data);
         io.emit(topic || 'data', data);
       } catch (e) {
         logger.error('[WebsocketServer] error on emitting', e);

lib/sensor/driver/dht/README.md

@@ -0,0 +1,21 @@
+# 보드에 따른 선택적 실행
+**index.js** 내부에서는 Beaglebone Black과 Raspberry Pi의 **hostname**을 이용하여 분기 실행합니다.
+
+```js
+...
+var executeTarget = __dirname + ((os.hostname().indexOf('raspberry') > -1)? '/bin/Raspberry_DHT11': '/bin/Beagle_GPIO_dht22');
+    var executeAddress = (os.hostname().indexOf('raspberry') > -1)? 'G:' + self.address: self.address;
+    inProgress = true;
+
+    childProcess.exec([
+        executeTarget,
+        '-s', 
+        self.model,
+        '-g', 
+        executeAddress || '27',
+    ].join(' '), {
+        timeout: Dht.properties.recommendedInterval,
+        killSignal: 'SIGKILL'
+    }, function (err, data) {
+    ...
+```

lib/sensor/driver/dht/index.js

@@ -1,123 +1,168 @@
 'use strict';
 var Sensor = require('../index').Sensor,
-  util = require('util'),
-  childProcess = require('child_process');
+    util = require('util'),
+    childProcess = require('child_process'),
+    os = require('os');
 
 var _cached = { retries: 0},
-  inProgress = false,
-  logger = Sensor.getLogger();
+    inProgress = false,
+    logger = Sensor.getLogger();
 
 // options.model : dht11(default) or dht22
 function Dht(sensorInfo, options) {
-  Sensor.call(this, sensorInfo, options);
-  if (sensorInfo.device.address) {
-    this.address = sensorInfo.device.address;
-  }
-  if (sensorInfo.model) {
-    this.model = sensorInfo.model;
-  } else {
-    this.model = (options && options.model === 'dht22') ? 'dht22' : 'dht11';
-  }
+    Sensor.call(this, sensorInfo, options);
+    if (sensorInfo.device.address) {
+        this.address = sensorInfo.device.address;
+    }
+    if (sensorInfo.model) {
+        this.model = sensorInfo.model;
+    } else {
+        this.model = (options && options.model === 'dht22') ? 'dht22' : 'dht11';
+    }
 }
 
 Dht.properties = {
-  supportedNetworks: ['gpio'],
-  dataTypes: ['humidity'],
-  onChange: false,
-  discoverable: false,
-  addressable: true,
-  recommendedInterval: 60000,
-  validCachedValueTimeout: 25000,
-  maxInstances: 1,
-  models: ['dht11', 'dht22'],
-  idTemplate: '{model}-{gatewayId}-{deviceAddress}', // id generation template
-  errorRange: '1', 
-  validValueRange: [0, 100],
-  maxRetries: 4,
-  category: 'sensor'
+    supportedNetworks: ['gpio'],
+    dataTypes: ['humidity'],
+    onChange: false,
+    discoverable: false,
+    addressable: true,
+    recommendedInterval: 60000,
+    validCachedValueTimeout: 25000,
+    maxInstances: 1,
+    models: ['dht11', 'dht22'],
+    idTemplate: '{model}-{gatewayId}-{deviceAddress}', // id generation template
+    errorRange: '1', 
+    validValueRange: [0, 100],
+    maxRetries: 4,
+    category: 'sensor'
 };
 
 
 util.inherits(Dht, Sensor);
 
 Dht.prototype._get = function () {
-  var self = this;
-  setTimeout(self.__get(), 3000); // delay 1sec to avoid busy situation
+    var self = this;
+    setTimeout(self.__get(), 3000); // delay 1sec to avoid busy situation
 };
 
 Dht.prototype.__get = function () {
-  var self = this;
-
-  //if (_cached.time && _cached.time + Dht.properties.validCachedValueTimeout > Date.now()) {
-  //  _cached.data.time = _cached.time;
-  //  self.emit('data', _cached.data);
-  //}
-  if (inProgress) {
-    return;
-  }
-  inProgress = true;
-  childProcess.exec([
-    __dirname + '/bin/Beagle_GPIO_dht22',
-    '-s', 
-    self.model,
-    '-g', 
-    self.address || '27',
-  ].join(' '), {
-    timeout: Dht.properties.recommendedInterval,
-    killSignal: 'SIGKILL'
-  }, function (err, data) {
-
-    var retry = false, 
-        rtn;
-
-    inProgress = false;
-    if (err) {
-      rtn = {status: 'error', id : self.id, message: err.toString()};
-      _cached.retries = 0;
-      self.emit('data', rtn);
-    } else {
-      rtn = JSON.parse(data);
+    var self = this;
+
+    if (inProgress) {
+        return;
     }
 
-    rtn.id = self.id;
-    if (rtn.status === 'ok') {
-      var now = Date.now();
-      if (!_cached.time) { // 1st time init
+    var executeTarget = __dirname + ((os.hostname().indexOf('raspberry') > -1)? '/bin/Raspberry_DHT11': '/bin/Beagle_GPIO_dht22');
+    var executeAddress = (os.hostname().indexOf('raspberry') > -1)? 'G:' + self.address: self.address;
+
+    logger.debug('hostname >>> ', os.hostname());
+    logger.debug('executeTarget >>> ', executeTarget);
+    logger.debug('execute address : ', executeAddress);
+
+    inProgress = true;
+
+    childProcess.exec([
+        executeTarget,
+        '-s', 
+        self.model,
+        '-g', 
+        executeAddress || '27',
+    ].join(' '), {
+        timeout: Dht.properties.recommendedInterval,
+        killSignal: 'SIGKILL'
+    }, function (err, data) {
+
+        var retry = false, 
+                rtn;
+
+        inProgress = false;
+        if (err) {
+            rtn = {status: 'error', id : self.id, message: err.toString()};
+            _cached.retries = 0;
+            self.emit('data', rtn);
+        } else {
+            rtn = JSON.parse(data);
+        }
+
+        rtn.id = self.id;
+        if (rtn.status === 'ok') {
+            var now = Date.now();
+            if (!_cached.time) { // 1st time init
+                _cached.retries = 0;
+                retry = true;
+            } else {
+                var cacheExpire = _cached.time + Dht.properties.validCachedValueTimeout * Dht.properties.maxRetries,
+                diff = Math.abs(rtn.result.humidity - _cached.data.result.humidity);
+
+                // retry if cached value is too old or outof accepted error range
+                if ((now > cacheExpire) || (diff > Dht.properties.errorRange)) {
+                    retry = true;
+                }
+            }
+            _cached.time = now;
+            _cached.data = rtn;
+        } else { // rtn.satus === error
+            retry = true;
+        }
+
+        if (retry) {
+            logger.debug(self.model, 'retry _cached=', _cached, 'due to result=', rtn);
+            if (_cached.retries > Dht.properties.maxRetries) {
+                rtn = {status: 'error', id : self.id,
+                    message: 'too many retries due to invalid sensing value value'};
+            } else {
+                _cached.retries++;
+                process.nextTick(function () {self.__get(); });
+                return;
+            }
+        } 
+
         _cached.retries = 0;
-        retry = true;
-      } else {
-        var cacheExpire = _cached.time + Dht.properties.validCachedValueTimeout * Dht.properties.maxRetries,
-        diff = Math.abs(rtn.result.humidity - _cached.data.result.humidity);
-
-        // retry if cached value is too old or outof accepted error range
-        if ((now > cacheExpire) || (diff > Dht.properties.errorRange)) {
-          retry = true;
+        if (rtn.result) { //keep only humidity, remove temperature
+            delete rtn.result.temperature;
         }
-      }
-      _cached.time = now;
-      _cached.data = rtn;
-    } else { // rtn.satus === error
-      retry = true;
-    }
+        self.emit('data', rtn);
+    });
+};
 
-    if (retry) {
-      logger.debug(self.model, 'retry _cached=', _cached, 'due to result=', rtn);
-      if (_cached.retries > Dht.properties.maxRetries) {
-        rtn = {status: 'error', id : self.id,
-          message: 'too many retries due to invalid sensing value value'};
-      } else {
-        _cached.retries++;
-        process.nextTick(function () {self.__get(); });
-        return;
-      }
-    } 
+Dht.prototype.__getValue = function (timeout, callback) {
+    var self = this;
 
-    _cached.retries = 0;
-    if (rtn.result) { //keep only humidity, remove temperature
-      delete rtn.result.temperature;
+    if (inProgress) {
+        return;
     }
-    self.emit('data', rtn);
-  });
-};
+
+    var executeTarget = __dirname + ((os.hostname().indexOf('raspberry') > -1)? '/bin/Raspberry_DHT11': '/bin/Beagle_GPIO_dht22');
+    var executeAddress = (os.hostname().indexOf('raspberry') > -1)? 'G:' + self.address: self.address;
+
+    inProgress = true;
+
+    childProcess.exec([
+        executeTarget,
+        '-s', 
+        self.model,
+        '-g', 
+        executeAddress || '27',
+    ].join(' '), {
+        timeout: timeout || Dht.properties.recommendedInterval,
+        killSignal: 'SIGKILL'
+    }, function (err, data) {
+
+        var rtn;
+
+        if (err) {
+            rtn = {status: 'error', id : self.id, message: err.toString()};
+        } else {
+            rtn = JSON.parse(data);
+        }
+
+        rtn.id = self.id;
+
+        inProgress = false;
+
+        callback(err, rtn);
+    });
+}
 
 module.exports = Dht;

lib/sensor/driver/dht/src/Makefile → lib/sensor/driver/dht/src/beagle/Makefile

@@ -10,7 +10,7 @@ CFLAGS=-Wall -c -g
 #LDFLAGS=-Wall -O3
 LDFLAGS=-Wall -g
 
-BIN_DIR=../bin
+BIN_DIR=../../bin
 TARGETS = Beagle_GPIO.o	\
 	  $(BIN_DIR)/Beagle_GPIO_dht22
 

lib/sensor/driver/dht/src/raspberry/README.md

@@ -0,0 +1,2 @@
+# 빌드 방법
+**Raspberry Pi**에서 `build.sh`를 이용하여 빌드합니다.

lib/sensor/driver/dht/src/raspberry/build.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+echo "-----------------------------------------"
+echo "Install wiringPi static library."
+cd ./lib/wiringPi/wiringPi && make static && sudo make install-static
+
+sudo make install-static
+
+echo "-----------------------------------------"
+echo "Delte old file..."
+rm -f ../../../../../bin/Raspberry_DHT11
+
+echo "Compile dht11..."
+cd ../../../ && gcc -o ../../bin/Raspberry_DHT11 ./dht11.c -L/usr/local/lib -lwiringPi -lpthread
+echo "Complete."