加入更新

build/include/version.h

@@ -2,5 +2,5 @@
 #define PROJECT_VERSION_MINOR 1
 #define PROJECT_VERSION_PATCH 0
 #define GIT_HASH ""
-#define BUILD_TIMESTAMP "2025-05-10T08:31:49"
+#define BUILD_TIMESTAMP "2025-05-10T10:40:46"
 #define BUILD_USER "orangepi"

device_judg/device/device_change.h

@@ -4,7 +4,7 @@
 
 #define DEVICE_NAME_DIR "/home/orangepi/car/master/deviceback"
 #define DEVICE_NAME_FILE "/home/orangepi/car/master/Deviceld.txt"
-int device_changename_back(const char *device_date, const char *device_id);
-int file_exists(const char *path);
-int create_directory_if_not_exists(const char *path);
+int device_changename_back(const char *device_date, const char *device_id);//设备号备份和写人新设备号
+int file_exists(const char *path);//文件已经存在
+int create_directory_if_not_exists(const char *path);//创建目录
 #endif
\ No newline at end of file

device_judg/judg/judg.c

@@ -17,9 +17,9 @@ char TOPIC_middle[23];
 char TOPIC2_middle[23];
 char TOPIC3_middle[15];
 
-char TOPIC_BACK_middle[23];
-char TOPIC2_BACK_middle[23];
-char TOPIC3_BACK_middle[15];
+// char TOPIC_BACK_middle[23];
+// char TOPIC2_BACK_middle[23];
+// char TOPIC3_BACK_middle[15];
 
 void topic_middle_value() {//指针中转函数，在使用指针前调用
     TOPIC=TOPIC_middle;
@@ -27,11 +27,11 @@ void topic_middle_value() {//指针中转函数，在使用指针前调用
     TOPIC3=TOPIC3_middle;
 }
 
-void topic_back_middle_value() {//指针中转函数，在使用指针前调用
-    TOPIC_BACK=TOPIC_BACK_middle;
-    TOPIC2_BACK=TOPIC2_BACK_middle;
-    TOPIC3_BACK=TOPIC3_BACK_middle;
-}
+// void topic_back_middle_value() {//指针中转函数，在使用指针前调用
+//     TOPIC_BACK=TOPIC_BACK_middle;
+//     TOPIC2_BACK=TOPIC2_BACK_middle;
+//     TOPIC3_BACK=TOPIC3_BACK_middle;
+// }
 
 // 哈希函数：简单的字符串哈希
 unsigned int hash(const char *str, int tableSize) {

device_judg/judg/judg.h

@@ -33,7 +33,7 @@ int Device_File_Init();//指针传值声明
 
 void topic_middle_value();//指针函数，在其他文件使用tipic时需要先声明
 
-void topic_back_middle_value();//指针中转函数，在使用指针前调用
+//void topic_back_middle_value();//指针中转函数，在使用指针前调用
 
 
 #endif
\ No newline at end of file

include/request.h

@@ -6,10 +6,13 @@
 struct MemoryStruct {
     char *memory;
     size_t size;
-};
-extern int errCodeValue;
-extern bool enable_buzzer_value;
-extern double shot_speed_value;
-int request_date();
+};//初始化拉取接口，接收结构体
+
+extern int errCodeValue;//是否错误，一般不会发生
+extern bool enable_buzzer_value;//是否打开蜂鸣器
+extern double shot_speed_value;//射击的pwm占空比
+extern double warn_voltage_value;//警告电压
+extern double err_voltage_value;//错误电压
+int request_date();//请求数据
 
 #endif

src/mqtt.c

@@ -80,8 +80,10 @@ void mqtt_wirte(){//心跳格式，每5s一次心跳
     char current_str[20];  // 足够存储转换后的字符串的缓冲区
     sprintf(current_str, "%.2f", current); 
 
-    if(AppExit_pin_pwm/100 != 2) alarm_control(voltage);//判断电压警报
-    
+    if(AppExit_pin_pwm != 102 || AppExit_pin_pwm != 202 || AppExit_pin_pwm != 301 ||AppExit_pin_pwm != 401) {   
+        alarm_control(voltage);//判断电压警报
+    }
+
     /*读取程序版本号*/
     char *version_num = program_version();
 

src/request.c

@@ -34,6 +34,7 @@ static size_t WriteMemoryCallback(void *contents, size_t size, size_t nmemb, voi
     return realsize;
 }
 
+//分析接口拉的json分析
 int analysis_request_json(char *payload_str) {
     cJSON *json = cJSON_Parse(payload_str);
     if (json == NULL) {
@@ -64,7 +65,6 @@ int analysis_request_json(char *payload_str) {
     cJSON *warn_voltage = cJSON_GetObjectItem(data, "warn_voltage");
     cJSON *err_voltage = cJSON_GetObjectItem(data, "err_voltage");
     cJSON *shot_speed= cJSON_GetObjectItem(data, "shot_speed");
-     
     if(cJSON_IsNumber(errCode)) {
         errCodeValue = errCode->valueint;
         if(errCodeValue != 0){
@@ -102,6 +102,7 @@ int analysis_request_json(char *payload_str) {
     return 0;
 }
 
+//像接口发送设备id
 char *wirte_json() {
     cJSON *body = cJSON_CreateObject();
 
@@ -115,7 +116,7 @@ char *wirte_json() {
     return payload;
 }
 
-int request_date() {
+int request_date() {//请求数据
     CURL *curl;
     CURLcode res;
 

system/sensor/warm.c

@@ -30,14 +30,14 @@ int alarm_low(int index) {//比较小警报
 
 int alarm_control(float voltage) {//关闭警报
     if(gPwmCount >= 5) {
-        if( voltage >= 10.5 ) {
+        if( voltage >= warn_voltage_value ) {
             alarm_highest(0);
             alarm_low(0);
-        }else if(voltage >= 9.5&&voltage <= 10.5) {
+        }else if(voltage >= err_voltage_value&&voltage <= warn_voltage_value) {
             alarm_low(1);
             alarm_highest(0);
             my_zlog_warn("电压警告");
-        }else if(voltage < 9.5) {
+        }else if(voltage < err_voltage_value) {
             alarm_highest(1);
             alarm_low(1);
             my_zlog_warn("换电警告");