diff --git a/gpio/Makefile b/gpio/Makefile index 07b7597..61f8cfe 100644 --- a/gpio/Makefile +++ b/gpio/Makefile @@ -1,23 +1,20 @@ CC=gcc libs=info_infrared.o info_light.o info_pin.o info_sound.o info_ultrasound.o -all: infrared light pin sound ultrasound +all: infrared light pin sound ultrasound wind_ -infrared: info_infrared.o - $(CC) -c info_infrared.c - $(CC) info_infrared.o -o info_infrared -lwiringPi -light: info_light.o - $(CC) -c info_light.c - $(CC) info_light.o -o info_light -lwiringPi -pin: info_pin.o - $(CC) -c info_pin.c - $(CC) info_pin.o -o info_pin -lwiringPi -sound: info_sound.o - $(CC) -c info_sound.c - $(CC) info_sound.o -o info_sound -lwiringPi -ultrasound: info_ultrasound.o - $(CC) -c info_ultrasound.c - $(CC) info_ultrasound.o -o info_ultrasound -lwiringPi +infrared: info_infrared + $(CC) info_infrared.c -o info_infrared -lwiringPi +light: info_light + $(CC) info_light.c -o info_light -lwiringPi +pin: info_pin + $(CC) info_pin.c -o info_pin -lwiringPi +sound: info_sound + $(CC) info_sound.c -o info_sound -lwiringPi +ultrasound: info_ultrasound + $(CC) info_ultrasound.c -o info_ultrasound -lwiringPi +wind_: wind + ${CC} wind.c -o wind .PHONY : clean clean : diff --git a/gpio/info.sh b/gpio/info.sh index 784bb84..8832101 100644 --- a/gpio/info.sh +++ b/gpio/info.sh @@ -184,7 +184,7 @@ function sound() function wind_daemon() { while true; do - ${bindir}/wind > ${bindir}/data/wind.data; : 温度传感器获取室内温度信息. + ${bindir}/wind -d ${device} > ${bindir}/data/wind.data; : 温度传感器获取室内温度信息. SLEEP 9; done } diff --git a/gpio/info_infrared b/gpio/info_infrared index 8c0c55e..f91459e 100644 Binary files a/gpio/info_infrared and b/gpio/info_infrared differ diff --git a/gpio/info_infrared.o b/gpio/info_infrared.o deleted file mode 100644 index 6e016e5..0000000 Binary files a/gpio/info_infrared.o and /dev/null differ diff --git a/gpio/info_light b/gpio/info_light index b29f0fa..28574ec 100644 Binary files a/gpio/info_light and b/gpio/info_light differ diff --git a/gpio/info_light.o b/gpio/info_light.o deleted file mode 100644 index eba21b3..0000000 Binary files a/gpio/info_light.o and /dev/null differ diff --git a/gpio/info_pin b/gpio/info_pin index bb8e05f..8f81c44 100644 Binary files a/gpio/info_pin and b/gpio/info_pin differ diff --git a/gpio/info_pin.o b/gpio/info_pin.o deleted file mode 100644 index 94dcacb..0000000 Binary files a/gpio/info_pin.o and /dev/null differ diff --git a/gpio/info_sound b/gpio/info_sound index 0c0936b..3bdcb9c 100644 Binary files a/gpio/info_sound and b/gpio/info_sound differ diff --git a/gpio/info_sound.o b/gpio/info_sound.o deleted file mode 100644 index b4f2be6..0000000 Binary files a/gpio/info_sound.o and /dev/null differ diff --git a/gpio/info_ultrasound b/gpio/info_ultrasound index 740f89d..8f4724f 100644 Binary files a/gpio/info_ultrasound and b/gpio/info_ultrasound differ diff --git a/gpio/info_ultrasound.o b/gpio/info_ultrasound.o deleted file mode 100644 index 56d099e..0000000 Binary files a/gpio/info_ultrasound.o and /dev/null differ diff --git a/gpio/log/wind.pid b/gpio/log/wind.pid index 08bf241..384e6e6 100644 --- a/gpio/log/wind.pid +++ b/gpio/log/wind.pid @@ -1 +1 @@ -9062 +7721 diff --git a/gpio/wind b/gpio/wind index c28e8d6..101f43f 100644 Binary files a/gpio/wind and b/gpio/wind differ diff --git a/gpio/wind.c b/gpio/wind.c index 3461708..97f45e4 100644 --- a/gpio/wind.c +++ b/gpio/wind.c @@ -7,9 +7,27 @@ #include #include -#define N 80 +#define N 99 int main(int argc, char *argv[]) +{ + int ch; + opterr = 0; + while((ch = getopt(argc, argv, "d:h?")) != -1) + switch (ch) { + case 'd': + _main(optarg); + break; + case 'h': case '?': + printf("wind -d device\n"); + exit(0); + break; + default: + ; + } +} + +int _main(char *optarg) { char path[50] = "/sys/bus/w1/devices/"; char rom[20]; @@ -19,6 +37,9 @@ int main(int argc, char *argv[]) FILE *fp; char *temp; float value; + char *device; // 设备 + if(optarg == '\0') + strcmp(device, optarg); system("sudo modprobe w1-gpio"); system("sudo modprobe w1-therm"); @@ -27,7 +48,7 @@ int main(int argc, char *argv[]) } while((direntp = readdir(dirp)) != NULL) { - if(strstr(direntp->d_name, "28-0")) { + if(strstr(direntp->d_name, device)) { strcpy(rom, direntp->d_name); } }