From eeb821fa6846e84c9fe3e80d58f41b7a5a418e70 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Wed, 21 Apr 2021 22:27:56 +0800
Subject: [PATCH] update hal.x

---
 iotd/main.c |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/iotd/main.c b/iotd/main.c
index 80e90e7..54619b8 100644
--- a/iotd/main.c
+++ b/iotd/main.c
@@ -31,7 +31,7 @@
 #define PROG_VERSION               "v1.0.0"
 #define DAEMON_PIDFILE             "/tmp/.iotd.pid"
 
-void control_thread_loop(void *ctx);
+void control_thread_loop(void *args);
 
 static void program_usage(char *progname)
 {
@@ -117,10 +117,8 @@
     }
     log_nrml("Initialise hardware okay.\n");
 
-    return 0;  /* todo: debug and removed  */
 
     install_default_signal();
-
     if( check_set_program_running(daemon, DAEMON_PIDFILE) < 0 ) 
         goto OUT;
 
@@ -142,7 +140,6 @@
             log_nrml("Start MQTT subsciber worker thread ok\n"); 
         }
     }
-
 
     /*+--------------------------------------------+
      *|  Start  MQTT publisher thread if enable    |
@@ -176,19 +173,19 @@
 
 void control_thread_loop(void *args)
 {
-    iotd_ctx_t            *ctx = (iotd_ctx_t *)ctx;
+    iotd_ctx_t            *ctx = (iotd_ctx_t *)args;
     hal_ctx_t             *hal_ctx;
     float                  lux = 0.0;
 
     hal_ctx = &ctx->hal_ctx;
-
-    log_nrml("Start control thread working...\n");
 
     while( ! g_signal.stop )
     { 
         if( hal_ctx->lux_enable )
         {
             lux = tsl2561_get_lux(); 
+            log_dbg("TSL2561 get Lux[%.3f].\n", lux);
+
             if( lux > hal_ctx->lux_threshold )
             {
                 log_nrml("Lux[%.3f] > Treshold[%.3f], don't need light on.\n", lux, hal_ctx->lux_threshold);
@@ -197,14 +194,13 @@
             }
         }
 
-#if 0
         log_nrml("start infrared monitor detect...\n");
         if( infrared_detect() ) 
         {
             log_nrml("Someone incoming detected by infrared\n");
-            log_nrml("Lux[%.3f] < Treshold[%.3f], auto light on now..\n", lux, hal_ctx->lux_threshold);
         }
-#endif
+
+        sleep(1);
     }
 }
 

--
Gitblit v1.9.1