From bb08fc172f25c751902b9a849fc5188f91d362f7 Mon Sep 17 00:00:00 2001
From: Guo Wenxue <guowenxue@gmail.com>
Date: Wed, 31 Jul 2019 18:16:57 +0800
Subject: [PATCH] update mqttd, test SHT2X support ok
---
mqttd/main.c | 67 ++++++++++++++++++++++++++++-----
1 files changed, 56 insertions(+), 11 deletions(-)
diff --git a/mqttd/main.c b/mqttd/main.c
index dd643df..1692422 100644
--- a/mqttd/main.c
+++ b/mqttd/main.c
@@ -29,7 +29,9 @@
#define PROG_VERSION "v1.0.0"
#define DAEMON_PIDFILE "/tmp/.mqtt.pid"
-int g_relay_flag = 0; /* relay already turn on and wait to off */
+#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);
@@ -53,9 +55,13 @@
void turn_light_off(int signum)
{
- log_nrml("fill-in light timeout and turn light off now\n");
- turn_relay(OFF);
- g_relay_flag = 0;
+ 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)
@@ -159,28 +165,45 @@
{
msleep(1000);
- if( ctx.hwconf.infrared_pin )
+ if( ctx.hwconf.infrared_pin && !g_breakin_flag )
{
//log_nrml("infrared dected human incoming\n");
- if( !g_relay_flag && infrared_detect(1500) )
+ 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_relay_flag )
+ 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_relay_flag = 1;
- alarm(ctx.hwconf.light_intval);
+ g_breakin_flag |= FLAG_RELAYON;
}
else if( ctx.hwconf.fillin_light==FILLIN_LIGHT_AUTO && ctx.hwconf.lux )
{
lux = tsl2561_get_lux();
- log_nrml("TSL2516 lux sensor detect illumination intensity %.3f lux\n", 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;
+ }
}
}
@@ -231,7 +254,8 @@
mqtt_ctx_t *ctx = (mqtt_ctx_t *)userdata;
int rv = 0;
char msg[128];
- float temp = 0.0;
+ float temp = 0.0; /* temperature */
+ float rh = 0.0; /* relative humidity */
int retain = 0;
if( result )
@@ -261,6 +285,27 @@
log_nrml("Publisher broadcast message '%s' ok\n", msg);
}
}
+
+ if( ctx->hwconf.sht2x )
+ {
+ memset(msg, 0, sizeof(msg));
+
+ if( sht2x_get_temp_humidity(&temp, &rh) < 0 )
+ snprintf(msg, sizeof(msg), "{ \"id\":%s, \"temp\":\"error\", \"RH\":\"error\" }", ctx->id);
+ else
+ snprintf(msg, sizeof(msg), "{ \"id\":%s, \"temp\":\"%.2f\", \"RH\":\"%.2f\" }", ctx->id, temp, rh);
+
+ rv = mosquitto_publish(mosq, NULL, ctx->pubTopic, strlen(msg)+1, msg, ctx->pubQos, retain);
+ if( rv )
+ {
+ log_err("Publisher broadcast message '%s' failure: %d\n", msg, rv);
+ }
+ else
+ {
+ log_nrml("Publisher broadcast message '%s' ok\n", msg);
+ }
+ }
+
log_nrml("Publisher broadcast over and disconnect broker now\n", ctx->host, ctx->port);
mosquitto_disconnect(mosq);
--
Gitblit v1.9.1