diff --git a/app/client/state.js b/app/client/state.js index 5d41fd7..f26deef 100644 --- a/app/client/state.js +++ b/app/client/state.js @@ -46,15 +46,15 @@ Template.state.helpers({ var sensor = last_sensor_reading(); var stateObject = controller_state(); if (sensor) { - if (sensor.tankFull === 0 && stateObject.state.in_valve === 'open' && stateObject.state.out_valve === 'closed') return "/images/barellFillingUp.png"; - else if (sensor.tankFull === 1 && (stateObject.state.out_valve === 'closed')) return "/images/barellFull.png"; - else if (sensor.tankFull === 1 && (stateObject.state.out_valve === 'opening')) return "/images/barellStartWateringFull.png"; - else if (sensor.tankFull === 1 && (stateObject.state.out_valve === 'open')) return "/images/barellWateringFull.png"; - else if (sensor.tankFull === 1 && (stateObject.state.out_valve === 'closing')) return "/images/barellStopWateringFull.png"; - else if (sensor.tankFull === 0 && (stateObject.state.out_valve === 'closed')) return "/images/barellNotFull.png"; - else if (sensor.tankFull === 0 && (stateObject.state.out_valve === 'opening')) return "/images/barellStartWateringNotFull.png"; - else if (sensor.tankFull === 0 && (stateObject.state.out_valve === 'open')) return "/images/barellWateringNotFull.png" - else if (sensor.tankFull === 0 && (stateObject.state.out_valve === 'closing')) return "/images/barellStopWateringNotFull.png" + if (sensor.tankFull === 0 && stateObject.state.in_valve === 'open' && stateObject.state.out_valve === 'closed') return "/images/barrellFillingUp.png"; + else if (sensor.tankFull === 1 && (stateObject.state.out_valve === 'closed')) return "/images/barrellFull.png"; + else if (sensor.tankFull === 1 && (stateObject.state.out_valve === 'opening')) return "/images/barrellStartWateringFull.png"; + else if (sensor.tankFull === 1 && (stateObject.state.out_valve === 'open')) return "/images/barrellWateringFull.png"; + else if (sensor.tankFull === 1 && (stateObject.state.out_valve === 'closing')) return "/images/barrellStopWateringFull.png"; + else if (sensor.tankFull === 0 && (stateObject.state.out_valve === 'closed')) return "/images/barrellNotFull.png"; + else if (sensor.tankFull === 0 && (stateObject.state.out_valve === 'opening')) return "/images/barrellStartWateringNotFull.png"; + else if (sensor.tankFull === 0 && (stateObject.state.out_valve === 'open')) return "/images/barrellWateringNotFull.png" + else if (sensor.tankFull === 0 && (stateObject.state.out_valve === 'closing')) return "/images/barrellStopWateringNotFull.png" else return "/images/statusAmber.png"; } else return "/images/statusRed.png"; }, diff --git a/app/public/images/barellFillingUp.png b/app/public/images/barellFillingUp.png deleted file mode 100644 index 6cae5ed..0000000 Binary files a/app/public/images/barellFillingUp.png and /dev/null differ diff --git a/app/public/images/barellStopWateringFull.png b/app/public/images/barellStopWateringFull.png deleted file mode 100644 index a95bcfa..0000000 Binary files a/app/public/images/barellStopWateringFull.png and /dev/null differ diff --git a/app/public/images/barellStopWateringNotFull.png b/app/public/images/barellStopWateringNotFull.png deleted file mode 100644 index 6c5d2d9..0000000 Binary files a/app/public/images/barellStopWateringNotFull.png and /dev/null differ diff --git a/app/public/images/barellWateringFull.png b/app/public/images/barellWateringFull.png deleted file mode 100644 index 5a7c816..0000000 Binary files a/app/public/images/barellWateringFull.png and /dev/null differ diff --git a/app/public/images/barellWateringNotFull.png b/app/public/images/barellWateringNotFull.png deleted file mode 100644 index 2007fc3..0000000 Binary files a/app/public/images/barellWateringNotFull.png and /dev/null differ diff --git a/app/public/images/barrellFillingUp.png b/app/public/images/barrellFillingUp.png new file mode 100644 index 0000000..4d41bb3 Binary files /dev/null and b/app/public/images/barrellFillingUp.png differ diff --git a/app/public/images/barellFull.png b/app/public/images/barrellFull.png similarity index 52% rename from app/public/images/barellFull.png rename to app/public/images/barrellFull.png index 7a8d025..c8a9449 100644 Binary files a/app/public/images/barellFull.png and b/app/public/images/barrellFull.png differ diff --git a/app/public/images/barellNotFull.png b/app/public/images/barrellNotFull.png similarity index 52% rename from app/public/images/barellNotFull.png rename to app/public/images/barrellNotFull.png index d0e461d..3e5471e 100644 Binary files a/app/public/images/barellNotFull.png and b/app/public/images/barrellNotFull.png differ diff --git a/app/public/images/barellStartWateringFull.png b/app/public/images/barrellStartWateringFull.png similarity index 50% rename from app/public/images/barellStartWateringFull.png rename to app/public/images/barrellStartWateringFull.png index d0763d1..f20947e 100644 Binary files a/app/public/images/barellStartWateringFull.png and b/app/public/images/barrellStartWateringFull.png differ diff --git a/app/public/images/barellStartWateringNotFull.png b/app/public/images/barrellStartWateringNotFull.png similarity index 52% rename from app/public/images/barellStartWateringNotFull.png rename to app/public/images/barrellStartWateringNotFull.png index c9c9110..138e7a1 100644 Binary files a/app/public/images/barellStartWateringNotFull.png and b/app/public/images/barrellStartWateringNotFull.png differ diff --git a/app/public/images/barrellStopWateringFull.png b/app/public/images/barrellStopWateringFull.png new file mode 100644 index 0000000..8dd1a51 Binary files /dev/null and b/app/public/images/barrellStopWateringFull.png differ diff --git a/app/public/images/barrellStopWateringNotFull.png b/app/public/images/barrellStopWateringNotFull.png new file mode 100644 index 0000000..fb12963 Binary files /dev/null and b/app/public/images/barrellStopWateringNotFull.png differ diff --git a/app/public/images/barrellWateringFull.png b/app/public/images/barrellWateringFull.png new file mode 100644 index 0000000..87b21ce Binary files /dev/null and b/app/public/images/barrellWateringFull.png differ diff --git a/app/public/images/barrellWateringNotFull.png b/app/public/images/barrellWateringNotFull.png new file mode 100644 index 0000000..c55f327 Binary files /dev/null and b/app/public/images/barrellWateringNotFull.png differ