From 8a0e43e2ba062b35f20ddcd83a7811a9e1a71786 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Wed, 31 Jul 2019 17:06:01 +0800
Subject: [PATCH] update mqttd for auto fill-in light and test ok
---
mqttd/main.c | 68 +++++++++++++++++++++++++++++++++-
1 files changed, 66 insertions(+), 2 deletions(-)
diff --git a/mqttd/main.c b/mqttd/main.c
index be26876..98cf2d6 100644
--- a/mqttd/main.c
+++ b/mqttd/main.c
@@ -29,6 +29,10 @@
#define PROG_VERSION "v1.0.0"
#define DAEMON_PIDFILE "/tmp/.mqtt.pid"
+#define FLAG_DETECTD (1<<0)
+#define FLAG_RELAYON (1<<1)
+int g_breakin_flag = 0; /* relay already turn on and wait to off */
+
int check_set_program_running(int daemon);
void *mqtt_sub_worker(void *args);
void *mqtt_pub_worker(void *args);
@@ -49,6 +53,16 @@
return;
}
+void turn_light_off(int signum)
+{
+ if( g_breakin_flag&FLAG_RELAYON )
+ {
+ log_nrml("fill-in light timeout and turn light off now\n");
+ turn_relay(OFF);
+ }
+
+ g_breakin_flag = 0;
+}
int main (int argc, char **argv)
{
@@ -61,6 +75,7 @@
int debug = 0;
int opt;
char *progname=NULL;
+ double lux = 0.0;
struct option long_options[] = {
{"conf", required_argument, NULL, 'c'},
@@ -121,6 +136,12 @@
install_proc_signal();
+ if( ctx.hwconf.fillin_light )
+ {
+ log_nrml("Install inbreak detected fill-in light off signal\n");
+ signal(SIGALRM, turn_light_off);
+ }
+
if( check_set_program_running(daemon) < 0 )
goto OUT;
@@ -140,10 +161,54 @@
}
log_nrml("Start MQTT publisher worker thread ok\n");
-
while( ! g_signal.stop )
{
msleep(1000);
+
+ if( ctx.hwconf.infrared_pin && !g_breakin_flag )
+ {
+ //log_nrml("infrared dected human incoming\n");
+ if( infrared_detect(1000) )
+ {
+ log_nrml("Someone incoming detected by infrared\n");
+ g_breakin_flag |= FLAG_DETECTD;
+
+ /* setup alarm to turn relay off or clear the flag */
+ alarm(ctx.hwconf.light_intval);
+
+ if( ctx.hwconf.inbreak_beep )
+ {
+ turn_beep(ctx.hwconf.beep_times);
+ }
+
+ if( ctx.hwconf.fillin_light==FILLIN_LIGHT_ON && !g_breakin_flag )
+ {
+ log_nrml("Force fill-in light on and will be off in [%d] seconds\n", ctx.hwconf.light_intval);
+ turn_relay(ON);
+ g_breakin_flag |= FLAG_RELAYON;
+ }
+ else if( ctx.hwconf.fillin_light==FILLIN_LIGHT_AUTO && ctx.hwconf.lux )
+ {
+ lux = tsl2561_get_lux();
+ log_nrml("TSL2516 detect illumination intensity %.3flux and threshold %.3flux\n",
+ lux, ctx.hwconf.lux_threshold);
+
+ /* only lux<0.01 will turn on light */
+ if( lux-0.001 > ctx.hwconf.lux_threshold)
+ {
+ log_nrml("Illumination intensity enuf, no need fill-in light\n");
+ }
+ else
+ {
+ log_nrml("Auto fill-in light on and will be off in [%d] seconds\n", ctx.hwconf.light_intval);
+ turn_relay(ON);
+ g_breakin_flag |= FLAG_RELAYON;
+ }
+ }
+
+ }
+
+ }
//log_nrml("Main control thread continue running\n");
}
@@ -154,7 +219,6 @@
return 0;
} /* ----- End of main() ----- */
-
int check_set_program_running(int daemon)
{
--
Gitblit v1.9.1