From 0fd2ff9f9aca1f30d6b4620f90802223cc221fe0 Mon Sep 17 00:00:00 2001
From: GuoWenxue <“guowenxue@gmail.com”>
Date: Fri, 22 Apr 2022 09:17:24 +0800
Subject: [PATCH] update socket.c for listen socket
---
mqttd/etc/conf.c | 61 +++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 10 deletions(-)
diff --git a/mqttd/etc/conf.c b/mqttd/etc/conf.c
index f998ce4..2907a2e 100644
--- a/mqttd/etc/conf.c
+++ b/mqttd/etc/conf.c
@@ -109,20 +109,26 @@
log_nrml("Parser hardware modules [%s]\n", ctx->hwconf.enable ? "enable" : "disable");
/* relay control light */
- ctx->hwconf.relay=iniparser_getint(ini, "hardware:relay_pin", 0);
- if( !ctx->hwconf.relay )
+ ctx->hwconf.relay_pin=iniparser_getint(ini, "hardware:relay_pin", 0);
+ if( !ctx->hwconf.relay_pin )
log_nrml("Parser relay module disabled\n");
else
- log_nrml("Parser relay connected wPI #pin nubmer [%d]\n", ctx->hwconf.relay);
+ log_nrml("Parser relay connected wPI #pin number [%d]\n", ctx->hwconf.relay_pin);
/* buzzer */
- ctx->hwconf.beep=iniparser_getint(ini, "hardware:beep_pin", 0);
+ ctx->hwconf.beep_pin=iniparser_getint(ini, "hardware:beep_pin", 0);
+ log_nrml("Parser buzzer connected wPI #pin number [%d]\n", ctx->hwconf.beep_pin);
+
+ /* Beep max. times set beep 10 */
+ ctx->hwconf.beep_times = iniparser_getint(ini, "hardware:beep_times", 0);
+ log_nrml("Parser inbreak buzzer beep times [%d]\n", ctx->hwconf.beep_times);
+
/* RGB 3-colors LED */
- ctx->hwconf.redled=iniparser_getint(ini, "hardware:red_pin", 0);
- ctx->hwconf.greenled=iniparser_getint(ini, "hardware:green_pin", 0);
- ctx->hwconf.blueled=iniparser_getint(ini, "hardware:blue_pin", 0);
- if( !ctx->hwconf.redled && !ctx->hwconf.greenled && !ctx->hwconf.blueled )
+ ctx->hwconf.red_pin=iniparser_getint(ini, "hardware:red_pin", 0);
+ ctx->hwconf.green_pin=iniparser_getint(ini, "hardware:green_pin", 0);
+ ctx->hwconf.blue_pin=iniparser_getint(ini, "hardware:blue_pin", 0);
+ if( !ctx->hwconf.red_pin && !ctx->hwconf.green_pin && !ctx->hwconf.blue_pin )
{
ctx->hwconf.leds = 0;
log_nrml("Parser RGB leds module disabled\n");
@@ -130,8 +136,8 @@
else
{
ctx->hwconf.leds = 1;
- log_nrml("Parser RGB led connected wPI #pin nubmer [%d,%d,%d]\n",
- ctx->hwconf.redled, ctx->hwconf.greenled, ctx->hwconf.blueled);
+ log_nrml("Parser RGB led connected wPI #pin number [%d,%d,%d]\n",
+ ctx->hwconf.red_pin, ctx->hwconf.green_pin, ctx->hwconf.blue_pin);
}
/* temperature sensor ds18b20 */
@@ -146,6 +152,41 @@
ctx->hwconf.lux=iniparser_getint(ini, "hardware:lux", 0);
log_nrml("Parser light intensity sensor TSL2561 modules [%s]\n", ctx->hwconf.ds18b20 ? "enable" : "disable");
+ ctx->hwconf.infrared_pin=iniparser_getint(ini, "hardware:infrared_pin", 0);
+ log_nrml("Parser infrared pin connected wPI #pin number [%d]\n", ctx->hwconf.infrared_pin);
+
+ if( ctx->hwconf.infrared_pin )
+ {
+ ctx->hwconf.inbreak_beep = iniparser_getint(ini, "hardware:inbreak_beep", 0);
+ log_nrml("Parser %s inbreak beep\n", ctx->hwconf.inbreak_beep? "enable" : "disable");
+ if( !ctx->hwconf.beep_pin )
+ {
+ log_warn("WARNNING: beep hardware not enable and will disable inbreak beep\n");
+ ctx->hwconf.inbreak_beep = 0;
+ }
+
+ ctx->hwconf.fillin_light = iniparser_getint(ini, "hardware:fillin_light", 0);
+ log_nrml("Parser inbreak fill-in light mode [%d]\n", ctx->hwconf.fillin_light);
+
+ if( !ctx->hwconf.relay_pin )
+ {
+ log_warn("WARNNING: Relay hardware not enable and change fill-in light mode to OFF\n");
+ ctx->hwconf.fillin_light = FILLIN_LIGHT_OFF;
+ }
+
+ if( !ctx->hwconf.lux )
+ {
+ log_warn("WARNNING: LUX sensor hardware not enable and change fill-in light mode to ON\n");
+ ctx->hwconf.fillin_light = FILLIN_LIGHT_ON;
+ }
+
+ ctx->hwconf.light_intval = iniparser_getint(ini, "hardware:light_intval", 20);
+ log_nrml("Parser inbreak fill-in light interval time [%d]\n", ctx->hwconf.light_intval);
+
+ ctx->hwconf.lux_threshold = iniparser_getdouble(ini, "hardware:lux_threshold", 0.1);
+ log_nrml("Parser fill-in light threshold lux [%.03f]\n", ctx->hwconf.lux_threshold);
+ }
+
/*+------------------------------------------------------+
*| parser production ID |
--
Gitblit v1.9.1