From 6c7e61a54ef9b96f79704f0b965664e89f57dd52 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Wed, 29 May 2024 17:41:52 +0800
Subject: [PATCH] 增加休眠，开始上板测试
---
Function/WirelessRemoteComm/wrc_sizhu_v4.h | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/Function/WirelessRemoteComm/wrc_sizhu_v4.h b/Function/WirelessRemoteComm/wrc_sizhu_v4.h
index cfaaa21..451a4f1 100644
--- a/Function/WirelessRemoteComm/wrc_sizhu_v4.h
+++ b/Function/WirelessRemoteComm/wrc_sizhu_v4.h
@@ -12,16 +12,18 @@
#define FIRST_DATA_SHIFT_SIZHU sizeof(SIZHU_V4_PROTOCOL_HEAD_T)//26
-#define FRAME_DATA_MAX 4 //һ֡��������������������
+#define ONCE_REPORT_MAX_NUM 360 //����һ���ϱ�����ϱ������� 15��*24��
+#define FRAME_DATA_MAX 6 //һ֡��������������������
#define DATA_PACKET_HEAD_LENGTH sizeof(SIZHU_V4_PROTOCOL_NORMAL_DATA_HEAD_T)
#define DATA_PACKET_LENGTH sizeof(SIZHU_V4_PROTOCOL_NORMAL_DATA_PACK_T)
+#define FRAME_TAIL_LENGTH sizeof(SIZHU_V4_PROTOCOL_TAIL_T)
///////////////�������/////////////////////////////////////////////////////////////////////
//ҵ��
#define SIZHU_CONTROL_CODE_DATAUP 0x0101
#define SIZHU_CONTROL_CODE_END 0x0102
#define SIZHU_CONTROL_CODE_MODIFY_KEY 0x0103
-#define SIZHU_CONTROL_CODE_PUSH_TERMINAL_INFO 0x0104
+#define SIZHU_CONTROL_CODE_PUSH_SETTLEMENT_INFO 0x0104
//����
#define SIZHU_CONTROL_CODE_ACCOUNT_STATUS 0x0201
@@ -98,7 +100,7 @@
uint8_t net_info; // ������Ϣ
uint8_t software_version[4]; // ����汾��
uint8_t account_state; // ����״̬
- uint16_t alarm_word[14]; // ������
+ uint16_t alarm_word[7]; // ������
uint16_t valve_close_reason; // �ط�ԭ����
uint8_t reserve[8]; // ����
uint8_t data_package_format; // ���ݰ���ʽ
@@ -121,16 +123,25 @@
int8_t lith_vcc_per; // ﮵�ص�ѹ�ٷֱ�
uint8_t alka_vcc; // ���ص�ѹ
int8_t alka_vcc_per; // ���ص�ѹ�ٷֱ�
- uint16_t status[12]; // ״̬��
+ uint16_t status[6]; // ״̬��
//uint8_t reserved[40];
} SIZHU_V4_PROTOCOL_NORMAL_DATA_PACK_T;
-
+typedef struct
+{
+ uint16_t current_report_data_num; //��ǰԶ����������������һ֡������
+ uint16_t last_frame_data_num; //���һ֡����
+ uint32_t report_data_read_addr; //���ݶ�ȡ��ַ
+
+}SIZHU_V4_REPORT_CTRL_PARA_T;
#pragma pack()
-void SizhuV4SendParaInit(void);
+extern ErrorStatus wrc_sizhuV4_result_flag; //���յ�ͨѶ����жϣ���ʼ��FAIL�����ո���Э��ȷ�ϱ���ͨѶ�Ƿ�ɹ�������˼����Э��ͨ������֡�ж��Ƿ����ճɹ�
+extern ErrorStatus report_sizhuV4_result_flag; //�ϱ��Ƿ�ɹ���־������һ��֮����û���ϴ��ɹ�������wrc_sizhuV4_result_flagͨѶ�Ƿ�ɹ���һ��������һ�㣬ֻҪ�����ϱ���Ӧ�ɹ��������ϱ��ɹ����յ�����֡Ҳ����ɹ���
-WRC_STATUS SizhuV4ProtocolDataAnalysis(uint8_t *receive_buf);
+void SizhuV4SendParaInit(void);
+uint16_t SizhuV4SendNormalData2buf(uint8_t * send_buf);
+WRC_STATUS SizhuV4ProtocolDataAnalysis(uint8_t *receive_buf,uint8_t *ack_buf,uint16_t *ack_buf_length);
#endif
--
Gitblit v1.9.3