Make configuration changes work & stick. Start iSpindel integration

Author: cwilling

Makefile

@@ -1,5 +1,21 @@
 SHELL = /bin/bash
 
+SERVER_FILES = \
+	src/scripts/brewable.js \
+	src/scripts/modules/configuration.js \
+	src/scripts/modules/cpuinfo.js \
+	src/scripts/modules/fhem.js \
+	src/scripts/modules/gpioworker.js \
+	src/scripts/modules/jobprocessor.js \
+	src/scripts/modules/jsogpio.js \
+	src/scripts/modules/queue.js \
+	src/scripts/modules/requestHandlers.js \
+	src/scripts/modules/router.js \
+	src/scripts/modules/sainsmartrelay.js \
+	src/scripts/modules/sensor.js \
+	src/scripts/modules/sensorLister.js \
+	src/scripts/modules/server.js
+
 TEST_FILES = test-status.js \
 		src/scripts/modules/jsogpio.js \
 		src/scripts/modules/cpuinfo.js \
@@ -56,7 +72,7 @@ test.js: $(TEST_FILES)
 	./node_modules/.bin/rollup --config test.config.js
 	chmod a+x test.js
 
-server: node_modules src/scripts/brewable.js
+server: node_modules $(SERVER_FILES)
 	patch -p0 < websocket-no-binaries.diff
 	./node_modules/.bin/rollup --config server.config.js
 	patch -p0 -R < websocket-no-binaries.diff

server.config.js

@@ -14,7 +14,7 @@ export default {
   entry: 'src/scripts/brewable.js',
   dest: 'build/js/brewableserverbundle.js',
   format: 'cjs',
-  external: [ 'os', 'path', 'buffer', 'http', 'https', 'events', 'util', 'tty', 'net', 'url', 'fs', 'crypto' ],
+  external: [ 'os', 'path', 'buffer', 'http', 'https', 'events', 'util', 'tty', 'net', 'url', 'fs', 'crypto', 'querystring' ],
   banner: '#!/usr/bin/env node',
   sourceMap: 'inline',
   plugins: [

src/scripts/brewable.js

@@ -3,6 +3,7 @@ import start from "./modules/server";
 import route from "./modules/router";
 import { index as rhindex } from "./modules/requestHandlers";
 import { favicon as rhfavicon } from "./modules/requestHandlers";
+import { fhem as rhfhem } from "./modules/requestHandlers";
 import { status as rhstatus } from "./modules/requestHandlers";
 import { ws as rhws } from "./modules/requestHandlers";
 import Queue from "./modules/queue";
@@ -101,6 +102,7 @@ handle["/index"] = rhindex;
 handle["/index.htm"] = rhindex;
 handle["/index.html"] = rhindex;
 handle["/favicon.ico"] = rhfavicon;
+handle["/fhem"] = rhfhem;
 handle["/status.js"] = rhstatus;
 handle["/ws"] = rhws;
 

src/scripts/modules/configuration.js

@@ -1,9 +1,6 @@
-//import fs from "fs";
+import fs from "fs";
 import mkdirp from "mkdirp";
-//import path from 'path';
-var fs = require('fs');
-var path =require('path');
-//var mkdirp = require('mkdirp');
+import path from 'path';
 var home = require('os').homedir();
 
 
@@ -12,7 +9,13 @@ var defaultConfigValues = function() {
     'sensorFudgeFactors'     : {},
     'multiSensorMeanWeight' : parseInt(50),
     'relayDelayPostON'      : parseInt(180),
-    'relayDelayPostOFF'     : parseInt(480)
+    'relayDelayPostOFF'     : parseInt(480),
+    'iSpindelA'             : {
+      "name":"iSpindel",
+      "calfactor0":0.00438551,
+      "calfactor1":0.13647658,
+      "calfactor2":6.968821422
+    }
   };
 };
 
@@ -64,6 +67,13 @@ Configuration.prototype.loadConfigFromFile = function () {
   }
 };
 
+/* Save the user's configuration
+*/
+Configuration.prototype.saveConfigToFile = function () {
+  console.log("saveConfigToFile()");
+  fs.writeFileSync(this._configFileName, JSON.stringify(this._configuration));
+};
+
 Configuration.prototype.getConfiguration = function () {
   return this._configuration;
 };
