Skip to content

C
car-controlserver
Commit e961e050 authored by 957dd's avatar 957dd
Browse files
Options

Merge branch 'feature/add_zlog' into 'master'

Feature/add zlog See merge request !15
parents 2d4b24db 4b0b1704
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 389 additions and 89 deletions
CMakeLists.txt
View file @ e961e050
......@@ -62,6 +62,7 @@ target_link_libraries( main PRIVATE
cjson
curl
m
zlog
)
# 安装规则（可选）
......
build/CMakeFiles/main.dir/compiler_depend.internal
View file @ e961e050
......@@ -110,6 +110,7 @@ CMakeFiles/main.dir/device_judg/device/car.c.o
/usr/include/asm-generic/errno-base.h
/usr/include/wiringPi.h
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h
/home/orangepi/car/master/include/log.h
/home/orangepi/car/master/include/thread_main.h
/home/orangepi/car/master/system/gpio/gpio_pwm_carship.h
/home/orangepi/car/master/system/gpio/gpio_pwm_ptz.h
......@@ -227,6 +228,7 @@ CMakeFiles/main.dir/device_judg/device/pao.c.o
/usr/include/asm-generic/errno-base.h
/usr/include/wiringPi.h
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h
/home/orangepi/car/master/include/log.h
/home/orangepi/car/master/include/thread_main.h
/home/orangepi/car/master/system/gpio/gpio_pwm_carship.h
/home/orangepi/car/master/system/gpio/gpio_pwm_ptz.h
......@@ -344,6 +346,7 @@ CMakeFiles/main.dir/device_judg/device/ship.c.o
/usr/include/asm-generic/errno-base.h
/usr/include/wiringPi.h
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h
/home/orangepi/car/master/include/log.h
/home/orangepi/car/master/include/thread_main.h
/home/orangepi/car/master/system/gpio/gpio_pwm_carship.h
/home/orangepi/car/master/system/gpio/gpio_pwm_ptz.h
......@@ -461,6 +464,7 @@ CMakeFiles/main.dir/device_judg/device/tank.c.o
/usr/include/asm-generic/errno-base.h
/usr/include/wiringPi.h
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h
/home/orangepi/car/master/include/log.h
/home/orangepi/car/master/include/thread_main.h
/home/orangepi/car/master/system/gpio/gpio_pwm_carship.h
/home/orangepi/car/master/system/gpio/gpio_pwm_ptz.h
......@@ -578,6 +582,7 @@ CMakeFiles/main.dir/device_judg/judg/judg.c.o
/usr/include/asm-generic/errno-base.h
/usr/include/wiringPi.h
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h
/home/orangepi/car/master/include/log.h
/home/orangepi/car/master/include/thread_main.h
/home/orangepi/car/master/system/gpio/gpio_pwm_carship.h
/home/orangepi/car/master/system/gpio/gpio_pwm_ptz.h
......@@ -701,6 +706,7 @@ CMakeFiles/main.dir/src/delay.c.o
/usr/include/asm-generic/errno-base.h
/usr/include/wiringPi.h
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h
/home/orangepi/car/master/include/log.h
/home/orangepi/car/master/include/delay.h
CMakeFiles/main.dir/src/fileopen.c.o
......@@ -813,6 +819,7 @@ CMakeFiles/main.dir/src/fileopen.c.o
/usr/include/asm-generic/errno-base.h
/usr/include/wiringPi.h
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h
/home/orangepi/car/master/include/log.h
/home/orangepi/car/master/include/delay.h
CMakeFiles/main.dir/src/ip.c.o
......@@ -943,6 +950,7 @@ CMakeFiles/main.dir/src/ip.c.o
/usr/include/asm-generic/errno-base.h
/usr/include/wiringPi.h
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h
/home/orangepi/car/master/include/log.h
/home/orangepi/car/master/include/ip.h
/usr/include/arpa/inet.h
......@@ -967,12 +975,6 @@ CMakeFiles/main.dir/src/log.c.o
/usr/include/aarch64-linux-gnu/bits/types/time_t.h
/usr/include/aarch64-linux-gnu/bits/stat.h
/usr/include/aarch64-linux-gnu/bits/struct_stat.h
/usr/include/syslog.h
/usr/include/aarch64-linux-gnu/sys/syslog.h
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdarg.h
/usr/include/aarch64-linux-gnu/bits/syslog-path.h
/usr/include/aarch64-linux-gnu/bits/floatn.h
/usr/include/aarch64-linux-gnu/bits/floatn-common.h
/usr/include/dirent.h
/usr/include/aarch64-linux-gnu/bits/dirent.h
/usr/include/aarch64-linux-gnu/bits/posix1_lim.h
......@@ -982,6 +984,7 @@ CMakeFiles/main.dir/src/log.c.o
/usr/include/aarch64-linux-gnu/bits/pthread_stack_min.h
/usr/lib/gcc/aarch64-linux-gnu/11/include/stddef.h
/usr/include/aarch64-linux-gnu/bits/dirent_ext.h
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdarg.h
/home/orangepi/car/master/include/common.h
/usr/include/stdio.h
/usr/include/aarch64-linux-gnu/bits/libc-header-start.h
......@@ -992,6 +995,8 @@ CMakeFiles/main.dir/src/log.c.o
/usr/include/aarch64-linux-gnu/bits/types/FILE.h
/usr/include/aarch64-linux-gnu/bits/types/struct_FILE.h
/usr/include/aarch64-linux-gnu/bits/stdio_lim.h
/usr/include/aarch64-linux-gnu/bits/floatn.h
/usr/include/aarch64-linux-gnu/bits/floatn-common.h
/usr/include/stdlib.h
/usr/include/aarch64-linux-gnu/bits/waitflags.h
/usr/include/aarch64-linux-gnu/bits/waitstatus.h
......@@ -1065,6 +1070,9 @@ CMakeFiles/main.dir/src/log.c.o
/usr/include/asm-generic/errno-base.h
/usr/include/wiringPi.h
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h
/home/orangepi/car/master/include/log.h
/usr/local/include/zlog.h
/home/orangepi/car/master/include/log.h
CMakeFiles/main.dir/src/mqtt.c.o
/home/orangepi/car/master/src/mqtt.c
......@@ -1175,6 +1183,7 @@ CMakeFiles/main.dir/src/mqtt.c.o
/usr/include/asm-generic/errno-base.h
/usr/include/wiringPi.h
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h
/home/orangepi/car/master/include/log.h
/home/orangepi/car/master/system/gpio/gpio_pwm_carship.h
/home/orangepi/car/master/system/gpio/gpio_pwm_ptz.h
/home/orangepi/car/master/include/ip.h
......@@ -1316,6 +1325,7 @@ CMakeFiles/main.dir/src/opensh.c.o
/usr/include/asm-generic/errno-base.h
/usr/include/wiringPi.h
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h
/home/orangepi/car/master/include/log.h
/home/orangepi/car/master/include/mqtt.h
/usr/include/mosquitto.h
/usr/include/cjson/cJSON.h
......@@ -1432,6 +1442,7 @@ CMakeFiles/main.dir/src/pthrpoll.c.o
/usr/include/asm-generic/errno-base.h
/usr/include/wiringPi.h
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h
/home/orangepi/car/master/include/log.h
CMakeFiles/main.dir/src/request.c.o
/home/orangepi/car/master/src/request.c
......@@ -1577,6 +1588,7 @@ CMakeFiles/main.dir/src/request.c.o
/usr/include/asm-generic/errno-base.h
/usr/include/wiringPi.h
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h
/home/orangepi/car/master/include/log.h
/home/orangepi/car/master/include/mqtt.h
/usr/include/mosquitto.h
/home/orangepi/car/master/device_judg/judg/judg.h
......@@ -1719,6 +1731,7 @@ CMakeFiles/main.dir/src/thread_main.c.o
/usr/include/asm-generic/errno.h
/usr/include/asm-generic/errno-base.h
/usr/include/wiringPi.h
/home/orangepi/car/master/include/log.h
/home/orangepi/car/master/system/sensor/heat.h
/home/orangepi/car/master/include/common.h
/home/orangepi/car/master/include/thread_main.h
......@@ -1833,6 +1846,7 @@ CMakeFiles/main.dir/system/gpio/gpio_pwm_carship.c.o
/usr/include/asm-generic/errno-base.h
/usr/include/wiringPi.h
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h
/home/orangepi/car/master/include/log.h
CMakeFiles/main.dir/system/gpio/gpio_pwm_ptz.c.o
/home/orangepi/car/master/system/gpio/gpio_pwm_ptz.c
......@@ -1943,6 +1957,7 @@ CMakeFiles/main.dir/system/gpio/gpio_pwm_ptz.c.o
/usr/include/asm-generic/errno-base.h
/usr/include/wiringPi.h
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h
/home/orangepi/car/master/include/log.h
/home/orangepi/car/master/system/gpio/gpio_pwm_ptz.h
CMakeFiles/main.dir/system/sensor/INA226.c.o
......@@ -2062,6 +2077,7 @@ CMakeFiles/main.dir/system/sensor/INA226.c.o
/usr/include/asm-generic/errno-base.h
/usr/include/wiringPi.h
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h
/home/orangepi/car/master/include/log.h
/home/orangepi/car/master/system/sensor/INA226.h
CMakeFiles/main.dir/system/sensor/heat.c.o
......@@ -2173,6 +2189,7 @@ CMakeFiles/main.dir/system/sensor/heat.c.o
/usr/include/asm-generic/errno-base.h
/usr/include/wiringPi.h
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h
/home/orangepi/car/master/include/log.h
/home/orangepi/car/master/system/sensor/heat.h
CMakeFiles/main.dir/system/sensor/warm.c.o
......@@ -2284,6 +2301,7 @@ CMakeFiles/main.dir/system/sensor/warm.c.o
/usr/include/asm-generic/errno-base.h
/usr/include/wiringPi.h
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h
/home/orangepi/car/master/include/log.h
/home/orangepi/car/master/system/sensor/warm.h
/home/orangepi/car/master/include/mqtt.h
/usr/include/mosquitto.h
......@@ -2402,6 +2420,7 @@ CMakeFiles/main.dir/usr/main.c.o
/usr/include/asm-generic/errno-base.h
/usr/include/wiringPi.h
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h
/home/orangepi/car/master/include/log.h
/home/orangepi/car/master/system/gpio/gpio_pwm_carship.h
/home/orangepi/car/master/system/gpio/gpio_pwm_ptz.h
/home/orangepi/car/master/include/ip.h
......@@ -2437,4 +2456,5 @@ CMakeFiles/main.dir/usr/main.c.o
/home/orangepi/car/master/device_judg/judg/judg.h
/home/orangepi/car/master/include/request.h
/home/orangepi/car/master/include/fileopen.h
/home/orangepi/car/master/include/log.h
build/CMakeFiles/main.dir/device_judg/device/car.c.o.d
View file @ e961e050
......@@ -92,6 +92,7 @@ CMakeFiles/main.dir/device_judg/device/car.c.o: \
/usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \
/usr/include/wiringPi.h \
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h \
/home/orangepi/car/master/include/log.h \
/home/orangepi/car/master/include/thread_main.h \
/home/orangepi/car/master/system/gpio/gpio_pwm_carship.h \
/home/orangepi/car/master/system/gpio/gpio_pwm_ptz.h \
......
build/CMakeFiles/main.dir/device_judg/device/pao.c.o.d
View file @ e961e050
......@@ -92,6 +92,7 @@ CMakeFiles/main.dir/device_judg/device/pao.c.o: \
/usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \
/usr/include/wiringPi.h \
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h \
/home/orangepi/car/master/include/log.h \
/home/orangepi/car/master/include/thread_main.h \
/home/orangepi/car/master/system/gpio/gpio_pwm_carship.h \
/home/orangepi/car/master/system/gpio/gpio_pwm_ptz.h \
......
build/CMakeFiles/main.dir/device_judg/device/ship.c.o.d
View file @ e961e050
......@@ -92,6 +92,7 @@ CMakeFiles/main.dir/device_judg/device/ship.c.o: \
/usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \
/usr/include/wiringPi.h \
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h \
/home/orangepi/car/master/include/log.h \
/home/orangepi/car/master/include/thread_main.h \
/home/orangepi/car/master/system/gpio/gpio_pwm_carship.h \
/home/orangepi/car/master/system/gpio/gpio_pwm_ptz.h \
......
build/CMakeFiles/main.dir/device_judg/device/tank.c.o.d
View file @ e961e050
......@@ -92,6 +92,7 @@ CMakeFiles/main.dir/device_judg/device/tank.c.o: \
/usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \
/usr/include/wiringPi.h \
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h \
/home/orangepi/car/master/include/log.h \
/home/orangepi/car/master/include/thread_main.h \
/home/orangepi/car/master/system/gpio/gpio_pwm_carship.h \
/home/orangepi/car/master/system/gpio/gpio_pwm_ptz.h \
......
build/CMakeFiles/main.dir/device_judg/judg/judg.c.o.d
View file @ e961e050
......@@ -92,6 +92,7 @@ CMakeFiles/main.dir/device_judg/judg/judg.c.o: \
/usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \
/usr/include/wiringPi.h \
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h \
/home/orangepi/car/master/include/log.h \
/home/orangepi/car/master/include/thread_main.h \
/home/orangepi/car/master/system/gpio/gpio_pwm_carship.h \
/home/orangepi/car/master/system/gpio/gpio_pwm_ptz.h \
......
build/CMakeFiles/main.dir/link.txt
View file @ e961e050
/usr/bin/cc CMakeFiles/main.dir/device_judg/device/car.c.o CMakeFiles/main.dir/device_judg/device/pao.c.o CMakeFiles/main.dir/device_judg/device/ship.c.o CMakeFiles/main.dir/device_judg/device/tank.c.o CMakeFiles/main.dir/device_judg/judg/judg.c.o CMakeFiles/main.dir/src/delay.c.o CMakeFiles/main.dir/src/fileopen.c.o CMakeFiles/main.dir/src/ip.c.o CMakeFiles/main.dir/src/log.c.o CMakeFiles/main.dir/src/mqtt.c.o CMakeFiles/main.dir/src/opensh.c.o CMakeFiles/main.dir/src/pthrpoll.c.o CMakeFiles/main.dir/src/request.c.o CMakeFiles/main.dir/src/thread_main.c.o CMakeFiles/main.dir/system/gpio/gpio_pwm_carship.c.o CMakeFiles/main.dir/system/gpio/gpio_pwm_ptz.c.o CMakeFiles/main.dir/system/sensor/INA226.c.o CMakeFiles/main.dir/system/sensor/heat.c.o CMakeFiles/main.dir/system/sensor/warm.c.o CMakeFiles/main.dir/usr/main.c.o -o main -lwiringPi -lmosquitto -lcjson -lcurl -lm
/usr/bin/cc CMakeFiles/main.dir/device_judg/device/car.c.o CMakeFiles/main.dir/device_judg/device/pao.c.o CMakeFiles/main.dir/device_judg/device/ship.c.o CMakeFiles/main.dir/device_judg/device/tank.c.o CMakeFiles/main.dir/device_judg/judg/judg.c.o CMakeFiles/main.dir/src/delay.c.o CMakeFiles/main.dir/src/fileopen.c.o CMakeFiles/main.dir/src/ip.c.o CMakeFiles/main.dir/src/log.c.o CMakeFiles/main.dir/src/mqtt.c.o CMakeFiles/main.dir/src/opensh.c.o CMakeFiles/main.dir/src/pthrpoll.c.o CMakeFiles/main.dir/src/request.c.o CMakeFiles/main.dir/src/thread_main.c.o CMakeFiles/main.dir/system/gpio/gpio_pwm_carship.c.o CMakeFiles/main.dir/system/gpio/gpio_pwm_ptz.c.o CMakeFiles/main.dir/system/sensor/INA226.c.o CMakeFiles/main.dir/system/sensor/heat.c.o CMakeFiles/main.dir/system/sensor/warm.c.o CMakeFiles/main.dir/usr/main.c.o -o main -lwiringPi -lmosquitto -lcjson -lcurl -lm -lzlog
build/CMakeFiles/main.dir/src/delay.c.o.d
View file @ e961e050
......@@ -91,4 +91,5 @@ CMakeFiles/main.dir/src/delay.c.o: /home/orangepi/car/master/src/delay.c \
/usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \
/usr/include/wiringPi.h \
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h \
/home/orangepi/car/master/include/log.h \
/home/orangepi/car/master/include/delay.h
build/CMakeFiles/main.dir/src/fileopen.c.o.d
View file @ e961e050
......@@ -92,4 +92,5 @@ CMakeFiles/main.dir/src/fileopen.c.o: \
/usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \
/usr/include/wiringPi.h \
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h \
/home/orangepi/car/master/include/log.h \
/home/orangepi/car/master/include/delay.h
build/CMakeFiles/main.dir/src/ip.c.o.d
View file @ e961e050
......@@ -107,4 +107,5 @@ CMakeFiles/main.dir/src/ip.c.o: /home/orangepi/car/master/src/ip.c \
/usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \
/usr/include/wiringPi.h \
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h \
/home/orangepi/car/master/include/log.h \
/home/orangepi/car/master/include/ip.h /usr/include/arpa/inet.h
build/CMakeFiles/main.dir/src/log.c.o.d
View file @ e961e050
......@@ -15,13 +15,8 @@ CMakeFiles/main.dir/src/log.c.o: /home/orangepi/car/master/src/log.c \
/usr/include/aarch64-linux-gnu/bits/endianness.h \
/usr/include/aarch64-linux-gnu/bits/types/time_t.h \
/usr/include/aarch64-linux-gnu/bits/stat.h \
/usr/include/aarch64-linux-gnu/bits/struct_stat.h /usr/include/syslog.h \
/usr/include/aarch64-linux-gnu/sys/syslog.h \
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdarg.h \
/usr/include/aarch64-linux-gnu/bits/syslog-path.h \
/usr/include/aarch64-linux-gnu/bits/floatn.h \
/usr/include/aarch64-linux-gnu/bits/floatn-common.h \
/usr/include/dirent.h /usr/include/aarch64-linux-gnu/bits/dirent.h \
/usr/include/aarch64-linux-gnu/bits/struct_stat.h /usr/include/dirent.h \
/usr/include/aarch64-linux-gnu/bits/dirent.h \
/usr/include/aarch64-linux-gnu/bits/posix1_lim.h \
/usr/include/aarch64-linux-gnu/bits/local_lim.h \
/usr/include/linux/limits.h \
......@@ -29,6 +24,7 @@ CMakeFiles/main.dir/src/log.c.o: /home/orangepi/car/master/src/log.c \
/usr/include/aarch64-linux-gnu/bits/pthread_stack_min.h \
/usr/lib/gcc/aarch64-linux-gnu/11/include/stddef.h \
/usr/include/aarch64-linux-gnu/bits/dirent_ext.h \
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdarg.h \
/home/orangepi/car/master/include/common.h /usr/include/stdio.h \
/usr/include/aarch64-linux-gnu/bits/libc-header-start.h \
/usr/include/aarch64-linux-gnu/bits/types/__fpos_t.h \
......@@ -37,8 +33,10 @@ CMakeFiles/main.dir/src/log.c.o: /home/orangepi/car/master/src/log.c \
/usr/include/aarch64-linux-gnu/bits/types/__FILE.h \
/usr/include/aarch64-linux-gnu/bits/types/FILE.h \
/usr/include/aarch64-linux-gnu/bits/types/struct_FILE.h \
/usr/include/aarch64-linux-gnu/bits/stdio_lim.h /usr/include/stdlib.h \
/usr/include/aarch64-linux-gnu/bits/waitflags.h \
/usr/include/aarch64-linux-gnu/bits/stdio_lim.h \
/usr/include/aarch64-linux-gnu/bits/floatn.h \
/usr/include/aarch64-linux-gnu/bits/floatn-common.h \
/usr/include/stdlib.h /usr/include/aarch64-linux-gnu/bits/waitflags.h \
/usr/include/aarch64-linux-gnu/bits/waitstatus.h \
/usr/include/aarch64-linux-gnu/sys/types.h \
/usr/include/aarch64-linux-gnu/bits/types/clock_t.h \
......@@ -97,4 +95,6 @@ CMakeFiles/main.dir/src/log.c.o: /home/orangepi/car/master/src/log.c \
/usr/include/linux/errno.h /usr/include/aarch64-linux-gnu/asm/errno.h \
/usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \
/usr/include/wiringPi.h \
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h \
/home/orangepi/car/master/include/log.h /usr/local/include/zlog.h \
/home/orangepi/car/master/include/log.h
build/CMakeFiles/main.dir/src/mqtt.c.o.d
View file @ e961e050
......@@ -91,6 +91,7 @@ CMakeFiles/main.dir/src/mqtt.c.o: /home/orangepi/car/master/src/mqtt.c \
/usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \
/usr/include/wiringPi.h \
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h \
/home/orangepi/car/master/include/log.h \
/home/orangepi/car/master/system/gpio/gpio_pwm_carship.h \
/home/orangepi/car/master/system/gpio/gpio_pwm_ptz.h \
/home/orangepi/car/master/include/ip.h /usr/include/arpa/inet.h \
......
build/CMakeFiles/main.dir/src/opensh.c.o.d
View file @ e961e050
......@@ -91,6 +91,7 @@ CMakeFiles/main.dir/src/opensh.c.o: \
/usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \
/usr/include/wiringPi.h \
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h \
/home/orangepi/car/master/include/log.h \
/home/orangepi/car/master/include/mqtt.h /usr/include/mosquitto.h \
/usr/include/cjson/cJSON.h /home/orangepi/car/master/include/opensh.h \
/home/orangepi/car/master/device_judg/judg/judg.h
build/CMakeFiles/main.dir/src/pthrpoll.c.o.d
View file @ e961e050
......@@ -91,4 +91,5 @@ CMakeFiles/main.dir/src/pthrpoll.c.o: \
/usr/include/linux/errno.h /usr/include/aarch64-linux-gnu/asm/errno.h \
/usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \
/usr/include/wiringPi.h \
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h \
/home/orangepi/car/master/include/log.h
build/CMakeFiles/main.dir/src/request.c.o.d
View file @ e961e050
......@@ -123,5 +123,6 @@ CMakeFiles/main.dir/src/request.c.o: \
/usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \
/usr/include/wiringPi.h \
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h \
/home/orangepi/car/master/include/log.h \
/home/orangepi/car/master/include/mqtt.h /usr/include/mosquitto.h \
/home/orangepi/car/master/device_judg/judg/judg.h
build/CMakeFiles/main.dir/src/thread_main.c.o.d
View file @ e961e050
......@@ -115,6 +115,7 @@ CMakeFiles/main.dir/src/thread_main.c.o: \
/usr/include/errno.h /usr/include/aarch64-linux-gnu/bits/errno.h \
/usr/include/linux/errno.h /usr/include/aarch64-linux-gnu/asm/errno.h \
/usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \
/usr/include/wiringPi.h /home/orangepi/car/master/system/sensor/heat.h \
/usr/include/wiringPi.h /home/orangepi/car/master/include/log.h \
/home/orangepi/car/master/system/sensor/heat.h \
/home/orangepi/car/master/include/common.h \
/home/orangepi/car/master/include/thread_main.h
build/CMakeFiles/main.dir/system/gpio/gpio_pwm_carship.c.o.d
View file @ e961e050
......@@ -92,4 +92,5 @@ CMakeFiles/main.dir/system/gpio/gpio_pwm_carship.c.o: \
/usr/include/linux/errno.h /usr/include/aarch64-linux-gnu/asm/errno.h \
/usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \
/usr/include/wiringPi.h \
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h \
/home/orangepi/car/master/include/log.h
build/CMakeFiles/main.dir/system/gpio/gpio_pwm_ptz.c.o.d
View file @ e961e050
......@@ -92,4 +92,5 @@ CMakeFiles/main.dir/system/gpio/gpio_pwm_ptz.c.o: \
/usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \
/usr/include/wiringPi.h \
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h \
/home/orangepi/car/master/include/log.h \
/home/orangepi/car/master/system/gpio/gpio_pwm_ptz.h
build/CMakeFiles/main.dir/system/sensor/INA226.c.o.d
View file @ e961e050
......@@ -99,4 +99,5 @@ CMakeFiles/main.dir/system/sensor/INA226.c.o: \
/usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \
/usr/include/wiringPi.h \
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h \
/home/orangepi/car/master/include/log.h \
/home/orangepi/car/master/system/sensor/INA226.h
build/CMakeFiles/main.dir/system/sensor/heat.c.o.d
View file @ e961e050
......@@ -92,4 +92,5 @@ CMakeFiles/main.dir/system/sensor/heat.c.o: \
/usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \
/usr/include/wiringPi.h \
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h \
/home/orangepi/car/master/include/log.h \
/home/orangepi/car/master/system/sensor/heat.h
build/CMakeFiles/main.dir/system/sensor/warm.c.o.d
View file @ e961e050
......@@ -92,6 +92,7 @@ CMakeFiles/main.dir/system/sensor/warm.c.o: \
/usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \
/usr/include/wiringPi.h \
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h \
/home/orangepi/car/master/include/log.h \
/home/orangepi/car/master/system/sensor/warm.h \
/home/orangepi/car/master/include/mqtt.h /usr/include/mosquitto.h \
/usr/include/cjson/cJSON.h \
......
build/CMakeFiles/main.dir/usr/main.c.o.d
View file @ e961e050
......@@ -91,6 +91,7 @@ CMakeFiles/main.dir/usr/main.c.o: /home/orangepi/car/master/usr/main.c \
/usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \
/usr/include/wiringPi.h \
/usr/lib/gcc/aarch64-linux-gnu/11/include/stdbool.h \
/home/orangepi/car/master/include/log.h \
/home/orangepi/car/master/system/gpio/gpio_pwm_carship.h \
/home/orangepi/car/master/system/gpio/gpio_pwm_ptz.h \
/home/orangepi/car/master/include/ip.h /usr/include/arpa/inet.h \
......@@ -120,4 +121,5 @@ CMakeFiles/main.dir/usr/main.c.o: /home/orangepi/car/master/usr/main.c \
/home/orangepi/car/master/include/thread_main.h \
/home/orangepi/car/master/device_judg/judg/judg.h \
/home/orangepi/car/master/include/request.h \
/home/orangepi/car/master/include/fileopen.h
/home/orangepi/car/master/include/fileopen.h \
/home/orangepi/car/master/include/log.h
build/include/version.h
View file @ e961e050
#define PROJECT_VERSION_MAJOR 1
#define PROJECT_VERSION_MINOR 0
#define PROJECT_VERSION_PATCH 1
#define GIT_HASH "0ae069a"
#define BUILD_TIMESTAMP "2025-04-10T16:44:11"
#define GIT_HASH "eae6494"
#define BUILD_TIMESTAMP "2025-04-14T11:06:17"
#define BUILD_USER "orangepi"
build/main
View file @ e961e050
No preview for this file type
device_judg/judg/judg.c
View file @ e961e050
......@@ -33,23 +33,23 @@ int Device_File_Init() {
sub_str[2]=readbuf[4];
sub_str[3]=readbuf[5];
sub_str[4]='\0';
printf("开始初始化了");
my_zlog_info("开始初始化了");
if(strcmp(sub_str,"0101")==0){//车的编码
car_Init_0101() ;
printf("使用型号%s\n",sub_str);
my_zlog_info("使用型号%s",sub_str);
free(sub_str) ;
}else if(strcmp(sub_str,"0201")==0){//坦克的编码
tank_Init_0201();
printf("使用型号%s\n",sub_str);
my_zlog_info("使用型号%s",sub_str);
free(sub_str);
}else if(strcmp(sub_str,"0301")==0){//船的编码
ship_Init_0301();
printf("使用型号%s\n",sub_str);
my_zlog_info("使用型号%s",sub_str);
free(sub_str);
}else if(strcmp(sub_str,"0401")==0){//炮的编码
ptr_Init_0401();
printf("使用型号%s\n",sub_str);
my_zlog_info("使用型号%s",sub_str);
free(sub_str);
}
Delay_Ms(20,0);
......@@ -60,7 +60,7 @@ int Device_File_Init() {
topic_middle_value();//指针传值声明
printf("1:%s,2:%s,3:%s\n",TOPIC,TOPIC2,TOPIC3);
my_zlog_info("1:%s,2:%s,3:%s",TOPIC,TOPIC2,TOPIC3);
return 0;
}
device_judg/judg/judg.h
View file @ e961e050
......@@ -3,4 +3,5 @@
int Device_File_Init();//指针传值声明
void topic_middle_value();//指针函数，在其他文件使用tipic时需要先声明
#endif
\ No newline at end of file
include/common.h
View file @ e961e050
......@@ -13,6 +13,8 @@
#include <errno.h>
#include <wiringPi.h>
#include <stdbool.h>
#include "log.h"
// 其他公共声明
#endif
include/log.h
View file @ e961e050
#ifndef __LOG_H__
#define __LOG_H__
#define LOG_DIR "/home/orangepi/car/master/log"//日志目录
#define LOG_FILE "/home/orangepi/car/master/log/log.log"//日志文件
#define MAX_LOG_AGE_DAYS 15
int logprject_Init();
void my_log_close();
int logconf_create();
// 封装 zlog_debug
void my_zlog_debug(const char *format, ...) ;
// 封装 zlog_info
void my_zlog_info(const char *format, ...) ;
// 封装 zlog_notice
void my_zlog_notice(const char *format, ...) ;
// 封装 zlog_warn
void my_zlog_warn(const char *format, ...) ;
// 封装 zlog_error
void my_zlog_error(const char *format, ...) ;
// 封装 zlog_fatal
void my_zlog_fatal(const char *format, ...) ;
#endif
\ No newline at end of file
src/ip.c
View file @ e961e050
......@@ -11,7 +11,8 @@ char ip_address[INET_ADDRSTRLEN];
int ipaddr() {//获取ip
if (getifaddrs(&ifap) == -1) {
perror("getifaddrs() error");
//perror("getifaddrs() error");
my_zlog_error("getifaddrs() error");
return -1;
}
......@@ -22,7 +23,8 @@ int ipaddr() {//获取ip
}
}
printf("ip:%s\n",ip_address);
//printf("ip:%s\n",ip_address);
my_zlog_debug("ip:%s",ip_address);
freeifaddrs(ifap);
......
src/log.c
View file @ e961e050
#include <sys/stat.h>
#include <dirent.h>
#include "common.h"
\ No newline at end of file
#include <stdarg.h>
#include "common.h"
#include<zlog.h>
#include "log.h"
const char *config_content = "[global]\n"
"strict init = true\n"
"buffer min = 1024\n"
"buffer max = 2MB\n"
"default format = \"%d(%Y-%m-%d %H:%M:%S.%ms) %-6V (%c:%F:%L) - %m%n\"\n"
"file perms = 600 # 设置文件权限\n"
"\n"
"[formats]\n"
"millisecond = \"%d(%Y-%m-%d %H:%M:%S.%ms) [%V] %m%n\"\n"
"\n"
"[rules]\n"
"# 日志文件路径，30天轮询，自动创建目录\n"
"my_log.* \"/home/orangepi/car/master/log/log.log\", 30D; millisecond\n";
const char *LOG_FILE = "/home/orangepi/car/master/log/log.log";//日志文件
static zlog_category_t *zlog_c = NULL;
int logconf_create() {
const char *config_file = "/home/orangepi/car/master/zlog.conf";
// 检查文件是否存在
if (access(config_file, F_OK) != 0) {
// 文件不存在，创建并写入内容
FILE *fp = fopen(config_file, "w");
if (fp == NULL) {
perror("Failed to create zlog.conf");
return 1;
}
// 写入配置内容
fwrite(config_content, strlen(config_content), 1, fp);
fclose(fp);
printf("zlog.conf has been created.\n");
} else {
printf("zlog.conf already exists.\n");
}
return 0;
}
// 检查并创建日志目录
static int create_log_dir_if_not_exist(const char *path) {
char dir_path[256] = {0};
const char *p = path;
char *q = dir_path;
// 提取目录部分
while (*p != '\0') {
*q = *p;
if (*p == '/' && *(p+1) != '\0') {
// 检查并创建每一级目录
if (access(dir_path, F_OK) != 0) {
if (mkdir(dir_path, 0755) != 0) {
fprintf(stderr, "Failed to create directory: %s\n", dir_path);
return -1;
}
}
}
p++;
q++;
}
return 0;
}
int logprject_Init() {
int rc;
zlog_category_t *c;
if(create_log_dir_if_not_exist(LOG_FILE)!=0) {
fprintf(stderr, "Failed to create log directory\n");
return -1;
}
// 初始化 zlog
rc = zlog_init("/home/orangepi/car/master/zlog.conf");
if (rc) {
fprintf(stderr, "zlog init failed\n");
return -2;
}
// 获取日志分类
zlog_c = zlog_get_category("my_log");
if (!c) {
fprintf(stderr, "get category failed\n");
zlog_fini();
return -3;
}
return 0;
}
// 封装 zlog_debug
void my_zlog_debug(const char *format, ...) {
if (zlog_c) {
va_list args;
va_start(args, format);
vzlog_debug(zlog_c, format, args);
va_end(args);
}
}
// 封装 zlog_info
void my_zlog_info(const char *format, ...) {
if (zlog_c) {
va_list args;
va_start(args, format);
vzlog_info(zlog_c, format, args);
va_end(args);
}
}
// 封装 zlog_notice
void my_zlog_notice(const char *format, ...) {
if (zlog_c) {
va_list args;
va_start(args, format);
vzlog_notice(zlog_c, format, args);
va_end(args);
}
}
// 封装 zlog_warn
void my_zlog_warn(const char *format, ...) {
if (zlog_c) {
va_list args;
va_start(args, format);
vzlog_warn(zlog_c, format, args);
va_end(args);
}
}
// 封装 zlog_error
void my_zlog_error(const char *format, ...) {
if (zlog_c) {
va_list args;
va_start(args, format);
vzlog_error(zlog_c, format, args);
va_end(args);
}
}
// 封装 zlog_fatal
void my_zlog_fatal(const char *format, ...) {
if (zlog_c) {
va_list args;
va_start(args, format);
vzlog_fatal(zlog_c, format, args);
va_end(args);
}
}
// 结束 zlog
void my_log_close() {
if (zlog_c) {
zlog_fini();
zlog_c = NULL;
}
}
src/mqtt.c
View file @ e961e050
......@@ -43,7 +43,8 @@ int mqtt_init() {
mosq = mosquitto_new(NULL, true, NULL);
if (!mosq) {
fprintf(stderr, "Failed to create Mosquitto client\n");
//fprintf(stderr, "Failed to create Mosquitto client\n");
my_zlog_fatal("Failed to create Mosquitto client");
return -1;
}
......@@ -54,12 +55,13 @@ int mqtt_init() {
void on_connect(struct mosquitto *mosq, void *obj, int rc) {//回调函数
if (rc == 0) {
printf("Connected to broker\n");
//printf("Connected to broker\n");
my_zlog_debug("Connected to broker");
topic_middle_value();
mosquitto_subscribe(mosq, NULL, TOPIC, 0);
} else {
fprintf(stderr, "Connection failed with code %d\n", rc);
my_zlog_fatal("Connection failed");
}
}
......@@ -103,7 +105,8 @@ void mqtt_wirte(){//心跳格式，每5s一次心跳
cJSON_AddItemToObject(root, "head",head);
char *payload = cJSON_PrintUnformatted(root);
printf("%s\n",payload);
//printf("%s\n",payload);
my_zlog_debug("%s",payload);
mosquitto_publish(mosq, NULL, TOPIC2, strlen(payload), payload, 0, false);
mosquitto_publish(mosq, NULL, TOPIC3, strlen(payload), payload, 0, false);
......@@ -130,9 +133,13 @@ void message_3(cJSON *body,cJSON *pwm_ctrl){//message_type为3，控制pwm
gvalt[2]=valTemp;
gPwmCount = 0;
printf("typeTemp:%d\n",gvalt[0]);
printf("modeTemp:%d\n",gvalt[1]);
printf("valTemp:%d\n",gvalt[2]);
//printf("typeTemp:%d\n",gvalt[0]);
//printf("modeTemp:%d\n",gvalt[1]);
//printf("valTemp:%d\n",gvalt[2]);
my_zlog_debug("typeTemp:%d",gvalt[0]);
my_zlog_debug("modeTemp:%d",gvalt[1]);
my_zlog_debug("valTemp:%d",gvalt[2]);
if(AppExit_pin_pwm==101) speed_change(gvalt) ;
if(AppExit_pin_pwm==301) ship_speed_change(gvalt) ;
......@@ -156,9 +163,10 @@ void message_4(cJSON *body, cJSON *pin_setctrl){//message 为4时候
gvalt[1]=pinTemp;
gvalt[2]=valTemp;
printf("pinTemp:%d\n",gvalt[1]);
printf("valTemp:%d\n",gvalt[2]);
//printf("pinTemp:%d\n",gvalt[1]);
//printf("valTemp:%d\n",gvalt[2]);
my_zlog_debug("pinTemp:%d",gvalt[1]);
my_zlog_debug("valTemp:%d",gvalt[2]);
pin_value(gvalt[1],gvalt[2]);
}
......@@ -167,7 +175,8 @@ void on_message(struct mosquitto *mosq, void *obj, const struct mosquitto_messag
time_t end = time(NULL);
if(gStart+5>end){
printf("正在处理过期消息\n");
//printf("正在处理过期消息\n");
my_zlog_warn("正在处理过期消息");
return;
}
......@@ -184,7 +193,8 @@ void on_message(struct mosquitto *mosq, void *obj, const struct mosquitto_messag
// 解析 JSON
cJSON *json = cJSON_Parse(payload_str);
if (json == NULL) {
fprintf(stderr, "Error before: [%s]\n", cJSON_GetErrorPtr());
//fprintf(stderr, "Error before: [%s]\n", cJSON_GetErrorPtr());
my_zlog_error("Error before: [%s]", cJSON_GetErrorPtr());
free(payload_str);
} else {// 提取 head 对象
cJSON *head = cJSON_GetObjectItem(json, "head");
......@@ -218,11 +228,12 @@ void on_message(struct mosquitto *mosq, void *obj, const struct mosquitto_messag
}
gmessage_type=message_type->valueint;
printf("message_type: %d\n",message_type->valueint);
//printf("message_type: %d\n",message_type->valueint);
my_zlog_debug("message_type: %d",message_type->valueint);
switch(gmessage_type){
case 1:
system("sudo reboot");//重启香橙派
my_zlog_debug("重启成功");
break;
case 2:
refresh_cam();
......@@ -254,7 +265,8 @@ void mqtt_create(struct mosquitto *mosq) {//创建mqtt客服端
// 创建 mosquitto 客户端
rc = mosquitto_connect(mosq, BROKER_ADDRESS, BROKER_PORT, 60);
if (rc != MOSQ_ERR_SUCCESS) {
fprintf(stderr, "Failed to connect to broker: %s\n", mosquitto_strerror(rc));
//fprintf(stderr, "Failed to connect to broker: %s\n", mosquitto_strerror(rc));
my_zlog_warn("Failed to connect to broker: %s", mosquitto_strerror(rc));
mosquitto_destroy(mosq);
//return EXIT_FAILURE;
}
......@@ -268,4 +280,5 @@ void mqtt_clean(struct mosquitto *mosq){
// 清理
mosquitto_destroy(mosq);
mosquitto_lib_cleanup();
my_zlog_notice("清理成功");
}
\ No newline at end of file
src/opensh.c
View file @ e961e050
......@@ -16,9 +16,10 @@ int opencamsh(){
//setenv("DISPLAY", ":0", 1);//设置环境变量https://jywy.yd-ss.com?dev=controcar0004 --new-window sudo
sprintf(gwebcam,"su - orangepi -c \"chromium-browser --use-fake-ui-for-media-stream %s\"",urls);
system(gwebcam);
printf("%s\n",gwebcam);
printf("open cam\n");
my_zlog_debug("%s",gwebcam);
//printf("%s\n",gwebcam);
//printf("open cam\n");
my_zlog_debug("open cam");
return 0;
}
......@@ -62,7 +63,7 @@ void refresh_cam() {//刷新页面
}
pclose(fp);
printf("recam\n");
//printf("recam\n");
my_zlog_debug("刷新成功");
}
src/thread_main.c
View file @ e961e050
......@@ -14,19 +14,23 @@ pthread_t thread[4];
//开启线程
int thread_start(void *AppExit(void *arg),void *Mqttbeat(void *arg),void *opensh(void *arg),void *Mqtt_onnect(void *arg)){
if(pthread_create(&thread[0],NULL,AppExit,NULL)!=0) {
perror("Failed to create thread 0");
//perror("Failed to create thread 0");
my_zlog_error("Failed to create thread 0");
return 0;
}
if(pthread_create(&thread[1],NULL,Mqttbeat,NULL)!=0) {
perror("Failed to create thread 1");
//perror("Failed to create thread 1");
my_zlog_error("Failed to create thread 1");
return 1;
}
if(pthread_create(&thread[2],NULL,opensh,NULL)!=0){
perror("Failed to create thread 2");
//perror("Failed to create thread 2");
my_zlog_error("Failed to create thread 2");
return 2;
}
if(pthread_create(&thread[3],NULL,Mqtt_onnect,NULL)!=0) {
perror("Failed to create thread 3");
//perror("Failed to create thread 3");
my_zlog_error("Failed to create thread 3");
return 3;
}
return -1;
......@@ -59,7 +63,8 @@ void *AppExit(void *arg) { //出现意外自动停止
}
void *Mqttbeat(void *arg) {
printf("Mqttbeat start\n");
//printf("Mqttbeat start\n");
my_zlog_info("Mqttbeat start");
Delay_Ms(15,0);
while(1) {
ipaddr();//获取ip
......@@ -71,7 +76,8 @@ void *Mqttbeat(void *arg) {
void *opensh(void *arg) {
Delay_Ms(5,0);
printf("open cam\n");
//printf("open cam\n");
my_zlog_info("open cam");
opencamsh();//10s后打开游览器并且进入网址
return NULL;
}
......
usr/main.c
View file @ e961e050
......@@ -2,26 +2,43 @@
int main(int argc, char *argv[]) {
if(logconf_create() != 0) {
return 6;
}
if(logprject_Init() != 0) {
my_zlog_fatal( "日志初始化失败");
//printf("日志初始化失败");
return 5;
}
if (wiringPiSetup() == -1) {
printf("WiringPi setup failed!\n");
my_zlog_fatal("WiringPi setup failed!");
//printf("WiringPi setup failed!\n");
return 1;
}
if (!INA226_begin(sda_pin, scl_pin)) {
printf("INA226 初始化失败！\n");
my_zlog_fatal("INA226 初始化失败！");
//printf("INA226 初始化失败！\n");
return 2;
}
if(Device_File_Init()!=0) {
printf("设备文件读取初始化失败！\n");
my_zlog_fatal("This is a fatal message");
//printf("设备文件读取初始化失败！\n");
return 3;
}
if(request_date() != 0){
printf("拉取接口初始化失败\n");
if(request_date() != 0) {
my_zlog_fatal("This is a fatal message");
//printf("拉取接口初始化失败\n");
return 4;
}
printf("识别初始化成功\n");
my_zlog_info("程序初始化成功");
//printf("程序初始化成功\n");
system("pkill chromium");
// 配置 INA226
......@@ -37,7 +54,13 @@ int main(int argc, char *argv[]) {
ipaddr();//获取ip
thread_start(AppExit,Mqttbeat,opensh,Mqtt_onnect);//开启线程
thread_end();
thread_end(); //关闭线程
my_zlog_info("程序关闭成功");
my_log_close();//关闭日志
//printf("程序关闭成功\n");
return EXIT_SUCCESS;
}
\ No newline at end of file
usr/main.h
View file @ e961e050
......@@ -15,5 +15,6 @@
#include "judg.h"
#include "request.h"
#include "fileopen.h"
#include "log.h"
#endif
\ No newline at end of file
zlog.conf 0 → 100644
View file @ e961e050
[global]
strict init = true
buffer min = 1024
buffer max = 2MB
default format = "%d(%Y-%m-%d %H:%M:%S.%ms) %-6V (%c:%F:%L) - %m%n"
file perms = 600 # 设置文件权限
[formats]
millisecond = "%d(%Y-%m-%d %H:%M:%S.%ms) [%V] %m%n"
[rules]
# 日志文件路径，30天轮询，自动创建目录
my_log.* "/home/orangepi/car/master/log/log.log", 30D; millisecond
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment