update mqttd for auto fill-in light and test ok

guowenxue

2019-07-31 8a0e43e2ba062b35f20ddcd83a7811a9e1a71786

update mqttd for auto fill-in light and test ok

 mqttd/etc/conf.c

@@ -182,6 +182,9 @@

        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);
    }



 mqttd/etc/conf.h

@@ -66,7 +66,7 @@
    unsigned char  inbreak_beep; /* enable or diable beep when detect inbreak */
    unsigned char  fillin_light; /* fill-in light when detect inbrank or not */
    unsigned char  light_intval; /* fill-in light interval time, unit second  */

    double         lux_threshold; /* Lux sensor detect value smaller than treshold will fill-in light  */
} hwconf_t;  



 mqttd/etc/mqttd.conf

@@ -42,6 +42,9 @@
# 继电器补光时长, 单位秒. 红外探测到人后电平为此时间大概是35秒左右
light_intval=35

# 光强传感器采样值低于该阈值将开灯
lux_threshold=0.01


[logger]


 mqttd/hal/tsl2561.c

@@ -22,6 +22,7 @@
#include <errno.h>
#include <time.h>

#include "hal.h"
#include "tsl2561.h"


@@ -37,11 +38,11 @@
    tsl_fd = wiringPiI2CSetup(TSL2561_I2C_ADDR);
    if(tsl_fd < 0)
    {
        printf("TSL2561 I2C setup failure: %s\n", strerror(errno));
        log_err("TSL2561 I2C setup failure: %s\n", strerror(errno));
    }
    else
    {
        printf("TSL2561 initialise ok, tsl_fd=%d\n", tsl_fd);
        log_err("TSL2561 initialise ok, tsl_fd=%d\n", tsl_fd);
    }


@@ -102,8 +103,6 @@
        lux = 0.0;

OUT:
    printf("TSLl2561 get lux: %.3f\n", lux);

    wiringPiI2CWrite(tsl_fd, CONTROL_REG);
    wiringPiI2CWrite(tsl_fd, POWER_DOWN);


 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)
{
    if( g_breakin_flag&FLAG_RELAYON ) 
    {
    log_nrml("fill-in light timeout and turn light off now\n");
    turn_relay(OFF);
    g_relay_flag = 0;
    }

    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;
                    }
                }

            }