@@ -85,6 +95,8 @@ Configuration.prototype.dir = function (topic) {
 };
 
 Configuration.prototype.updateFudgeEntry = function (sensorIds) {
+  console.log("updateFudgeEntry()");
+
   var config = this._configuration;
   /* Case 1 - Simple conversion
      from: single 'global' fudge factor (applying to all sensors)
@@ -141,7 +153,7 @@ Configuration.prototype.updateFudgeEntry = function (sensorIds) {
 };
 
 Configuration.prototype.setMultiSensorMeanWeight = function (value) {
-  console.log("updateMultiSensorMeanWeight(" + value + ")");
+  console.log("setMultiSensorMeanWeight(" + value + ")");
   var config = this._configuration;
   if (value < 0 ) {
     value = 0;
@@ -152,6 +164,24 @@ Configuration.prototype.setMultiSensorMeanWeight = function (value) {
   fs.writeFileSync(this._configFileName, JSON.stringify(config));
 };
 
+Configuration.prototype.setRelayDelayPost = function (onoff, value) {
+  console.log("setRelayDelayPost(" + onoff + ", " + value + ")");
+  if (onoff == 'relayDelayPostON' || onoff == 'relayDelayPostOFF' ) {
+    var config = this._configuration;
+    config[onoff] = value;
+    fs.writeFileSync(this._configFileName, JSON.stringify(config));
+  } else {
+    console.log("Unkown config item (" + onoff + ")");
+  }
+};
+
+Configuration.prototype.setFudgeFactor = function (key, val) {
+  //console.log("setFudgeFactor() " + key + ", val " + val);
+
+  var config = this._configuration;
+  config.sensorFudgeFactors[key] = val;
+  fs.writeFileSync(this._configFileName, JSON.stringify(config));
+};
 
 /********
 atest = new Configuration();

src/scripts/modules/gpioworker.js

@@ -23,6 +23,7 @@ var sensorDevices = [];
 var sensorResults = [];
 var sensorsRead = 0;
 
+
 function gpioWorker (input_queue, output_queue) {
   this.input_queue = input_queue;
   this.output_queue = output_queue;
@@ -48,6 +49,10 @@ function gpioWorker (input_queue, output_queue) {
   // Relay device
   this.relay = new Relay();
   //this.relay.testConnected();
+  for (var i=0;i<this.relay.deviceCount();i++) {
+    this.relay.setDelaySetValue(i+1, 'on_time', this.configuration['relayDelayPostON']);
+    this.relay.setDelaySetValue(i+1, 'off_time', this.configuration['relayDelayPostOFF']);
+  }
 
   // Temperature sensors
   sensorDevices = this.sensorDevices();
@@ -57,7 +62,7 @@ function gpioWorker (input_queue, output_queue) {
   this.configObj.updateFudgeEntry(sensorDevices);
   console.log("Using configuration: " + JSON.stringify(this.configuration));
 
-  // Set sensor fudge according to configuration
+  // Now set sensor fudge according to updated configuration
   sensorDevices.forEach( function (sensor) {
     sensor.setFudge(parseFloat(config['sensorFudgeFactors'][sensor.getId()]));
   });
@@ -125,16 +130,30 @@ function gpioWorker (input_queue, output_queue) {
     }
   }.bind(this));
 
-  // eventEmitter WAS global (from index.js)
   eventEmitter.on('sensor_read', allSensorsRead);
   eventEmitter.on('msg_waiting', this.processMessage.bind(this));
 
+  eventEmitter.on('fhem_reading', function(obj) {
+    this.fhemReading(obj);
+  }.bind(this));
+
 } 
 //module.exports = gpioWorker;
 //export default gpioWorker;
-//export default gpioWorker;
 export { gpioWorker, eventEmitter };
 
+gpioWorker.prototype.fhemReading = function (reading) {
+  //console.log("fhemReading() " + JSON.stringify(reading));
+  var name = reading.name;
+  var tilt = reading.tilt;
+  var temp = reading.temp;
+  var batt = reading.batt;
+  console.log("fhem() " + name + ", " + tilt + ", " + temp + ", " + batt);
+
+  //var plato = calcPlato(tilt, temp);
+  //console.log("plato = " + plato);
+};
+
 gpioWorker.prototype.sensorDevices = function () {
   var deviceList = [];
 
@@ -320,11 +339,25 @@ gpioWorker.prototype.config_change = function (msg) {
         item.setFudge(msg.data['fudge']);
       }
     });
+    //this.configuration.sensorFudgeFactors[msg.data['sensorFudgeFactors']] = msg.data['fudge'];
+    this.configObj.setFudgeFactor(msg.data['sensorFudgeFactors'], msg.data['fudge']);
   } else if (keys[0] == 'multiSensorMeanWeight') {
     this.configObj.setMultiSensorMeanWeight(msg.data['multiSensorMeanWeight']);
+  } else if (keys[0] == 'relayDelayPostON' || keys[0] == 'relayDelayPostOFF') {
+    for (var i=0;i<this.relay.deviceCount();i++) {
+      if (keys[0] == 'relayDelayPostON') {
+        this.relay.setDelaySetValue(i+1, 'on_time', msg.data[keys[0]]);
+      } else {
+        this.relay.setDelaySetValue(i+1, 'off_time', msg.data[keys[0]]);
+      }
+    }
+    //this.configuration[keys[0]] = msg.data[keys[0]];
+    this.configObj.setRelayDelayPost(keys[0], msg.data[keys[0]]);
   } else {
     console.log("config_change(): " + keys[0] + " = " + msg.data[keys[0]]);
   }
+  console.log("this.configuration = " + JSON.stringify(this.configuration));
+  //this.configObj.saveConfigToFile();
 };
 
 gpioWorker.prototype.list_sensors = function (msg) {

src/scripts/modules/requestHandlers.js

@@ -1,5 +1,6 @@
 var fs = require("fs");
 var path = require('path');
+import { newReading } from './fhem.js';
 
 function index(response) {
   console.log("Request handler 'index' was called.");
@@ -38,6 +39,24 @@ function favicon(response) {
   });
 }
 
+function fhem(response, query) {
+  console.log("Request handler 'fhem' was called with query: " + query);
+  newReading(query);
+  /*
+  fs.readFile(path.join(__dirname, "../../../favicon.ico"), function (err, data) {
+    if(err){
+      response.writeHead(404);
+      response.write("Not Found!");
+    } else {
+      response.writeHead(200, {"Content-Type": "image/x-icon"});
+      response.write(data);
+    }
+    response.end();
+  });
+  */
+  response.end();
+}
+
 function status(response) {
   console.log("Request handler 'status' was called.");
   //fs.readFile(path.join(__dirname, "../../../status.js"), function (err, data) {
@@ -80,6 +99,6 @@ function ws(response) {
   response.end();
 }
 
-export { status, css, index, favicon, ws };
+export { status, css, index, favicon, ws, fhem };
 
 /* ex:set ai shiftwidth=2 inputtab=spaces smarttab noautotab: */

src/scripts/modules/router.js

@@ -1,7 +1,7 @@
-function route(handle, pathname, response) {
-  console.log("About to route a request for " + pathname);
+function route(handle, pathname, query, response) {
+  console.log("About to route a request for " + pathname + " with query: " + query);
   if (typeof handle[pathname] === 'function') {
-    handle[pathname](response);
+    handle[pathname](response, query);
   } else {
     console.log("No request handler found for " + pathname);
     response.writeHead(404, {"Content-Type": "text/plain"});

src/scripts/modules/sensor.js

@@ -20,11 +20,12 @@ SensorDevice.prototype.getId = function () {
 SensorDevice.prototype.getTempAsync = function (callback) {
   var dpath = '/sys/bus/w1/devices/' + this.id + '/w1_slave';
   var id = this.id;
+  var fudge = this.fudge;
   fs.readFile(dpath, 'utf8', function (err, data) {
     if (err) {
       console.log('Error reading device data: ' + dpath);
     } else {
-      var result = parseFloat(data.split(' ')[20].split('=')[1]) / 1000;
+      var result = fudge + parseFloat(data.split(' ')[20].split('=')[1]) / 1000;
       callback(id, result);
     }
   });
@@ -34,7 +35,7 @@ SensorDevice.prototype.getTemp = function () {
   var dpath = '/sys/bus/w1/devices/' + this.id + '/w1_slave';
   var data = fs.readFileSync(dpath, 'utf8');
   //console.log('(SensorDevice)' + this.id + ' data = ' + data);
-  return parseFloat(data.split(' ')[20].split('=')[1]) / 1000;
+  return this.fudge + parseFloat(data.split(' ')[20].split('=')[1]) / 1000;
 };
 
 SensorDevice.prototype.setFudge = function (fudgeFactor) {

src/scripts/modules/server.js

@@ -11,9 +11,11 @@ function start(route, handle, clients, msgQueue, opts) {
 
   function onRequest(request, response) {
     var pathname = url.parse(request.url).pathname;
+    var query = url.parse(request.url).query;
     console.log("Request for " + pathname + " received from " + request.connection.remoteAddress);
+    console.log("Request query = " + query);
 
-    route(handle, pathname, response);
+    route(handle, pathname, query, response);
   }
 
   var server = http.createServer(onRequest).listen(port);
@@ -41,7 +43,7 @@ function start(route, handle, clients, msgQueue, opts) {
     //console.log("ws request from " + request.connection.remoteAddress);
 
     connection.on('message', function(message) {
-      console.log("Rcvd message: " + message);
+      console.log("Rcvd message: " + JSON.stringify(message));
       msgQueue.enqueue(message);
     });