From e5ec6ffc2fa0c07785c9d797c3fd74fd3031059f Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Thu, 23 May 2024 20:06:25 +0800
Subject: [PATCH] 加了几个远传接收数据处理
---
Soft/sizhu_ctrl_word.h | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Soft/sizhu_ctrl_word.h b/Soft/sizhu_ctrl_word.h
index 61fc803..f9db924 100644
--- a/Soft/sizhu_ctrl_word.h
+++ b/Soft/sizhu_ctrl_word.h
@@ -27,7 +27,7 @@
#define __SYS_STATUS_ALARM_BYTES_SET(__HANDLE__,__ID__) \
do \
{ \
- if (__SYS_STATUS_BYTES_GET(__HANDLE__) != SET){ \
+ if ((__SYS_STATUS_BYTES_GET(__HANDLE__) != SET)&&(__SYS_ALARM_CTL_BYTES_GET(__HANDLE__))){ \
system_status_word_g.status_word.__HANDLE__ = \
system_alarm_word_for_valve_g.alarm_word.__HANDLE__ = SET; \
if(__SYS_ALARM_REPORT_CTL_BYTES_GET(__HANDLE__) ==SET){ \
@@ -192,7 +192,7 @@
uint16_t : 1;
uint16_t account_state : 1;
uint16_t flow_direction : 1;
- uint16_t : 2;
+ uint16_t work_mode :2;
uint16_t : 1; // Ԥ��
uint16_t power_state : 1;
uint16_t : 1;
@@ -321,7 +321,7 @@
uint16_t show_price: 1;
uint16_t show_logo : 1;
uint16_t : 3;
- uint16_t billing_mode: 2;
+ uint16_t billing_type: 2;
uint16_t : 16;
}SYSTEM_FUN_CTRL_WORD_T;
--
Gitblit v1.9.3