Skip to content

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

Merge branch 'feature/add_post' into 'master'

update See merge request !13
parents a047b520 6e29f3e8
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 6 deletions
build/include/version.h
View file @ de915e31
#define PROJECT_VERSION_MAJOR 1 #define PROJECT_VERSION_MAJOR 1
#define PROJECT_VERSION_MINOR 0 #define PROJECT_VERSION_MINOR 0
#define PROJECT_VERSION_PATCH 1 #define PROJECT_VERSION_PATCH 1
#define GIT_HASH "4110c15" #define GIT_HASH "0ae069a"
#define BUILD_TIMESTAMP "2025-04-10T16:16:30" #define BUILD_TIMESTAMP "2025-04-10T16:44:11"
#define BUILD_USER "orangepi" #define BUILD_USER "orangepi"
build/main
View file @ de915e31
No preview for this file type
src/mqtt.c
View file @ de915e31
...@@ -16,8 +16,6 @@ char* TOPIC = NULL; ...@@ -16,8 +16,6 @@ char* TOPIC = NULL;
char* TOPIC2 = NULL; char* TOPIC2 = NULL;
char* TOPIC3 = NULL; char* TOPIC3 = NULL;
char *version_num;//版本号指针
int gPwmCount = 0; // 计数 int gPwmCount = 0; // 计数
int gmessage_type=10086; int gmessage_type=10086;
...@@ -78,8 +76,7 @@ void mqtt_wirte(){//心跳格式，每5s一次心跳 ...@@ -78,8 +76,7 @@ void mqtt_wirte(){//心跳格式，每5s一次心跳
if(AppExit_pin_pwm/100 != 2) alarm_control(voltage);//判断电压警报 if(AppExit_pin_pwm/100 != 2) alarm_control(voltage);//判断电压警报
/*读取程序版本号*/ /*读取程序版本号*/
version_num = malloc(16); char *version_num = program_version();
version_num = program_version();
heat_tem();//获取CPU温度 heat_tem();//获取CPU温度
......
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