diff --git a/Core/Src/main.c b/Core/Src/main.c
index fd03730..92f7e1b 100644
--- a/Core/Src/main.c
+++ b/Core/Src/main.c
@@ -126,14 +126,14 @@ int main(void)
ee_io_init();
prov_init(); //比例阀初始化
- ee_readbytes(ch395_addr,0,14);
- for(int n = 0;n < 12;n++)
- {
- HoldReg[40 + n] = ch395_addr[n];
- }
- HoldReg[52] = ch395_addr[12] << 8 | ch395_addr[13];
- ch395_hardware_init(); //ch395硬件初始化
- ch395_init(); //以太网初始化
+ // ee_readbytes(ch395_addr,0,14);
+ // for(int n = 0;n < 12;n++)
+ // {
+ // HoldReg[40 + n] = ch395_addr[n];
+ // }
+ // HoldReg[52] = ch395_addr[12] << 8 | ch395_addr[13];
+ // ch395_hardware_init(); //ch395硬件初始化
+ // ch395_init(); //以太网初始化
/* USER CODE END 2 */
diff --git a/MDK-ARM/VOQC.uvoptx b/MDK-ARM/VOQC.uvoptx
index fccc5ac..32d6198 100644
--- a/MDK-ARM/VOQC.uvoptx
+++ b/MDK-ARM/VOQC.uvoptx
@@ -208,7 +208,11 @@
10
1
+<<<<<<< HEAD
+ tx_start
+=======
g_ch395q_sta.socket[0].config
+>>>>>>> 694c8a2a7149125de63428eb48d859c6a7ca06cf
diff --git a/modbus/Inc/modbus.h b/modbus/Inc/modbus.h
index 893e211..3c674e5 100644
--- a/modbus/Inc/modbus.h
+++ b/modbus/Inc/modbus.h
@@ -6,16 +6,16 @@
#include "uarts.h"
#include "ch395.h"
-/*--------------------------------- 宏定义 -----------------------------------*/
-//功能码
-#define ReadCoilState 0x01 //读取线圈状态
-#define ReadDisInputState 0x02 //读取输入状态
-#define ReadHoldReg 0x03 //读取保持寄存器
-#define ReadInputReg 0x04 //读取输入寄存器
-#define WriteSingleCoil 0x05 //强制写单线圈输出状态
-#define WriteSingleReg 0x06 //预设(写)单寄存器
-#define WriteMultiCoil 0x0F //强制写多线圈输出状态
-#define WriteMultiReg 0x10 //预设(写)多寄存器
+/*--------------------------------- 瀹忓畾涔 -----------------------------------*/
+//鍔熻兘鐮
+#define ReadCoilState 0x01 //璇诲彇绾垮湀鐘舵
+#define ReadDisInputState 0x02 //璇诲彇杈撳叆鐘舵
+#define ReadHoldReg 0x03 //璇诲彇淇濇寔瀵勫瓨鍣
+#define ReadInputReg 0x04 //璇诲彇杈撳叆瀵勫瓨鍣
+#define WriteSingleCoil 0x05 //寮哄埗鍐欏崟绾垮湀杈撳嚭鐘舵
+#define WriteSingleReg 0x06 //棰勮(鍐)鍗曞瘎瀛樺櫒
+#define WriteMultiCoil 0x0F //寮哄埗鍐欏绾垮湀杈撳嚭鐘舵
+#define WriteMultiReg 0x10 //棰勮(鍐)澶氬瘎瀛樺櫒
#define COIL_ADD_MIN 0x10
#define COIL_ADD_MAX 0x5F
@@ -38,14 +38,14 @@
#define MAKEWORD(a,b) ((uint16_t)(((uint8_t)(a)) | ((uint16_t)((uint8_t)(b))) << 8))
-//串口相关定义
-#define UART1_RXSIZE 1024 //一帧接收数据的最大值
-#define UART1_TXSIZE 1024 //一帧发送数据的最大值
+//涓插彛鐩稿叧瀹氫箟
+#define UART1_RXSIZE 1024 //涓甯ф帴鏀舵暟鎹殑鏈澶у
+#define UART1_TXSIZE 1024 //涓甯у彂閫佹暟鎹殑鏈澶у
#define MAX_SIZE 1024
-#define MODBUS_UART uart1 //将串口改成相应的变量即可，例如用到UART1，此处改为uart1
-#define MODBUS_HUART huart1 //将串口改成相应的变量即可，例如用到UART1，此处改为huart1
-#define MODBUS_HTIM htim7 //将串口改成相应的变量即可，例如用到UART1，此处改为huart1
+#define MODBUS_UART uart1 //灏嗕覆鍙ｆ敼鎴愮浉搴旂殑鍙橀噺鍗冲彲锛屼緥濡傜敤鍒癠ART1锛屾澶勬敼涓簎art1
+#define MODBUS_HUART huart1 //灏嗕覆鍙ｆ敼鎴愮浉搴旂殑鍙橀噺鍗冲彲锛屼緥濡傜敤鍒癠ART1锛屾澶勬敼涓篽uart1
+#define MODBUS_HTIM htim7 //灏嗕覆鍙ｆ敼鎴愮浉搴旂殑鍙橀噺鍗冲彲锛屼緥濡傜敤鍒癠ART1锛屾澶勬敼涓篽uart1
typedef enum
{
@@ -63,24 +63,24 @@ typedef enum
typedef union var_reg
{
- uint16_t SamData [MAX_INPUT_REG_NUM]; // 采样数据
- uint16_t InputReg[MAX_INPUT_REG_NUM]; // Reg 与 SamData
+ uint16_t SamData [MAX_INPUT_REG_NUM]; // 閲囨牱鏁版嵁
+ uint16_t InputReg[MAX_INPUT_REG_NUM]; // Reg 涓 SamData
}Var_Reg;
typedef struct
{
- uint8_t *rx_buf; //接收缓冲数组
- uint16_t rx_buf_cnt; //接收缓冲计数值
- uint16_t rx_size; //接收数据大小
- uint8_t rx_flag; //接收完成标志位
+ uint8_t *rx_buf; //鎺ユ敹缂撳啿鏁扮粍
+ uint16_t rx_buf_cnt; //鎺ユ敹缂撳啿璁℃暟鍊
+ uint16_t rx_size; //鎺ユ敹鏁版嵁澶у皬
+ uint8_t rx_flag; //鎺ユ敹瀹屾垚鏍囧織浣
- uint8_t *tx_buf; //发送缓冲数组
- uint16_t tx_buf_cnt; //发送缓冲计数值
- uint16_t tx_size; //实际发送数据大小
+ uint8_t *tx_buf; //鍙戦佺紦鍐叉暟缁
+ uint16_t tx_buf_cnt; //鍙戦佺紦鍐茶鏁板
+ uint16_t tx_size; //瀹為檯鍙戦佹暟鎹ぇ灏
}UART_BUF;
-extern UART_BUF uart1; //串口结构体实体
-extern uint8_t RxBuffer; //接收数据中间变量
+extern UART_BUF uart1; //涓插彛缁撴瀯浣撳疄浣
+extern uint8_t RxBuffer; //鎺ユ敹鏁版嵁涓棿鍙橀噺
extern uint8_t CoilState[(MAX_COIL_NUM + 7) / 8];
extern uint8_t DisState [(MAX_DIS_NUM + 7) / 8];
@@ -89,7 +89,7 @@ extern uint16_t HoldReg[MAX_HOLD_REG_NUM];
extern Var_Reg SamVarReg;
-void modbus_rtu_init(void);//RTU初始化
+void modbus_rtu_init(void);//RTU鍒濆鍖
void modbus_rx_cb(void);
uint16_t ModbusCRC16(uint8_t *ptr, uint16_t len);