Merge branch 'feature/update_warm' into 'master'

.gitignore

+log
+loghttp

device_judg/device/car.c

@@ -8,5 +8,6 @@
 void car_Init_0101() {
     pwm_speed(); //pwm初始化，车为停止
     pin_init();
-    AppExit_pin_pwm=1;//车的异常停止值
+    pin_all_default();//拉低全部引脚
+    AppExit_pin_pwm=101;//车的异常停止值
 }
\ No newline at end of file

device_judg/device/pao.c

@@ -10,5 +10,5 @@ void ptr_Init_0401() {
     pin_init();
     pwm_PTZ_hz();
     PTZ_pwm_init();
-    AppExit_pin_pwm=4;//车的异常停止值
+    AppExit_pin_pwm=401;//车的异常停止值
 }
\ No newline at end of file

device_judg/device/ship.c

@@ -8,5 +8,5 @@
 void ship_Init_0301() {
     pwm_speed();
     pin_ship_init(); //pwm初始化，车为停止
-    AppExit_pin_pwm=3;//车的异常停止值
+    AppExit_pin_pwm=301;//车的异常停止值
 }
\ No newline at end of file

device_judg/device/tank.c

@@ -11,5 +11,5 @@ void tank_Init_0201() {
     pinMode(21, OUTPUT);//pwm引脚改为普通引脚
     digitalWrite(2, LOW);
     digitalWrite(21, LOW);
-    AppExit_pin_pwm=2;//坦克的异常停止值
+    AppExit_pin_pwm=201;//坦克的异常停止值
 }
\ No newline at end of file

include/mqtt.h

@@ -7,7 +7,7 @@
 extern char* TOPIC ;
 extern char* TOPIC2 ;
 extern char* TOPIC3 ;
-extern uint8_t AppExit_pin_pwm;
+extern uint16_t AppExit_pin_pwm;
 //extern ThreadPool *pool;
 #define BROKER_ADDRESS "119.45.167.177"
 #define BROKER_PORT 1883

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
 # 目标可执行文件

src/mqtt.c

@@ -6,6 +6,7 @@
 #include "INA226.h"
 #include "heat.h"
 #include "mqtt.h"
+#include "warm.h"
 
 struct mosquitto *mosq;
 
@@ -18,7 +19,7 @@ int gmessage_type=10086;
 
 int message;//存放gmessage_type的值发送心跳，2，3消息为1；
 
-uint8_t AppExit_pin_pwm=0;//判断坦克或者车的退出
+uint16_t AppExit_pin_pwm=0;//判断坦克或者车的退出
 
 int rc=0;//判断mqtt是否成功创建
 //ThreadPool *pool;//线程池线程函数
@@ -70,6 +71,8 @@ void mqtt_wirte(){//心跳格式
     char current_str[20];  // 足够存储转换后的字符串的缓冲区
     sprintf(current_str, "%.2f", current); 
 
+    if(AppExit_pin_pwm/100 != 2) alarm_control(voltage);//判断电压警报
+
     heat_tem();//获取CPU温度
 
     message=1;
@@ -119,9 +122,9 @@ void message_3(cJSON *body,cJSON *pwm_ctrl){//message_type为3，控制pwm
     printf("modeTemp:%d\n",gvalt[1]);
     printf("valTemp:%d\n",gvalt[2]);
 
-    if(AppExit_pin_pwm==1) speed_change(gvalt) ;
-    if(AppExit_pin_pwm==3) ship_speed_change(gvalt) ;
-    if(AppExit_pin_pwm == 4) PTZ_pwm_change(gvalt);
+    if(AppExit_pin_pwm==101) speed_change(gvalt) ;
+    if(AppExit_pin_pwm==301) ship_speed_change(gvalt) ;
+    if(AppExit_pin_pwm == 401) PTZ_pwm_change(gvalt);
         
 }
 

src/thread_main.c

@@ -39,17 +39,17 @@ void *AppExit(void *arg) { //出现意外自动停止
         Delay_Ms(0,100);
         gPwmCount++;
         if(gPwmCount>=5) {
-            if(AppExit_pin_pwm==1) {//车异常问题处理
+            if(AppExit_pin_pwm==101) {//车异常问题处理
                 midde_pwm();
                 pin_all_default();
             }
-            if(AppExit_pin_pwm==2) {//坦克异常问题处理
+            if(AppExit_pin_pwm==201) {//坦克异常问题处理
                 midde_pwm();
                 pin_all_default();
                 digitalWrite(2, LOW);
                 digitalWrite(21, LOW);
             } 
-            if(AppExit_pin_pwm==3) {//船异常问题处理
+            if(AppExit_pin_pwm==301) {//船异常问题处理
                 ship_stop_pwm();
                 pin_all_ship_default();
             }

system/gpio/gpio_pwm_carship.h

 #ifndef __GPIO_PWM_CARSHIP_H__
 #define __GPIO_PWM_CARSHIP_H__
 
+void pin_value(int pin,int value);//控制引脚高低
+
 // 定义 PWM 引脚的 WiringPi 编号
+void pin_init();//坦克、车的引脚初始化
+void pin_all_default();//拉低车的控制引脚
+void pin_ship_init();
+
+
 void pwm_speed();//pwm控制函数
 void midde_pwm();//车pwm停止函数
 void speed_change(unsigned char *buf);//速度和转向值处理mqtt函数
-void pin_init();//坦克、车的引脚初始化
-void pin_all_default();//拉低车的控制引脚
-void pin_value(int pin,int value);//控制引脚高低
 
-void pin_ship_init();
+
+
 void ship_speed_change(void *buf);
 void ship_stop_pwm();//船pwm停止函数
 void pin_all_ship_default();//拉低船引脚

system/sensor/warm.c

+#include "common.h"
+#include "warm.h"
+#include "mqtt.h"
+#include "gpio_pwm_carship.h"
+
+int alarm_highest(int index) {//最高警报，最低电压报警
+    if(index == 1) {
+        pin_value(20,1);//紫灯
+        pin_value(22,1);//蜂鸣器
+    }else if(index == 0) {
+        pin_value(20,0);//紫灯
+        pin_value(22,0);//蜂鸣器
+    }
+
+    return index ;
+}
+
+int alarm_low(int index) {//比较小警报
+    if(index == 1) {
+        pin_value(16,1);//黄灯
+    } else if(index == 0) {
+        pin_value(16,0);//黄灯
+    } 
+
+    return index ;
+}
+
+int alarm_control(float voltage) {//关闭警报
+    if(gPwmCount >= 5) {
+        if( voltage >= 10.5 ) {
+            alarm_highest(0);
+            alarm_low(0);
+        }else if(voltage >= 9.5&&voltage <= 10.5) {
+            alarm_low(1);
+            alarm_highest(0);
+            printf("电压警告");
+        }else if(voltage < 9.5) {
+            alarm_highest(1);
+            alarm_low(1);
+            printf("换电警告");
+        }   
+    }
+    return 0; 
+}

system/sensor/warm.h

+#ifndef __WARM_H__
+#define __WARM_H__
+
+int alarm_control(float voltage) ;
+
+#endif
\ No newline at end of file