Add tsl2561 code, and test force fill-in light ok

guowenxue

2019-07-31 55f465be474c54edbceb3c6013ae629e0e0323d8

 mqttd/main.c

@@ -29,6 +29,8 @@
#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  */

int check_set_program_running(int daemon);
void *mqtt_sub_worker(void *args);
void *mqtt_pub_worker(void *args);
@@ -49,6 +51,12 @@
    return;
}

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

int main (int argc, char **argv)
{
@@ -61,6 +69,7 @@
    int                debug = 0;
    int                opt;
    char              *progname=NULL;
    double             lux = 0.0;

    struct option long_options[] = {
        {"conf", required_argument, NULL, 'c'},
@@ -109,20 +118,23 @@
        return -2;
    }

    if( ctx.hwconf.enable  )
    if( hal_init(&ctx.hwconf) < 0 )
    {
        if( hal_init(&ctx.hwconf) < 0 )
            log_err("Initialise hardware failure\n");
        else 
            log_nrml("HAL initialise ok\n");

        return -1;
        log_err("Initialise hardware failure\n");
        return -3;
    }
    else
    else 
    {
        log_nrml("HAL initialise ok\n");
    }

    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;
@@ -143,10 +155,37 @@
    }
    log_nrml("Start MQTT publisher worker thread ok\n");


    while( ! g_signal.stop )
    {
        msleep(1000);

        if( ctx.hwconf.infrared_pin )
        {
            //log_nrml("infrared dected human incoming\n");
            if( !g_relay_flag && infrared_detect(1500) )
            {
                log_nrml("Someone incoming detected by infrared\n");
                if( ctx.hwconf.inbreak_beep )
                {
                    turn_beep(ctx.hwconf.beep_times);
                }

                if( ctx.hwconf.fillin_light==FILLIN_LIGHT_ON && !g_relay_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);
                }
                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("Main control thread continue running\n");
    }

@@ -157,7 +196,6 @@
    
    return 0;
} /* ----- End of main() ----- */


int check_set_program_running(int daemon)
{
@@ -362,7 +400,7 @@
            value = cJSON_Print(item);

            /* light controled by relay */
            if( hwconf->relay && !strcasecmp(item->string, "light") )
            if( hwconf->relay_pin && !strcasecmp(item->string, "light") )
            {
                if( strcasestr(value, "on") )
                {
@@ -377,15 +415,11 @@
            }

            /* buzzer */
            if( hwconf->beep && !strcasecmp(item->string, "buzzer") )
            if( hwconf->beep_pin && !strcasecmp(item->string, "buzzer") )
            {
                if( strcasestr(value, "on") )
                {
                    log_nrml("Turn buzzer on\n");
                }
                else if( strcasestr(value, "music") )
                {
                    log_nrml("Turn buzzer play music\n");
                    log_nrml("Turn buzzer on [%d] times\n", hwconf->beep_times);
                }
            }