Merge branch 'feature/add_post' into 'master'

update See merge request !13

Merge branch 'feature/add_post' into 'master'
de915e31 · 957dd · a047b520 · 6e29f3e8 · de915e31 · de915e31
Commit de915e31 authored Apr 11, 2025 by 957dd
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 6 deletions

mqtt.c.o build/CMakeFiles/main.dir/src/mqtt.c.o +0 -0

version.h build/include/version.h +2 -2

main build/main +0 -0

mqtt.c src/mqtt.c +1 -4

No files found.
--- a/build/CMakeFiles/main.dir/src/mqtt.c.o
+++ b/build/CMakeFiles/main.dir/src/mqtt.c.o
--- a/build/include/version.h
+++ b/build/include/version.h
 #define PROJECT_VERSION_MAJOR 1
 #define PROJECT_VERSION_MINOR 0
 #define PROJECT_VERSION_PATCH 1
-#define GIT_HASH "4110c15"
-#define BUILD_TIMESTAMP "2025-04-10T16:16:30"
+#define GIT_HASH "0ae069a"
+#define BUILD_TIMESTAMP "2025-04-10T16:44:11"
 #define BUILD_USER "orangepi"
--- a/build/main
+++ b/build/main
--- a/src/mqtt.c
+++ b/src/mqtt.c
@@ -16,8 +16,6 @@ char*  TOPIC = NULL;
 char*  TOPIC2 = NULL;
 char*  TOPIC3 = NULL;

-char *version_num;//版本号指针
-
 int gPwmCount = 0;  // 计数
 int gmessage_type=10086;

@@ -78,8 +76,7 @@ void mqtt_wirte(){//心跳格式，每5s一次心跳
    if(AppExit_pin_pwm/100 != 2) alarm_control(voltage);//判断电压警报
    
    /*读取程序版本号*/
-    version_num = malloc(16);
-    version_num = program_version();
+    char *version_num = program_version();

    heat_tem();//获取CPU温度