From be5bdeb90a04da6641250708b2e5fbe943f3baec Mon Sep 17 00:00:00 2001
From: iotcat <i@iotcat.me>
Date: Mon, 29 Nov 2021 21:18:20 +0800
Subject: [PATCH] hall-l

---
 lightCtl/isolat.js  | 28 +++++++++++++++-------------
 people/interface.js |  4 ++--
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/lightCtl/isolat.js b/lightCtl/isolat.js
index 97b85cf..1a05fcc 100644
--- a/lightCtl/isolat.js
+++ b/lightCtl/isolat.js
@@ -5,31 +5,33 @@ var isolat = (room, light, pir, lightCtl) => {
 
     let pirStates = [false, false];
     let endT = 0;
+    let TO = {};
 
     let getT = ()=>new Date().valueOf();
 
+
+    let LightEnder = function(){
+        console.log(new Date() + ' - Hall light off in trigger.');
+        light.off();
+    }
+
+
+
+
     let LightSetter = function(ind, val){
         pirStates[ind] = val;
-console.log(pirStates);
+console.log(new Date() + ' - Hall 0,1 change: ' + pirStates);
         if(pirStates.every((t)=>t)) {
+console.log(new Date() + ' - Hall light on in trigger.');
+            clearTimeout(TO);
             light.on();
-            endT = getT(); 
+            endT = getT();
+            TO = setTimeout(LightEnder, endDur);
             return;
         }
 
-        if(endDur + endT < getT()){
-            light.off();
-            return;
-        }
     }
 
-
-    setInterval(()=>{
-        if(endDur + endT < getT()){
-            light.off();
-        }
-    }, 1000);
-
     pir.forEach((item, ind)=>{
         item.on('peopleIn', ()=>{
            LightSetter(ind, true); 
diff --git a/people/interface.js b/people/interface.js
index b407b1e..877fe14 100644
--- a/people/interface.js
+++ b/people/interface.js
@@ -20,7 +20,7 @@ var interface = (z0, z1) => {
     z0.on('peopleIn', ()=>{
         if(z1.state){
             o.state = "forward";
-            console.log(new Date().toTimeString() + ' - ' + z1.tag + ' to ' + z0.tag);
+//            console.log(new Date().toTimeString() + ' - ' + z1.tag + ' to ' + z0.tag);
             o.func.backward.forEach((item)=>{
                 item();
             });
@@ -30,7 +30,7 @@ var interface = (z0, z1) => {
     z1.on('peopleIn', ()=>{
         if(z0.state){
             o.state = "backward";
-            console.log(new Date().toTimeString() + ' - ' + z0.tag + ' to ' + z1.tag); 
+//            console.log(new Date().toTimeString() + ' - ' + z0.tag + ' to ' + z1.tag); 
             o.func.forward.forEach((item)=>{
                 item();
             });