From a1810b89e66f184c62a0588ae7d57c91d0c376e8 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Thu, 30 May 2024 20:06:09 +0800
Subject: [PATCH] 继续测试修改
---
Soft/sizhu_ctrl_word.h | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/Soft/sizhu_ctrl_word.h b/Soft/sizhu_ctrl_word.h
index 8f7f138..bfc24c9 100644
--- a/Soft/sizhu_ctrl_word.h
+++ b/Soft/sizhu_ctrl_word.h
@@ -335,9 +335,9 @@
uint16_t calibration_mode: 1;
uint16_t account_open: 1;
uint16_t : 2;
- uint16_t show_balance : 1;
- uint16_t show_price: 1;
- uint16_t show_logo : 1;
+ uint16_t no_show_balance : 1;
+ uint16_t no_show_price: 1;
+ uint16_t no_show_logo : 1;
uint16_t : 3;
uint16_t billing_type: 2;
@@ -476,6 +476,12 @@
/*********************************�ط����������**************************************/
+//�ط�������2λ��־λ����
+#define VALVE_CTRL_FLAG_NONE 0x00
+#define VALVE_CTRL_FLAG_ONLY_CLSOSE 0x01
+#define VALVE_CTRL_FLAG_LOCK_AND_CLSOSE 0x03
+
+//�ط������ֽṹ�嶨��
typedef struct
{
uint16_t gprs_cmd_need_close_valve_flag : 1; // Զ������
@@ -774,7 +780,7 @@
extern SYSTEM_STATUS_WORD_T system_status_word_g;
extern SYSTEM_FUNCTION_CTRL_WORD_T system_function_ctrl_word_g;
extern SYSTEM_ALARM_WORD_T system_alarm_word_g;
-extern SYSTEM_ALARM_WORD_T system_alarm_word_for_valve_g; //���ڷ��أ��ϱ������
+extern SYSTEM_ALARM_WORD_T system_alarm_word_for_valve_g; //���ڷ��أ��ж��귧��֮������
extern SYSTEM_ALARM_CTRL_WORD_T system_alarm_ctrl_word_g;
extern SYSTEM_ALARM_REPORT_CTRL_WORD_T system_alarm_report_ctrl_word_g;
extern VALVE_CTL_BYTES_UNION_T valve_ctl_bytes_g;
--
Gitblit v1.9.3