From bf9d6a823b273dacbc93c29cc17906f222d8a573 Mon Sep 17 00:00:00 2001
From: wangk <2865709459@qq.com>
Date: Thu, 21 Nov 2024 09:11:11 +0800
Subject: [PATCH] [Add] #define
---
CMakeLists.txt | 3 +--
drv/drv_4g.h | 4 ++++
drv/drv_can.h | 6 ++++++
kit/kit_mqtt.c | 0
kit/kit_mqtt.h | 0
test/test.c | 1 +
6 files changed, 12 insertions(+), 2 deletions(-)
create mode 100644 kit/kit_mqtt.c
create mode 100644 kit/kit_mqtt.h
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 251780f..d956f7e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ set(CMAKE_BUILD_TYPE "Debug")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
# 设置一个字符串变量,用与编译文件名称生成
-set(ProjectName "EMS_C_V1.0.0")
+set(ProjectName "EMS_C_V")
project(${ProjectName})
@@ -26,7 +26,6 @@ include_directories(
${PROJECT_SOURCE_DIR}/drv
${PROJECT_SOURCE_DIR}/lib
${PROJECT_SOURCE_DIR}/model
-
${PROJECT_SOURCE_DIR}/test
)
diff --git a/drv/drv_4g.h b/drv/drv_4g.h
index bc2e63c..68e33b4 100644
--- a/drv/drv_4g.h
+++ b/drv/drv_4g.h
@@ -16,6 +16,10 @@
#include <pthread.h>
#include <sys/ioctl.h>
+#define INTERFACE "usb0"
+#define SERVER_ADDR "47.120.14.45"
+#define PORT 3001
+
void client(char interface[], char server_addr[], int server_port);
#endif
diff --git a/drv/drv_can.h b/drv/drv_can.h
index 331fa2c..ed45edd 100644
--- a/drv/drv_can.h
+++ b/drv/drv_can.h
@@ -12,6 +12,12 @@
#include <arpa/inet.h>
#include <net/if.h>
+#define CANNUM_RECV "can0"
+#define CANNUM_SEND "can1"
+#define CANIDNUM 3
+#define CANDLC_RECV 8
+#define CANDLC_SEND 8
+
void can_recv(char cannum[], unsigned int canID[], int canIDnum, int dataLength);
void can_send(char cannum[], unsigned int canID, char* dataToSend, int dataLength);
diff --git a/kit/kit_mqtt.c b/kit/kit_mqtt.c
new file mode 100644
index 0000000..e69de29
diff --git a/kit/kit_mqtt.h b/kit/kit_mqtt.h
new file mode 100644
index 0000000..e69de29
diff --git a/test/test.c b/test/test.c
index 3b29277..704131d 100644
--- a/test/test.c
+++ b/test/test.c
@@ -8,6 +8,7 @@
#include "drv_uart.h"
#include "drv_can.h"
#include "drv_tcp.h"
+#include "drv_4g.h"
void runTest()
{