2

CMakeLists.txt

@@ -39,6 +39,7 @@ include_directories(
     include
     app/device_identity
     app/main
+    app/device_change
     drivers/common
     modules/logger
     modules/delay
@@ -52,6 +53,7 @@ file(GLOB_RECURSE SOURCES
     modules/logger/*.c
     modules/delay/*.c
     app/device_identity/*.c
+    app/device_change/*.c
     app/main/*.c
     third_party/zlog/src/*.c
 )

app/device_identity/device_fileopen.c

@@ -7,11 +7,12 @@
 
 #define FILE_VERSION "/home/orangepi/car/master/version.conf"
 
+char *g_device_id = NULL;
 
 /*读出文件函数，读取设备号函数，获得设备号id*/
 char *device_inspect() {
     FILE *file;
-    char buffer_device[30]; // 用于存储文件内容
+    static char s_buffer_device[30]; // 用于存储文件内容
     //char *read_device_back_fail_middle=read_device_back_fail();    
     while (1) {
         file = fopen(FILENAME, "r"); // 以只读模式打开文件
@@ -24,12 +25,11 @@ char *device_inspect() {
         } 
         else {
             // 尝试读取文件内容
-            if (fgets(buffer_device, sizeof(buffer_device), file) != NULL) {
+            if (fgets(s_buffer_device, sizeof(s_buffer_device), file) != NULL) {
                 // 如果文件内容不为空
                 fclose(file);
-                my_zlog_debug("读取到文件内容: %s", buffer_device);
-                char *buf_device=buffer_device;
-                return  buf_device;
+                my_zlog_debug("读取到文件内容: %s", s_buffer_device);
+                return  s_buffer_device;
             } else {
                 // if(read_device_back_fail_middle!=NULL) {
                 //     fclose(file);
@@ -39,32 +39,34 @@ char *device_inspect() {
             }
             fclose(file);
         }
-    Delay_s(1); // 等待1秒后再次检查
+    delay_s(1); // 等待1秒后再次检查
     }
 }
 
 /*设备读取文件初始化*/
-int Device_Id_File_Init() {
-    char *device_id=device_inspect();
-
+int device_id_file_init() {
+    g_device_id=device_inspect();
+    my_zlog_debug("读取到文件内容222: %s", g_device_id);
     return 0;
 }
+char *device_id_function(){
+    return g_device_id;
+}
 
 /*打开版本文件，版本文件是go语言进行创建，只需要读取就行了*/
 char *program_version() {
     FILE *file;
-    char buffer_version[30];// 用于存储版本号内容
+    static char s_buffer_version[30];// 用于存储版本号内容
     file = fopen(FILE_VERSION, "r"); // 以只读模式打开文件
     if (file == NULL) {
             my_zlog_debug("版本文件无");
         }  else {
             // 尝试读取文件内容
-            if (fgets(buffer_version, sizeof(buffer_version), file) != NULL) {
+            if (fgets(s_buffer_version, sizeof(s_buffer_version), file) != NULL) {
                 // 如果文件内容不为空
                 fclose(file);
-                my_zlog_debug("读取到文件内容: %s", buffer_version);
-                char *buf_version=buffer_version;
-                return buf_version;
+                my_zlog_debug("读取到文件内容: %s", s_buffer_version);
+                return s_buffer_version;
             } else {
                 my_zlog_debug("文件为空，等待中...");
             }

app/device_identity/device_fileopen.h

 #ifndef DEVICE_FILEOPEN_H__
 #define DEVICE_FILEOPEN_H__
 
+
 /*设备读取文件初始化*/
-int Device_Id_File_Init();
+int device_id_file_init();
 
 /*打开版本文件，版本文件是go语言进行创建，只需要读取就行了*/
 char *program_version() ;
 
+//extern char *g_device_id ;
+
+char *device_id_function();
 #endif
\ No newline at end of file

app/device_identity/device_identity.c

+#include "common.h"
+#include "device_identity.h"
+#include "device_fileopen.h"
+#include "delay.h"
+#include "mylog.h"
+
+char g_app2dev_topic[23];
+char g_dev2app_topic[23];
+char g_pure_topic[15];
+char g_ser2dev_topic[23];
+
+bool g_device_name_exists=0;
+
+/*提早声明*/
+int device_mqtt_topic_init();
+
+/*纯设备号*/
+char *mqtt_topic_pure_number(){
+    return g_pure_topic;
+}
+
+/*app2dev设备号*/
+char *mqtt_topic_app2dev_number(){
+    return g_app2dev_topic;
+}
+
+/*dev2app设备号*/
+char *mqtt_topic_dev2app_number(){
+    return g_dev2app_topic;
+}
+
+/*ser2dev设备号*/
+char *mqtt_topic_ser2dev_number(){
+    return g_ser2dev_topic;
+}
+
+// 哈希函数：简单的字符串哈希
+unsigned int hash(const char *str, int tableSize) {
+    unsigned int hash = 0;
+    while (*str) {
+        hash = (hash << 5) + *str++;
+    }
+    return hash % tableSize;
+}
+
+// 创建哈希表
+HashTable_t* createHashTable(int size) {
+    HashTable_t *hashTable = (HashTable_t *)malloc(sizeof(HashTable_t));
+    if (hashTable == NULL) {
+        // 这里可以加错误处理，比如返回 NULL
+        return NULL;
+    }
+    hashTable->size = size;
+    hashTable->table = (HashEntry_t **)malloc(sizeof(HashEntry_t *) * size);
+    if (hashTable->table == NULL) {
+        free(hashTable);
+        return NULL;
+    }
+    for (int i = 0; i < size; i++) {
+        hashTable->table[i] = NULL;
+    }
+    return hashTable;
+}
+
+// 插入元素到哈希表
+void insert(HashTable_t *HashTable_t, const char *key, CodeEnum_t value) {
+    unsigned int index = hash(key, HashTable_t->size);
+    HashEntry_t *newEntry = (HashEntry_t *)malloc(sizeof(HashEntry_t));
+    newEntry->key = key;
+    newEntry->value = value;
+    newEntry->next = HashTable_t->table[index];
+    HashTable_t->table[index] = newEntry;
+}
+
+// 查找元素
+CodeEnum_t find(HashTable_t *HashTable_t, const char *key) {
+    unsigned int index = hash(key, HashTable_t->size);
+    HashEntry_t *entry = HashTable_t->table[index];
+    while (entry) {
+        if (strcmp(entry->key, key) == 0) {
+            return entry->value;
+        }
+        entry = entry->next;
+    }
+    return -1;  // 未找到
+}
+
+int hash_insert_init(HashTable_t *HashTable_t) {
+
+    // 插入已有的代码
+    insert(HashTable_t, "0101", CAR_0101);
+    insert(HashTable_t, "0102", CAR_0102);
+    insert(HashTable_t, "0103", CAR_0103);
+    insert(HashTable_t, "0104", CAR_0104);
+    insert(HashTable_t, "0201", TANK_0201);
+    insert(HashTable_t, "0202", TANK_0202);  
+    insert(HashTable_t, "0301", SHIP_0301);
+    insert(HashTable_t, "0401", PAO_0401);
+}
+
+int device_judg(CodeEnum_t code,char *sub_str) {
+    if (code == CAR_0101) {
+        //car_Init_0101();
+        my_zlog_info("使用型号%s",sub_str);
+    }else if(code == CAR_0102) {
+        //car_Init_0102();
+        my_zlog_info("使用型号%s",sub_str);
+    }else if(code == CAR_0103) {
+        //car_Init_0103();
+        my_zlog_info("使用型号%s",sub_str);
+    }else if(code == CAR_0104) {
+        //car_Init_0104();
+        my_zlog_info("使用型号%s",sub_str);
+    }else if(code == TANK_0201) {
+        //tank_Init_0201();
+        my_zlog_info("使用型号%s",sub_str);
+    }else if(code == TANK_0202) {
+        //tank_Init_0202();
+        my_zlog_info("使用型号%s",sub_str);
+    }else if(code == SHIP_0301) {
+        //ship_Init_0301();
+        my_zlog_info("使用型号%s",sub_str);
+    }else if(code ==PAO_0401) {
+        //ptr_Init_0401();
+        my_zlog_info("使用型号%s",sub_str);   
+    }else {
+        my_zlog_error("没有找到设备号,尝试启用备用mqtt,topic进行改名");
+        g_device_name_exists=1;
+        
+    }
+    return 0;
+}
+
+/*
+设备mqtt的topic初始化函数
+*/
+int device_mqtt_topic_init() {
+    char *readmidbuf=device_id_function(); //读取代码
+    if(strlen(readmidbuf) > 14 && readmidbuf[14]=='\n') readmidbuf[14]='\0';//将\n去除
+
+    const char *readbuf = readmidbuf;
+
+    //将第3个和第4个字符提取出来
+    char *sub_str=malloc(5);
+    sub_str[0]=readbuf[2];
+    sub_str[1]=readbuf[3];
+    sub_str[2]=readbuf[4];
+    sub_str[3]=readbuf[5];
+    sub_str[4]='\0';
+    my_zlog_info("开始初始化了");
+
+    HashTable_t *HashTable_t = createHashTable(INITIAL_TABLE_SIZE);//创造hash表
+    hash_insert_init(HashTable_t);//hash表初始化
+    CodeEnum_t code = find(HashTable_t, sub_str);
+    
+    if(device_judg(code,sub_str) == 0) my_zlog_info("判断成功了");
+
+    free(sub_str);
+          
+    delay_s(20);
+    if(g_device_name_exists == 0) {
+        sprintf(g_app2dev_topic,"dev2app/%s",readbuf);
+        sprintf(g_dev2app_topic,"app2dev/%s",readbuf);
+        sprintf(g_pure_topic,"%s",readbuf);
+        sprintf(g_ser2dev_topic,"ser2dev/%s",readbuf);
+    } else {
+        sprintf(g_app2dev_topic,"dev2app/%s","00000000000000");
+        sprintf(g_dev2app_topic,"app2dev/%s","00000000000000");
+        sprintf(g_pure_topic,"%s","00000000000000");
+        sprintf(g_ser2dev_topic,"ser2dev/%s","00000000000000");
+    }
+
+    my_zlog_info("1:%s,2:%s,3:%s,4:%s",g_app2dev_topic,g_dev2app_topic,g_pure_topic,g_ser2dev_topic);
+    return 0;
+}

app/device_identity/device_identity.h

+#ifndef device_identity_H__
+#define device_identity_H__
+
+#define INITIAL_TABLE_SIZE 10 //定义大小
+
+/*
+定义一个枚举类型 CodeEnum，用于表示不同的代码
+枚举类型是一种用户自定义的数据类型，它可以让代码更具可读性和可维护性
+ */
+typedef enum {
+    CAR_0101 = 1,
+    CAR_0102,
+    CAR_0103,
+    CAR_0104,
+    TANK_0201,
+    TANK_0202,
+    SHIP_0301,
+    PAO_0401
+} CodeEnum_t;
+
+//哈希健
+typedef struct HashEntry_t {
+    const char *key;
+    CodeEnum_t value;
+    struct HashEntry_t *next;
+} HashEntry_t;
+
+//哈希表内存
+typedef struct {
+    HashEntry_t **table;
+    int size;
+} HashTable_t;
+
+
+/*
+设备mqtt的topic初始化函数
+*/
+int device_mqtt_topic_init();
+
+
+
+#endif
\ No newline at end of file

app/main/main.c

 #include "main.h"
 
 int main(){
-
-    if(logconf_create() != 0) {
-        return 1;
+    if(mylog_init()!=0){
+       my_zlog_error("日志初始化失败，错误代码：%d",mylog_init());
+       return -1;
     }
 
-    if(logprject_Init() != 0) {
-        my_zlog_fatal( "日志初始化失败");
-        return 2;
+    if(device_id_file_init()!=0){
+       my_zlog_error("设备id读取失败");
+       return -2;
     }
 
-    if(Device_Id_File_Init()!=0){
-        printf("设备id读取失败");
+    if(device_mqtt_topic_init()!=0){
+    my_zlog_error("mqtt的topic读取失败");
+       return -2;
     }
-    printf("搞定");
-    
+
     my_zlog_info("程序关闭成功");
     my_log_close();//关闭日志
     return 0;

app/main/main.h

@@ -4,8 +4,17 @@
 #include "common.h"
 #include "device_fileopen.h"
 #include "mylog.h"
+#include "device_identity.h"
 
-//
-int Device_Id_File_Init();
+/*设备id读取初始化*/
+int device_id_file_init();
 
+/*初始化log日志*/
+int mylog_init();
+
+/*mqtt的topic初始化*/
+int device_mqtt_topic_init();
+
+/*关闭log日志记录*/
+void my_log_close();
 #endif

build/Makefile

@@ -366,6 +366,54 @@ mosquitto_payload_modification/fast:
 	$(MAKE) $(MAKESILENT) -f third_party/mosquitto/plugins/payload-modification/CMakeFiles/mosquitto_payload_modification.dir/build.make third_party/mosquitto/plugins/payload-modification/CMakeFiles/mosquitto_payload_modification.dir/build
 .PHONY : mosquitto_payload_modification/fast
 
+app/device_change/device_id_change.o: app/device_change/device_id_change.c.o
+.PHONY : app/device_change/device_id_change.o
+
+# target to build an object file
+app/device_change/device_id_change.c.o:
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/app/device_change/device_id_change.c.o
+.PHONY : app/device_change/device_id_change.c.o
+
+app/device_change/device_id_change.i: app/device_change/device_id_change.c.i
+.PHONY : app/device_change/device_id_change.i
+
+# target to preprocess a source file
+app/device_change/device_id_change.c.i:
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/app/device_change/device_id_change.c.i
+.PHONY : app/device_change/device_id_change.c.i
+
+app/device_change/device_id_change.s: app/device_change/device_id_change.c.s
+.PHONY : app/device_change/device_id_change.s
+
+# target to generate assembly for a file
+app/device_change/device_id_change.c.s:
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/app/device_change/device_id_change.c.s
+.PHONY : app/device_change/device_id_change.c.s
+
+app/device_change/device_wifi_change.o: app/device_change/device_wifi_change.c.o
+.PHONY : app/device_change/device_wifi_change.o
+
+# target to build an object file
+app/device_change/device_wifi_change.c.o:
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/app/device_change/device_wifi_change.c.o
+.PHONY : app/device_change/device_wifi_change.c.o
+
+app/device_change/device_wifi_change.i: app/device_change/device_wifi_change.c.i
+.PHONY : app/device_change/device_wifi_change.i
+
+# target to preprocess a source file
+app/device_change/device_wifi_change.c.i:
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/app/device_change/device_wifi_change.c.i
+.PHONY : app/device_change/device_wifi_change.c.i
+
+app/device_change/device_wifi_change.s: app/device_change/device_wifi_change.c.s
+.PHONY : app/device_change/device_wifi_change.s
+
+# target to generate assembly for a file
+app/device_change/device_wifi_change.c.s:
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/app/device_change/device_wifi_change.c.s
+.PHONY : app/device_change/device_wifi_change.c.s
+
 app/device_identity/device_fileopen.o: app/device_identity/device_fileopen.c.o
 .PHONY : app/device_identity/device_fileopen.o
 
@@ -1042,6 +1090,12 @@ help:
 	@echo "... mosquitto_sub"
 	@echo "... mosquittopp"
 	@echo "... mosquittopp_static"
+	@echo "... app/device_change/device_id_change.o"
+	@echo "... app/device_change/device_id_change.i"
+	@echo "... app/device_change/device_id_change.s"
+	@echo "... app/device_change/device_wifi_change.o"
+	@echo "... app/device_change/device_wifi_change.i"
+	@echo "... app/device_change/device_wifi_change.s"
 	@echo "... app/device_identity/device_fileopen.o"
 	@echo "... app/device_identity/device_fileopen.i"
 	@echo "... app/device_identity/device_fileopen.s"

build/third_party/mosquitto/apps/mosquitto_ctrl/CMakeFiles/mosquitto_ctrl.dir/progress.make

-CMAKE_PROGRESS_1 = 
-CMAKE_PROGRESS_2 = 78
+CMAKE_PROGRESS_1 = 78
+CMAKE_PROGRESS_2 = 
 CMAKE_PROGRESS_3 = 
 CMAKE_PROGRESS_4 = 79
 CMAKE_PROGRESS_5 = 
-CMAKE_PROGRESS_6 = 
-CMAKE_PROGRESS_7 = 80
+CMAKE_PROGRESS_6 = 80
+CMAKE_PROGRESS_7 = 
 CMAKE_PROGRESS_8 = 
 CMAKE_PROGRESS_9 = 81
 CMAKE_PROGRESS_10 = 
-CMAKE_PROGRESS_11 = 
-CMAKE_PROGRESS_12 = 82
+CMAKE_PROGRESS_11 = 82
+CMAKE_PROGRESS_12 = 
 CMAKE_PROGRESS_13 = 
 

build/third_party/mosquitto/apps/mosquitto_passwd/CMakeFiles/mosquitto_passwd.dir/progress.make

 CMAKE_PROGRESS_1 = 
 CMAKE_PROGRESS_2 = 89
 CMAKE_PROGRESS_3 = 
-CMAKE_PROGRESS_4 = 
-CMAKE_PROGRESS_5 = 90
+CMAKE_PROGRESS_4 = 90
+CMAKE_PROGRESS_5 = 
 CMAKE_PROGRESS_6 = 
 CMAKE_PROGRESS_7 = 91
 

build/third_party/mosquitto/client/CMakeFiles/mosquitto_pub.dir/progress.make

-CMAKE_PROGRESS_1 = 92
+CMAKE_PROGRESS_1 = 
 CMAKE_PROGRESS_2 = 
 CMAKE_PROGRESS_3 = 93
 CMAKE_PROGRESS_4 = 
-CMAKE_PROGRESS_5 = 
+CMAKE_PROGRESS_5 = 94
 

build/third_party/mosquitto/client/CMakeFiles/mosquitto_rr.dir/progress.make

-CMAKE_PROGRESS_1 = 94
+CMAKE_PROGRESS_1 = 
 CMAKE_PROGRESS_2 = 
 CMAKE_PROGRESS_3 = 95
 CMAKE_PROGRESS_4 = 
-CMAKE_PROGRESS_5 = 
-CMAKE_PROGRESS_6 = 96
+CMAKE_PROGRESS_5 = 96
+CMAKE_PROGRESS_6 = 
 

build/third_party/mosquitto/client/CMakeFiles/mosquitto_sub.dir/progress.make

 CMAKE_PROGRESS_1 = 
 CMAKE_PROGRESS_2 = 97
 CMAKE_PROGRESS_3 = 
-CMAKE_PROGRESS_4 = 
-CMAKE_PROGRESS_5 = 98
+CMAKE_PROGRESS_4 = 98
+CMAKE_PROGRESS_5 = 
 

build/third_party/mosquitto/client/CMakeFiles/progress.marks

-25
+24

build/third_party/mosquitto/lib/CMakeFiles/libmosquitto_static.dir/progress.make

@@ -13,33 +13,33 @@ CMAKE_PROGRESS_12 = 23
 CMAKE_PROGRESS_13 = 
 CMAKE_PROGRESS_14 = 24
 CMAKE_PROGRESS_15 = 
-CMAKE_PROGRESS_16 = 25
-CMAKE_PROGRESS_17 = 
+CMAKE_PROGRESS_16 = 
+CMAKE_PROGRESS_17 = 25
 CMAKE_PROGRESS_18 = 
 CMAKE_PROGRESS_19 = 26
 CMAKE_PROGRESS_20 = 
-CMAKE_PROGRESS_21 = 27
-CMAKE_PROGRESS_22 = 
+CMAKE_PROGRESS_21 = 
+CMAKE_PROGRESS_22 = 27
 CMAKE_PROGRESS_23 = 
 CMAKE_PROGRESS_24 = 28
 CMAKE_PROGRESS_25 = 
-CMAKE_PROGRESS_26 = 29
-CMAKE_PROGRESS_27 = 
+CMAKE_PROGRESS_26 = 
+CMAKE_PROGRESS_27 = 29
 CMAKE_PROGRESS_28 = 
 CMAKE_PROGRESS_29 = 30
 CMAKE_PROGRESS_30 = 
-CMAKE_PROGRESS_31 = 31
-CMAKE_PROGRESS_32 = 
+CMAKE_PROGRESS_31 = 
+CMAKE_PROGRESS_32 = 31
 CMAKE_PROGRESS_33 = 
 CMAKE_PROGRESS_34 = 32
 CMAKE_PROGRESS_35 = 
-CMAKE_PROGRESS_36 = 33
-CMAKE_PROGRESS_37 = 
+CMAKE_PROGRESS_36 = 
+CMAKE_PROGRESS_37 = 33
 CMAKE_PROGRESS_38 = 
 CMAKE_PROGRESS_39 = 34
 CMAKE_PROGRESS_40 = 
-CMAKE_PROGRESS_41 = 35
-CMAKE_PROGRESS_42 = 
+CMAKE_PROGRESS_41 = 
+CMAKE_PROGRESS_42 = 35
 CMAKE_PROGRESS_43 = 
 CMAKE_PROGRESS_44 = 36
 

build/third_party/mosquitto/plugins/CMakeFiles/progress.marks

-6
+7

build/third_party/mosquitto/plugins/dynamic-security/CMakeFiles/mosquitto_dynamic_security.dir/progress.make

 CMAKE_PROGRESS_1 = 83
 CMAKE_PROGRESS_2 = 
-CMAKE_PROGRESS_3 = 
-CMAKE_PROGRESS_4 = 84
+CMAKE_PROGRESS_3 = 84
+CMAKE_PROGRESS_4 = 
 CMAKE_PROGRESS_5 = 
 CMAKE_PROGRESS_6 = 85
 CMAKE_PROGRESS_7 = 
-CMAKE_PROGRESS_8 = 
-CMAKE_PROGRESS_9 = 86
+CMAKE_PROGRESS_8 = 86
+CMAKE_PROGRESS_9 = 
 CMAKE_PROGRESS_10 = 
 CMAKE_PROGRESS_11 = 87
 CMAKE_PROGRESS_12 = 

build/third_party/mosquitto/plugins/message-timestamp/CMakeFiles/mosquitto_message_timestamp.dir/progress.make

-CMAKE_PROGRESS_1 = 
-CMAKE_PROGRESS_2 = 88
+CMAKE_PROGRESS_1 = 88
+CMAKE_PROGRESS_2 = 
 

build/third_party/mosquitto/plugins/payload-modification/CMakeFiles/mosquitto_payload_modification.dir/progress.make

 CMAKE_PROGRESS_1 = 
-CMAKE_PROGRESS_2 = 
+CMAKE_PROGRESS_2 = 92
 

build/third_party/mosquitto/plugins/payload-modification/CMakeFiles/progress.marks

-0
+1

build/third_party/mosquitto/src/CMakeFiles/mosquitto.dir/progress.make

-CMAKE_PROGRESS_1 = 
+CMAKE_PROGRESS_1 = 48
 CMAKE_PROGRESS_2 = 
-CMAKE_PROGRESS_3 = 48
-CMAKE_PROGRESS_4 = 
-CMAKE_PROGRESS_5 = 49
-CMAKE_PROGRESS_6 = 
-CMAKE_PROGRESS_7 = 50
+CMAKE_PROGRESS_3 = 
+CMAKE_PROGRESS_4 = 49
+CMAKE_PROGRESS_5 = 
+CMAKE_PROGRESS_6 = 50
+CMAKE_PROGRESS_7 = 
 CMAKE_PROGRESS_8 = 
-CMAKE_PROGRESS_9 = 
-CMAKE_PROGRESS_10 = 51
-CMAKE_PROGRESS_11 = 
-CMAKE_PROGRESS_12 = 52
+CMAKE_PROGRESS_9 = 51
+CMAKE_PROGRESS_10 = 
+CMAKE_PROGRESS_11 = 52
+CMAKE_PROGRESS_12 = 
 CMAKE_PROGRESS_13 = 
-CMAKE_PROGRESS_14 = 
-CMAKE_PROGRESS_15 = 53
-CMAKE_PROGRESS_16 = 
-CMAKE_PROGRESS_17 = 54
+CMAKE_PROGRESS_14 = 53
+CMAKE_PROGRESS_15 = 
+CMAKE_PROGRESS_16 = 54
+CMAKE_PROGRESS_17 = 
 CMAKE_PROGRESS_18 = 
-CMAKE_PROGRESS_19 = 
-CMAKE_PROGRESS_20 = 55
-CMAKE_PROGRESS_21 = 
-CMAKE_PROGRESS_22 = 56
+CMAKE_PROGRESS_19 = 55
+CMAKE_PROGRESS_20 = 
+CMAKE_PROGRESS_21 = 56
+CMAKE_PROGRESS_22 = 
 CMAKE_PROGRESS_23 = 
-CMAKE_PROGRESS_24 = 
-CMAKE_PROGRESS_25 = 57
-CMAKE_PROGRESS_26 = 
-CMAKE_PROGRESS_27 = 58
+CMAKE_PROGRESS_24 = 57
+CMAKE_PROGRESS_25 = 
+CMAKE_PROGRESS_26 = 58
+CMAKE_PROGRESS_27 = 
 CMAKE_PROGRESS_28 = 
-CMAKE_PROGRESS_29 = 
-CMAKE_PROGRESS_30 = 59
-CMAKE_PROGRESS_31 = 
-CMAKE_PROGRESS_32 = 60
+CMAKE_PROGRESS_29 = 59
+CMAKE_PROGRESS_30 = 
+CMAKE_PROGRESS_31 = 60
+CMAKE_PROGRESS_32 = 
 CMAKE_PROGRESS_33 = 
-CMAKE_PROGRESS_34 = 
-CMAKE_PROGRESS_35 = 61
-CMAKE_PROGRESS_36 = 
-CMAKE_PROGRESS_37 = 62
+CMAKE_PROGRESS_34 = 61
+CMAKE_PROGRESS_35 = 
+CMAKE_PROGRESS_36 = 62
+CMAKE_PROGRESS_37 = 
 CMAKE_PROGRESS_38 = 
-CMAKE_PROGRESS_39 = 
-CMAKE_PROGRESS_40 = 63
-CMAKE_PROGRESS_41 = 
-CMAKE_PROGRESS_42 = 64
+CMAKE_PROGRESS_39 = 63
+CMAKE_PROGRESS_40 = 
+CMAKE_PROGRESS_41 = 64
+CMAKE_PROGRESS_42 = 
 CMAKE_PROGRESS_43 = 
-CMAKE_PROGRESS_44 = 
-CMAKE_PROGRESS_45 = 65
-CMAKE_PROGRESS_46 = 
-CMAKE_PROGRESS_47 = 66
+CMAKE_PROGRESS_44 = 65
+CMAKE_PROGRESS_45 = 
+CMAKE_PROGRESS_46 = 66
+CMAKE_PROGRESS_47 = 
 CMAKE_PROGRESS_48 = 
-CMAKE_PROGRESS_49 = 
-CMAKE_PROGRESS_50 = 67
-CMAKE_PROGRESS_51 = 
-CMAKE_PROGRESS_52 = 68
+CMAKE_PROGRESS_49 = 67
+CMAKE_PROGRESS_50 = 
+CMAKE_PROGRESS_51 = 68
+CMAKE_PROGRESS_52 = 
 CMAKE_PROGRESS_53 = 
-CMAKE_PROGRESS_54 = 
-CMAKE_PROGRESS_55 = 69
-CMAKE_PROGRESS_56 = 
-CMAKE_PROGRESS_57 = 70
+CMAKE_PROGRESS_54 = 69
+CMAKE_PROGRESS_55 = 
+CMAKE_PROGRESS_56 = 70
+CMAKE_PROGRESS_57 = 
 CMAKE_PROGRESS_58 = 
-CMAKE_PROGRESS_59 = 
-CMAKE_PROGRESS_60 = 71
-CMAKE_PROGRESS_61 = 
-CMAKE_PROGRESS_62 = 72
+CMAKE_PROGRESS_59 = 71
+CMAKE_PROGRESS_60 = 
+CMAKE_PROGRESS_61 = 72
+CMAKE_PROGRESS_62 = 
 CMAKE_PROGRESS_63 = 
-CMAKE_PROGRESS_64 = 
-CMAKE_PROGRESS_65 = 73
-CMAKE_PROGRESS_66 = 
-CMAKE_PROGRESS_67 = 74
+CMAKE_PROGRESS_64 = 73
+CMAKE_PROGRESS_65 = 
+CMAKE_PROGRESS_66 = 74
+CMAKE_PROGRESS_67 = 
 CMAKE_PROGRESS_68 = 
 CMAKE_PROGRESS_69 = 75
 CMAKE_PROGRESS_70 = 
-CMAKE_PROGRESS_71 = 
-CMAKE_PROGRESS_72 = 76
+CMAKE_PROGRESS_71 = 76
+CMAKE_PROGRESS_72 = 
 CMAKE_PROGRESS_73 = 
 CMAKE_PROGRESS_74 = 77
 CMAKE_PROGRESS_75 = 

modules/delay/delay.c

@@ -2,14 +2,14 @@
 #include "delay.h"
 
 /*s和ms*/
-void Delay_ms(int msec) {
+void delay_ms(int msec) {
     struct timespec ts;
     ts.tv_sec = 0; // 秒
     ts.tv_nsec = msec*1000000; // 1毫秒 = 1000000纳秒
     nanosleep(&ts,NULL);
 }
 
-void Delay_s(int sec) {
+void delay_s(int sec) {
     struct timespec ts;
     ts.tv_sec = sec; // 秒
     ts.tv_nsec = 0; // 1毫秒 = 1000000纳秒
@@ -17,7 +17,7 @@ void Delay_s(int sec) {
 }
 
 /*us*/
-void Delay_us(int usec) {
+void delay_us(int usec) {
     struct timespec ts;
     ts.tv_nsec = usec*1000; // 1毫秒 = 1000000纳秒
     nanosleep(&ts,NULL);

modules/delay/delay.h

 #ifndef DELAY_H
 #define DELAY_H
 
-void Delay_ms(int msec) ;
+void delay_ms(int msec) ;
 
-void Delay_s(int sec);
+void delay_s(int sec);
 
-void Delay_us(int usec);
+void delay_us(int usec);
 
 #endif
\ No newline at end of file

modules/logger/mylog.c

@@ -22,6 +22,22 @@ const char *c_config_content = "[global]\n"
 
 static zlog_category_t *s_zlog_c = NULL;
 
+int logprject_Init();
+int logconf_create();
+
+int mylog_init(){
+    if(logconf_create() != 0) {
+        my_zlog_fatal( "日志创建失败");
+        return 1;
+    }
+
+    if(logprject_Init() != 0) {
+        my_zlog_fatal( "日志初始化失败");
+        return 2;
+    }
+    my_zlog_info("日志初始化成功");
+    return 0;
+}
 
 /*创建log需要的config文件*/
 int logconf_create() {
@@ -69,6 +85,7 @@ static int create_log_dir_if_not_exist(const char *path) {
     return 0;
 }
 
+/*初始化log*/
 int logprject_Init() {
     int rc;
     zlog_category_t *c;

modules/logger/mylog.h

@@ -2,11 +2,9 @@
 #define MYLOG_H__
 
 
-int logprject_Init();
 void my_log_close();
 
-int logconf_create();
-
+int mylog_init();
 // 封装 zlog_debug
 void my_zlog_debug(const char *format, ...) ;
 // 封装 zlog_info