voidf1sh/hestia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

touching up logic

Browse Source
This commit is contained in:
Skylar Grant 2022-12-22 22:19:18 -05:00
parent 7ddb65783c
commit 82fe402b2e
2 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
functions.js
View File

@ -264,24 +264,31 @@ const functions = {
tests: { tests: {
vacuum(gpio) { vacuum(gpio) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (process.env.ONPI == 'true') { if (config.status.blower == 1) {
gpio.read(vacuumPin, (err, status) => { if (process.env.ONPI == 'true') {
if (err) reject(err); gpio.read(vacuumPin, (err, status) => {
resolve(status); if (err) reject(err);
}); config.status.vacuum = status;
} else { resolve(status);
switch (config.status.vacuum) { });
case 0: } else {
resolve(false); switch (config.status.vacuum) {
break; case 0:
case 1: resolve(false);
resolve(true); break;
break; case 1:
default: resolve(true);
reject('Unable to determine vacuum status.'); break;
break; default:
reject('Unable to determine vacuum status.');
break;
}
} }
} else {
// If the blower isn't on, the vacuum doesn't matter so always return true
resolve(true);
} }
}); });
}, },
pof(gpio) { pof(gpio) {
@ -289,6 +296,7 @@ const functions = {
if (process.env.ONPI == 'true') { if (process.env.ONPI == 'true') {
gpio.read(pofPin, (err, status) => { gpio.read(pofPin, (err, status) => {
if (err) reject(err); if (err) reject(err);
config.status.pof = status;
resolve(status); resolve(status);
}); });
} else { } else {

1
main.js
View File

@ -124,6 +124,7 @@ async function main(fn, gpio) {
} }
function statusCheck(fn, gpio) { function statusCheck(fn, gpio) {
// Once per cycle, write the config variable to the file so it can be read by the web server
fn.commands.writeConfig(); fn.commands.writeConfig();
if (config.status.shutdown == 1) { if (config.status.shutdown == 1) {
console.log(fn.commands.shutdown(gpio) || 'Shutting down...'); console.log(fn.commands.shutdown(gpio) || 'Shutting down...');