From 08b3909c40a192778719c6262bbee4745682948d Mon Sep 17 00:00:00 2001 From: jinlicong <493886250@qq.com> Date: Fri, 31 May 2024 19:15:47 +0800 Subject: [PATCH] 测试和修改了一些功能bug --- Function/WirelessRemoteComm/wrc_sizhu_v4.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Function/WirelessRemoteComm/wrc_sizhu_v4.h b/Function/WirelessRemoteComm/wrc_sizhu_v4.h index e4f0208..451a4f1 100644 --- a/Function/WirelessRemoteComm/wrc_sizhu_v4.h +++ b/Function/WirelessRemoteComm/wrc_sizhu_v4.h @@ -23,7 +23,7 @@ #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 @@ -100,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; // ���ݰ���ʽ @@ -123,7 +123,7 @@ 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; @@ -138,7 +138,7 @@ #pragma pack() extern ErrorStatus wrc_sizhuV4_result_flag; //���յ�ͨѶ����жϣ���ʼ��FAIL�����ո���Э��ȷ�ϱ���ͨѶ�Ƿ�ɹ�������˼����Э��ͨ������֡�ж��Ƿ����ճɹ� - +extern ErrorStatus report_sizhuV4_result_flag; //�ϱ��Ƿ�ɹ���־������һ��֮����û���ϴ��ɹ�������wrc_sizhuV4_result_flagͨѶ�Ƿ�ɹ���һ��������һ�㣬ֻҪ�����ϱ���Ӧ�ɹ��������ϱ��ɹ����յ�����֡Ҳ����ɹ��� void SizhuV4SendParaInit(void); uint16_t SizhuV4SendNormalData2buf(uint8_t * send_buf); -- Gitblit v1.9.3