From ee3c90168f81ce19529904d80f9c9de4fed23bb8 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Tue, 30 Apr 2024 16:30:45 +0800
Subject: [PATCH] 继续完善
---
Soft/system_general_para.h | 67 ++++++++++++++++++++++++++++-----
1 files changed, 57 insertions(+), 10 deletions(-)
diff --git a/Soft/system_general_para.h b/Soft/system_general_para.h
index 77f3ac1..1d48356 100644
--- a/Soft/system_general_para.h
+++ b/Soft/system_general_para.h
@@ -1,6 +1,7 @@
#ifndef _SYSTEM_GENERAL_PARA_H
#define _SYSTEM_GENERAL_PARA_H
#include "define_all.h"
+#include "extern_rtc.h"
/**************************************************
*��Ҫ����һЩͨ�õĺ���������
@@ -38,9 +39,6 @@
DN40_TYPE,
} CALIBER_TYPE; // �ھ�
-
-
-
typedef enum
{
EM_NONE = 0U,
@@ -50,15 +48,50 @@
EM_SIFRCT, //��������Զ�������ն�
} EQUIPMENT_TYPE; // �����ͺ�
-
-
-
-//�������ʹ�С��
typedef enum
{
LITTLE_ENDIAN = 0U,
BIG_ENDIAN
-} BIG_OR_LITTLE_ENDIAN; // ����״̬����
+} BIG_OR_LITTLE_ENDIAN; //�������ʹ�С��
+
+typedef enum
+{
+ FLOW_METER_CONN_NONE = 0U,
+ FLOW_METER_CONN_PULSE,
+ FLOW_METER_CONN_RS485,
+ FLOW_METER_CONN_RS485_AND_PULSE
+} FLOW_METER_CONN_TYPE; //���������ӷ�ʽ
+
+typedef enum
+{
+ BAUDRATE_1200 = 0U,
+ BAUDRATE_2400 ,
+ BAUDRATE_4800 ,
+ BAUDRATE_9600 ,
+ BAUDRATE_19200 ,
+ BAUDRATE_38400 ,
+ BAUDRATE_56000 ,
+ BAUDRATE_57600 ,
+ BAUDRATE_115200
+} BAUDRATE_CODE; //������
+
+typedef enum
+{
+ PARITY_NONE = 0U,
+ PARITY_ODD ,
+ PARITY_EVEN ,
+
+} PARITY_BIT; //������
+
+typedef enum
+{
+ RS485_START_REASON_NONE = 0U, //����������Ҫִ��
+ RS485_START_REASON_KEY , //����
+ RS485_START_REASON_TIMING, //��ʱ
+ RS485_START_REASON_REPORT, //ʵʱ�ϱ���Ҫ
+ RS485_START_REASON_RECORD, //�����¼��Ҫ���������ϱ���������
+
+} RS485_START_REASON; //485����ԭ��
/*****************ͨ�ýṹ�����******************************/
@@ -79,8 +112,20 @@
+typedef struct
+{
+ __IO FlagStatus start_flag; // ����������־
+ __IO FlagStatus running_flag; // ���������б�־
+} FUN_START_CTRL_T; // ��ʱʱ�����ͽṹ��
+typedef struct
+{
+ FUN_START_CTRL_T rs485_ctrl_flag;
+ FUN_START_CTRL_T wrc_ctrl_flag;
+ FUN_START_CTRL_T valve_ctrl_flag;
+
+} FUN_START_CTRL_PARA_T; // ��ʱʱ�����ͽṹ��
/*****************ͨ�ú�******************************/
@@ -166,8 +211,8 @@
//extern uint8_t read_data_buf_C_l[200];
extern __IO FlagStatus sys_run_period; // ϵͳ��������
-extern SYS_DELAY_SEC_PARA_T sys_delay_sec_para_g;
-
+extern SYS_DELAY_SEC_PARA_T sys_delay_sec_para_g; //ϵͳ��ʱ����
+extern FUN_START_CTRL_PARA_T sys_fun_run_ctrl_g; //ϵͳ�������п���
@@ -185,5 +230,7 @@
//unsigned char HEX2BCD(unsigned char hex_data) ; //HEX??BCD???
void dou26Byte( double data, unsigned char *array );
+FlagStatus IntervalTriggerHandle(sClockBCD sys_clockBCD_in,uint16_t IntervalTime,uint8_t IntervalFirstTimeBCD[2]);
+
#endif
--
Gitblit v1.9.3