senaduka/old-tfm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

manual override for pump

Browse Source
This commit is contained in:
Senad Uka
2016-07-02 10:18:18 +02:00
parent d94ae908f4
commit 656dee3fe6
6 changed files with 118 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/server/api.js
View File

@@ -30,10 +30,12 @@ Api.addRoute('sensorData', {
});
function reactToSensorData(nextSensorReading) {
reactToSensorData = function(nextSensorReading) {
console.log("reacting to sensor");
var controllerId = nextSensorReading.controllerId;
var state = stateOrDefault(controllerId).state;
var stateObject = stateOrDefault(controllerId);
var state = stateObject.state;
var config = stateObject.config;
var startPumpingLevelReached;
if (nextSensorReading.startPumpingAt == 'TANKLEVEL0') startPumpingLevelReached = (parseInt(nextSensorReading.tankLevel0) === 0)
@@ -43,7 +45,15 @@ function reactToSensorData(nextSensorReading) {
else if (nextSensorReading.startPumpingAt == 'TANKLEVEL4') startPumpingLevelReached = (parseInt(nextSensorReading.tankLevel4) === 0)
else startPumpingLevelReached = true;
var shouldStartPumping = (!state.in_valve || state.in_valve === 'closed') && ((parseInt(nextSensorReading.tankFull) === 0) && startPumpingLevelReached && (state.out_valve === 'closed' || state.out_valve === 'closing'));
var shouldStartAutomaticPumping = (!state.in_valve || state.in_valve === 'closed') && ((parseInt(nextSensorReading.tankFull) === 0) && startPumpingLevelReached && (state.out_valve === 'closed' || state.out_valve === 'closing'));
console.log("State: ", state);
var shouldStartPumping = shouldStartAutomaticPumping && config && !config.manualInflow;
console.log("shouldStartAutomaticPumping: ", shouldStartAutomaticPumping);
console.log("shouldStartPumping: ", shouldStartPumping);
if (shouldStartPumping) {
ControllerState.update({
@@ -65,7 +75,12 @@ function reactToSensorData(nextSensorReading) {
else if (nextSensorReading.stopPumpingAt == 'TANKLEVEL4') stopPumpingLevelReached = (parseInt(nextSensorReading.tankLevel4) === 1)
else stopPumpingLevelReached = false;
var shouldStopPumping = (state.in_valve === 'open' || state.in_valve === 'opening') && (parseInt(nextSensorReading.tankFull) === 1 || stopPumpingLevelReached || state.out_valve === 'open' || state.out_valve === 'opening');
var shouldStopAutomaticPumping = (state.in_valve === 'open' || state.in_valve === 'opening') && (parseInt(nextSensorReading.tankFull) === 1 || stopPumpingLevelReached || state.out_valve === 'open' || state.out_valve === 'opening');
var shouldStopPumping = shouldStopAutomaticPumping && config && !config.manualInflow;
console.log("shouldStopPumping: ", shouldStopPumping);
if (shouldStopPumping) {
ControllerState.update({
@@ -117,7 +132,8 @@ function stateOrDefault(id) {
time: new Date(),
config: {
draining_period_amount: 40,
draining_period_unit: 'minutes'
draining_period_unit: 'minutes',
manualInflow: true
},
set_by: 'server'
});