更新了电压检测

fce96e6e · 957dd · 6cba0a8b · fce96e6e · fce96e6e · fce96e6e
Commit fce96e6e authored Apr 06, 2025 by 957dd
27 changed files
--- a/.gitignore
+++ b/.gitignore
+log
+loghttp
--- a/device_judg/device/car.c
+++ b/device_judg/device/car.c
--- a/device_judg/device/car.h
+++ b/device_judg/device/car.h
--- a/device_judg/device/pao.c
+++ b/device_judg/device/pao.c
--- a/device_judg/device/pao.h
+++ b/device_judg/device/pao.h
--- a/device_judg/device/ship.c
+++ b/device_judg/device/ship.c
--- a/device_judg/device/ship.h
+++ b/device_judg/device/ship.h
--- a/device_judg/device/tank.c
+++ b/device_judg/device/tank.c
--- a/device_judg/device/tank.h
+++ b/device_judg/device/tank.h
--- a/device_judg/judg/judg.c
+++ b/device_judg/judg/judg.c
--- a/device_judg/judg/judg.h
+++ b/device_judg/judg/judg.h
--- a/include/common.h
+++ b/include/common.h
--- a/include/pthrpoll.h
+++ b/include/pthrpoll.h
--- a/include/thread_main.h
+++ b/include/thread_main.h
--- a/log/log.txt
+++ b/log/log.txt
--- a/loghttp/log.txt
+++ b/loghttp/log.txt
--- a/main
+++ b/main
--- a/makefile
+++ b/makefile
@@ -2,7 +2,7 @@
 CC = gcc
 # 编译选项-Ilib
 CFLAGS = -Wall -g  -Iinclude -Isystem/gpio -Isystem/sensor -Iusr  -Idevice_judg/judg \
-			 -Idevice_judg/device
+			 -Idevice_judg/device 
 # 链接库
 LDFLAGS = -lwiringPi -lmosquitto -lcjson -lm
 # 目标可执行文件

--- a/src/pthrpoll.c
+++ b/src/pthrpoll.c
--- a/src/thread_main.c
+++ b/src/thread_main.c
--- a/system/gpio/gpio_pwm_ptz.c
+++ b/system/gpio/gpio_pwm_ptz.c
--- a/system/gpio/gpio_pwm_ptz.h
+++ b/system/gpio/gpio_pwm_ptz.h
--- a/system/sensor/INA226.c
+++ b/system/sensor/INA226.c
--- a/system/sensor/INA226.h
+++ b/system/sensor/INA226.h
--- a/system/sensor/warm.c
+++ b/system/sensor/warm.c
@@ -27,13 +27,14 @@ int alarm_low(int index) {//比较小警报
 int alarm_control(float voltage) {//关闭警报
    if(gPwmCount >= 5) {
-        if( voltage >= 10.1 ) {
+        if( voltage >= 10.5 ) {
            alarm_highest(0);
            alarm_low(0);
-        }else if(voltage >= 9.1&&voltage <= 10.1) {
+        }else if(voltage >= 9.5&&voltage <= 10.5) {
            alarm_low(1);
+            alarm_highest(0);
            printf("电压警告");
-        }else if(voltage < 9.1) {
+        }else if(voltage < 9.5) {
            alarm_highest(1);
            alarm_low(1);
            printf("换电警告");

--- a/system/sensor/warm.h
+++ b/system/sensor/warm.h
--- a/usr/main.h
+++ b/usr/main.h