From 45e62dbd9e964c74b24f7fcadad9b418f117e008 Mon Sep 17 00:00:00 2001 From: guowenxue <guowenxue@gmail.com> Date: Thu, 27 Jun 2019 15:11:42 +0800 Subject: [PATCH] update mqttd, add hardware configured in configure files --- mqttd/etc/conf.c | 61 ++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/mqttd/etc/conf.c b/mqttd/etc/conf.c index c78e24d..f998ce4 100644 --- a/mqttd/etc/conf.c +++ b/mqttd/etc/conf.c @@ -25,6 +25,7 @@ if( !conf_file ) { + strncpy(ctx->id, "\"rpi3b001\"", sizeof(ctx->id)); /* logger settings */ strncpy(ctx->logfile, DBG_LOG_FILE, sizeof(ctx->logfile)); @@ -99,6 +100,66 @@ log_nrml("Logger system initialise ok\n"); + /*+------------------------------------------------------+ + *| parser hardware module configuration ID | + *+------------------------------------------------------+*/ + + /* hardware module enable or not */ + ctx->hwconf.enable=iniparser_getint(ini, "hardware:enable", 0); + 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 ) + log_nrml("Parser relay module disabled\n"); + else + log_nrml("Parser relay connected wPI #pin nubmer [%d]\n", ctx->hwconf.relay); + + /* buzzer */ + ctx->hwconf.beep=iniparser_getint(ini, "hardware:beep_pin", 0); + + /* 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.leds = 0; + log_nrml("Parser RGB leds module disabled\n"); + } + 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); + } + + /* temperature sensor ds18b20 */ + ctx->hwconf.ds18b20=iniparser_getint(ini, "hardware:ds18b20", 0); + log_nrml("Parser temperature sensor DS18B20 modules [%s]\n", ctx->hwconf.ds18b20 ? "enable" : "disable"); + + /* temperature and hummidity sensor sht2x */ + ctx->hwconf.sht2x=iniparser_getint(ini, "hardware:sht2x", 0); + log_nrml("Parser temperature and hummidity sensor sht2x modules [%s]\n", ctx->hwconf.sht2x ? "enable" : "disable"); + + /* light intensity sensor TSL2561 */ + ctx->hwconf.lux=iniparser_getint(ini, "hardware:lux", 0); + log_nrml("Parser light intensity sensor TSL2561 modules [%s]\n", ctx->hwconf.ds18b20 ? "enable" : "disable"); + + + /*+------------------------------------------------------+ + *| parser production ID | + *+------------------------------------------------------+*/ + + if( !(str=iniparser_getstring(ini, "common:id", NULL)) ) + { + log_err("ERROR: Parser production ID failure\n"); + return -2; + } + /* cJSON parser ID will get "" */ + snprintf(ctx->id, sizeof(ctx->id), "\"%s\"", str); + log_nrml("Parser production ID [%s]\n", ctx->id); + /*+------------------------------------------------------+ *| parser broker settings | -- Gitblit v1.9.1