From c47e1be364cba0ce39e09774f405090ece92da9b Mon Sep 17 00:00:00 2001 From: Senad Uka Date: Sun, 6 Mar 2016 14:07:33 +0100 Subject: [PATCH] Finished in valve support --- app/client/state.js | 1 - app/server/api.js | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/client/state.js b/app/client/state.js index 6264cd0..ed7e21a 100644 --- a/app/client/state.js +++ b/app/client/state.js @@ -1,7 +1,6 @@ function controller_state() { var controllerId = Session.get('controller_id'); result = ControllerState.findOne({}); - console.log("jupiii", result); if (!result) { result = {} }; diff --git a/app/server/api.js b/app/server/api.js index dc51e30..1bdcd08 100644 --- a/app/server/api.js +++ b/app/server/api.js @@ -24,6 +24,7 @@ Api.addRoute('sensorData', { function reactToSensorData(nextSensorReading) { + console.log("reacting to sensor"); var controllerId = nextSensorReading.controllerId; var state = stateOrDefault(controllerId).state; var shouldStartPumping = (parseInt(nextSensorReading.tankFull) === 0 && (!state.in_valve || state.in_valve === 'closed')); @@ -39,12 +40,26 @@ function reactToSensorData(nextSensorReading) { } }); } + var shouldStopPumping = parseInt(nextSensorReading.tankFull) === 1 && (state.in_valve === 'open' || state.in_valve === 'opening'); + + if (shouldStopPumping) { + ControllerState.update({ + controller_id: controllerId + }, { + '$set': { + 'state.in_valve': 'closing', + 'time': new Date(), + 'set_by': 'server' + } + }); + } } Api.addRoute('state/:id', { authRequired: false }, { post: function() { + console.log("setting state", this.bodyParams); return ControllerState.update({ controller_id: this.urlParams.id }, {