Fri, 01 Aug 2014 16:13:55 +0200
A bit of code cleanup
/***************************************************************************** * Copyright (C) 2014 * * Michiel Broek <mbroek at mbse dot eu> * * This file is part of the mbsePi-apps * * This is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the * Free Software Foundation; either version 2, or (at your option) any * later version. * * mbsePi-apps is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * * You should have received a copy of the GNU General Public License * along with thermferm; see the file COPYING. If not, write to the Free * Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *****************************************************************************/ #include "devices.h" #include "thermferm.h" #include "xutil.h" extern int debug; extern sys_config Config; extern int my_shutdown; /* * Auto detect hotplugged or known to be present devices */ int devices_detect(void) { struct dirent *de; DIR *fd; devices_list *device, *ndev; int found, subdevices, i, rc = 0; char buf[40]; uuid_t uu; #ifdef HAVE_WIRINGPI_H int pin; #endif /* * Scan for 1-wire devices */ if ((fd = opendir((char *)"/sys/bus/w1/devices"))) { while ((de = readdir(fd))) { if (de->d_name[0] != '.') { found = FALSE; for (device = Config.devices; device; device = device->next) { if (strcmp(device->address,de->d_name) == 0) { found = TRUE; break; } } if (found == FALSE) { strncpy(buf, de->d_name, 2); buf[2] = '\0'; subdevices = 1; if (strcmp(buf, (char *)"29") == 0) subdevices = 8; if (strcmp(buf, (char *)"3a") == 0) subdevices = 2; for (i = 0; i < subdevices; i++) { ndev = (devices_list *)malloc(sizeof(devices_list)); ndev->next = NULL; ndev->version = 1; ndev->uuid = malloc(37); uuid_generate(uu); uuid_unparse(uu, ndev->uuid); ndev->type = DEVTYPE_W1; ndev->direction = DEVDIR_UNDEF; if (strcmp(buf, (char *)"10") == 0) { ndev->direction = DEVDIR_IN_ANALOG; ndev->description = xstrcpy((char *)"DS18S20 Digital thermometer"); } else if (strcmp(buf, (char *)"28") == 0) { ndev->direction = DEVDIR_IN_ANALOG; ndev->description = xstrcpy((char *)"DS18B20 Digital thermometer"); } else if (strcmp(buf, (char *)"29") == 0) { ndev->description = xstrcpy((char *)"DS2408 8 Channel addressable switch/LCD"); } else if (strcmp(buf, (char *)"3a") == 0) { ndev->description = xstrcpy((char *)"DS2413 Dual channel addressable switch"); } else if (strcmp(buf, (char *)"w1") == 0) { ndev->description = xstrcpy((char *)"Master System device"); } else { ndev->description = xstrcpy((char *)"Unknown device family "); ndev->description = xstrcat(ndev->description, buf); } ndev->value = ndev->inuse = 0; ndev->present = DEVPRESENT_YES; ndev->address = xstrcpy(de->d_name); ndev->subdevice = i; ndev->gpiopin = -1; ndev->comment = xstrcpy((char *)"Auto detected device"); ndev->timestamp = time(NULL); if (Config.devices == NULL) { Config.devices = ndev; } else { for (device = Config.devices; device; device = device->next) { if (device->next == NULL) { device->next = ndev; break; } } } rc++; } } } } closedir(fd); } #ifdef HAVE_WIRINGPI_H if (piBoardRev() == 2) { /* * Support rev B boards only */ found = FALSE; for (device = Config.devices; device; device = device->next) { if (device->type == DEVTYPE_GPIO) { found = TRUE; break; } } if (found == FALSE) { /* * There were no GPIO devices found. */ subdevices = 12; pin = 0; for (i = 0; i < subdevices; i++) { if (i == 8) pin = 17; ndev = (devices_list *)malloc(sizeof(devices_list)); ndev->next = NULL; ndev->version = 1; ndev->uuid = malloc(37); uuid_generate(uu); uuid_unparse(uu, ndev->uuid); ndev->type = DEVTYPE_GPIO; ndev->value = digitalRead(pin); ndev->present = DEVPRESENT_YES; ndev->address = xstrcpy((char *)"GPIO"); snprintf(buf, 39, "Raspberry GPIO %d", i); ndev->description = xstrcpy(buf); ndev->subdevice = i; ndev->gpiopin = pin; ndev->timestamp = time(NULL); if (i == 7) { ndev->direction = DEVDIR_INTERN; ndev->inuse = 1; ndev->comment = xstrcpy((char *)"1-Wire bus"); } else { ndev->direction = DEVDIR_IN_BIN; ndev->inuse = 0; ndev->comment = xstrcpy((char *)"Raspberry GPIO"); } pin++; if (Config.devices == NULL) { Config.devices = ndev; } else { for (device = Config.devices; device; device = device->next) { if (device->next == NULL) { device->next = ndev; break; } } } rc++; } } } #endif return rc; } #ifdef HAVE_WIRINGPI_H PI_THREAD (my_devices_loop) #else void *my_devices_loop(void *threadid) #endif { devices_list *device; char *addr = NULL, line[60], *p = NULL; FILE *fp; int temp, rc; syslog(LOG_NOTICE, "Thread my_devices_loop started"); if (debug) fprintf(stdout, "Thread my_devices_loop started\n"); /* * Loop forever until the external shutdown variable is set. */ for (;;) { /* * Process all devices. */ for (device = Config.devices; device; device = device->next) { if (my_shutdown) break; switch (device->type) { case DEVTYPE_W1: if (strncmp(device->address, (char *)"28", 2) == 0) { /* Read DS18B20 sensor */ addr = xstrcpy((char *)"/sys/bus/w1/devices/"); addr = xstrcat(addr, device->address); addr = xstrcat(addr, (char *)"/w1_slave"); if ((fp = fopen(addr, "r"))) { if (device->present != DEVPRESENT_YES) { syslog(LOG_NOTICE, "sensor %s is back", device->address); device->present = DEVPRESENT_YES; } /* * The output looks like: * 72 01 4b 46 7f ff 0e 10 57 : crc=57 YES * 72 01 4b 46 7f ff 0e 10 57 t=23125 */ fgets(line, 50, fp); line[strlen(line)-1] = '\0'; if ((line[36] == 'Y') && (line[37] == 'E')) { /* CRC is Ok, continue */ fgets(line, 50, fp); line[strlen(line)-1] = '\0'; strtok(line, (char *)"="); p = strtok(NULL, (char *)"="); rc = sscanf(p, "%d", &temp); if ((rc == 1) && (device->value != temp)) { device->value = temp; device->timestamp = time(NULL); } } else { syslog(LOG_NOTICE, "sensor %s CRC error", device->address); device->present = DEVPRESENT_ERROR; } fclose(fp); } else { if (device->present != DEVPRESENT_NO) { syslog(LOG_NOTICE, "sensor %s is missing", device->address); device->present = DEVPRESENT_NO; } } free(addr); addr = NULL; } break; default: break; } } usleep(10000); } syslog(LOG_NOTICE, "Thread my_devices_loop stopped"); if (debug) fprintf(stdout, "Thread my_devices_loop stopped\n"); return 0; }