add interval to get data from remote

Author: pippo3

.DS_Store

@@ -55,7 +55,6 @@
     <script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
     <script src="bower_components/angular-ui-router/release/angular-ui-router.js"></script>
     <script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
-    <script src="bower_components/angular-gage/dist/angular-gage.js"></script>
     <!-- endbower -->
     <!-- endbuild -->
 

sensors-client/app/index.html

@@ -1,7 +1,7 @@
 angular.module('app.config')
   .constant('urls', {
-    host: 'data/',
-    getCurrentTemperatur: 'temperatur.json'
+    host: 'http://192.168.178.30:3000/',
+    getCurrentTemperatur: 'getCurrentTemperatur'
   })
 
   .constant('gaugeconfig', {

sensors-client/app/scripts/config/constants.js

@@ -8,18 +8,24 @@
  * Controller of the sensorsClientApp
  */
 angular.module('sensorsClientApp')
-  .controller('MainCtrl', function ($scope,$http,$filter, urls, gaugeconfig) {
+  .controller('MainCtrl', function ($scope, $http, $filter, $interval, $log, urls, gaugeconfig) {
+    getData();
+    $interval(function () {
+      console.log('intervall');
+      getData();
+    }, 10000)
 
-
-    $http({
-      method: 'GET',
-      url: urls.host + '' + urls.getCurrentTemperatur
-    }).then(function successCallback(response) {
-      gaugeconfig.title = 'Temperatur Wohnzimmer';
-      gaugeconfig.value = $filter('number')(response.data.temperatur / 1000, 1);
-      $scope.config = gaugeconfig;
-    }, function errorCallback(response) {
-
-    });
+    function getData() {
+      $http({
+        method: 'GET',
+        url: urls.host + '' + urls.getCurrentTemperatur
+      }).then(function successCallback(response) {
+        gaugeconfig.title = 'Temperatur Wohnzimmer';
+        gaugeconfig.value = $filter('number')(response.data.temperatur / 1000, 1);
+        $scope.config = gaugeconfig;
+      }, function errorCallback(response) {
+        $log.error('Can not get temperatur data from sensor');
+      });
+    }
 
   });

sensors-client/app/scripts/controllers/main.js

@@ -10,13 +10,13 @@ module.exports = function (app) {
 
 
 router.get('/', function (req, res, next) {
-	// load the single view file (angular will handle the page changes on the front-end)
-	res.sendfile('./public/index.html');
+  // load the single view file (angular will handle the page changes on the front-end)
+  res.sendfile('./public/index.html');
 });
 
 router.get('/getCurrentTemperatur', function (req, res, next) {
-  var response ={};
-  fs.readFile(config.data.pathTow1_slave + '/' + config.device.serial + '/' + config.data.w1_slaveFilename, 'utf8', function (err,data) {
+  var response = {};
+  fs.readFile(config.data.pathTow1_slave + '/' + config.device.serial + '/' + config.data.w1_slaveFilename, 'utf8', function (err, data) {
     if (err) {
       return console.log(err);
     }
@@ -30,55 +30,70 @@ router.get('/getCurrentTemperatur', function (req, res, next) {
 
 router.get('/enableLed/:gpiopin', function (req, res, next) {
   var gpiopin = req.params.gpiopin;
-  gpio.open(gpiopin, "output", function(err) {
-    if(err){
-      console.error('ERROR: Can not open gpio pin ' + gpiopin);
-      res.json({status: true});
-    }
-    else{
-      gpio.write(gpiopin, 1, function() {
-        console.log('LED enabled' + gpiopin);
-        res.json({status: true});
+  gpio.read(gpiopin, function (err, value) {
+    if (value != 1) {
+      gpio.open(gpiopin, "output", function (err) {
+        if (err) {
+          console.error('ERROR: Can not open gpio pin ' + gpiopin);
+          res.json({status: false});
+        }
+        else {
+          gpio.write(gpiopin, 1, function () {
+            console.log('LED enabled' + gpiopin);
+            res.json({status: true});
+          });
+        }
       });
+    } else {
+      res.json({status: true});
     }
   });
+
 });
 
 router.get('/disableLed/:gpiopin', function (req, res, next) {
   var gpiopin = req.params.gpiopin;
-  gpio.open(gpiopin, "output", function(err) {         // Open pin 16 for output
-    gpio.write(gpiopin, 1, function() {                  // Set pin 16 high (1)
+  gpio.read(gpiopin, function (err, value) {
+    if (value == 1) {
       gpio.close(gpiopin);
-    });
+    }
+    res.json({status: value});
   });
-  res.json({status: false});
+
+
 });
 
 router.get('/getLedStatus', function (req, res, next) {
-  var redLedStatus = 0;
-  gpio.read(11, function(err, value) {
-    console.log('11 = ' + value);
-    redLedStatus = value;	// The current state of the pin
+  var response = [{
+    color: 'red',
+    gpiopin: 11,
+    status: false
+  },
+    {
+      color: 'yellow',
+      gpiopin: 13,
+      status: false
+    },
+    {
+      color: 'green',
+      gpiopin: 15,
+      status: false
+    }
+  ]
+  gpio.read(11, function (err, value) {
+    response[0].status = (value) ? 1 : 0;
+    gpio.read(13, function (err, value) {
+      response[1].status = (value) ? 1 : 0;
+      gpio.read(15, function (err, value) {
+        response[2].status = (value) ? 1 : 0;
+        res.json(response);
+      });
+    });
   });
 
-  console.log('11 = ' + redLedStatus);
-  var response = [{
-		color: 'red',
-		gpiopin: 11,
-		status: redLedStatus
-	},
-	{
-		color: 'yellow',
-		gpiopin: 13,
-		status: false
-	},
-	{
-		color: 'green',
-		gpiopin: 15,
-		status: false
-	}
-	]
-
-
-	res.json(response);
+
+
+
+
+
 });