release ready

master
Jamie Munro 2 years ago
parent 9a424bb3c2
commit e96543063d
  1. BIN
      gallery/1652051711516.png
  2. BIN
      gallery/1652051873429.png
  3. BIN
      gallery/1652052277744.png
  4. BIN
      gallery/1652052457720.png
  5. BIN
      gallery/1652052467124.png
  6. BIN
      gallery/1652052488165.png
  7. BIN
      gallery/1652052493900.png
  8. BIN
      gallery/1652052612955.png
  9. BIN
      gallery/1652052638100.png
  10. 2
      outlets/outlet1.json
  11. 2
      outlets/outlet2.json
  12. 2
      outlets/outlet3.json
  13. 8
      routes/api.js
  14. 6
      routes/control.js
  15. 2
      routes/outlets.js

Binary file not shown.

After

Width:  |  Height:  |  Size: 1000 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 890 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

@ -1 +1 @@
{"name":"outlet1","active":true,"timer":{"active":false,"periods":"2","period1":{"start":"09:00","end":"18:43","state":"on"},"period2":{"start":"18:43","end":"09:00","state":"off"},"period3":{"start":"01:23","end":"23:45","state":"on"},"period4":{"start":"01:23","end":"23:45","state":"on"}},"thermostat":{"active":true,"mode":"dimming","target":"99"}}
{"name":"outlet1","active":true,"timer":{"active":false,"periods":"2","period1":{"start":"09:00","end":"00:00","state":"on"},"period2":{"start":"00:00","end":"09:00","state":"off"},"period3":{"start":"01:23","end":"23:45","state":"on"},"period4":{"start":"01:23","end":"23:45","state":"on"}},"thermostat":{"active":true,"mode":"dimming","target":"25"}}

@ -1 +1 @@
{"name":"outlet2","active":true,"timer":{"active":false,"periods":"3","period1":{"start":"00:00","end":"00:00","state":"on"},"period2":{"start":"00:00","end":"00:00","state":"on"},"period3":{"start":"00:00","end":"00:00","state":"on"},"period4":{"start":"00:00","end":"00:00","state":"off"}},"thermostat":{"active":true,"mode":"dimming","target":"19"}}
{"name":"outlet2","active":false,"timer":{"active":false,"periods":"2","period1":{"start":"09:00","end":"23:00","state":"off"},"period2":{"start":"23:00","end":"09:00","state":"off"},"period3":{"start":"00:00","end":"00:00","state":"on"},"period4":{"start":"00:00","end":"00:00","state":"off"}},"thermostat":{"active":false,"mode":"dimming","target":"19"}}

@ -1 +1 @@
{"name":"outlet3","active":true,"timer":{"active":false,"periods":"3","period1":{"start":"08:00","end":"23:00","state":"on"},"period2":{"start":"23:00","end":"08:00","state":"off"},"period3":{"start":"00:00","end":"00:00","state":"off"},"period4":{"start":"00:00","end":"00:00","state":"off"}},"thermostat":{"active":true,"mode":"dimming","target":"22"}}
{"name":"outlet3","active":false,"timer":{"active":false,"periods":"2","period1":{"start":"09:00","end":"00:00","state":"off"},"period2":{"start":"00:00","end":"09:00","state":"on"},"period3":{"start":"00:00","end":"00:00","state":"off"},"period4":{"start":"00:00","end":"00:00","state":"off"}},"thermostat":{"active":true,"mode":"dimming","target":"17"}}

@ -7,7 +7,7 @@ const stepper = require('./stepper');
const fs = require('fs');
const webshot = require('node-webshot');
const CAPTURE_PATH = __dirname + "/../gallery";
const RENDER_DELAY = 500;
const RENDER_DELAY = 1000;
const DHT_TYPE = 11;
const DHT_PIN = 4;
@ -29,9 +29,6 @@ function update() {
temperature = t;
humidity = h;
}
else {
console.log(err);
}
control.update(temperature, humidity);
setTimeout(update, UPDATE_DELAY);
@ -82,7 +79,6 @@ router.get('/gallery', (req, res) => {
fs.readdir(CAPTURE_PATH, (err, files) => {
files.forEach(file => {
console.log(file);
if (file.includes(".png")) {
images.push(file);
}
@ -104,7 +100,7 @@ router.get('/:image/delete', (req, res) => {
});
}
fs.unlinkSync(path, function (err) {
fs.unlink(path, function (err) {
if (err) {
return res.status(400).send({
"error":"Failed to delete file."

@ -65,7 +65,7 @@ function update(temp, hum) {
let state = settings.timer[`period${j}`].state;
if ((now >= start) && (now < end)) {
console.log(`Outlet ${i+1} hit on period ${j+1}`);
console.log(`Outlet ${i+1} hit on period ${j}`);
if (state == "off") {
power = 0;
@ -73,10 +73,6 @@ function update(temp, hum) {
break;
}
else if (i == settings.timer.periods) {
console.log(`Outlet ${i+1} No hits`);
power = 0;
}
}
}

@ -27,8 +27,6 @@ router.get('/:index', (req, res) => {
router.post('/:index/masterswitch', (req, res) => {
let index = req.params.index - 1;
console.log(req.body);
if (req.body.masterswitch != undefined) {
if (req.body.masterswitch == "on") {
outlets[index].active = true;

Loading…
Cancel
Save