From 0a5bc1d574adce254becfd3f598f505fbfbe27c3 Mon Sep 17 00:00:00 2001
From: congmu <congmu2024@163.com>
Date: 星期六, 02 十一月 2024 13:53:25 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025
---
common.h | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/common.h b/common.h
index 664c4bd..f334c31 100644
--- a/common.h
+++ b/common.h
@@ -561,10 +561,11 @@
// 璀︽姤璇锋眰缁撴瀯浣�
struct WarningReq {
Head head;
- float oxygen; // 姘ф皵娴撳害
- float carbon; // 涓�姘у寲纰虫祿搴�
- float temp; // 娓╁害
- float humidity; // 婀垮害
+
+ float oxygenWarning;
+ float carbonWarning;
+ float tempWarning;
+ float humidityWarning;
WarningReq() {
head.type = WARNING_REQ;
@@ -572,6 +573,22 @@
}
};
+
+struct DataThreshold{
+ //闃堝��
+ float oxygenThreshold;
+ float carbonThreshold;
+ float tempThreshold;
+ float humidityThreshold;
+};
+
+struct Data{
+ float oxygen; // 姘ф皵娴撳害
+ float carbon; // 涓�姘у寲纰虫祿搴�
+ float temp; // 娓╁害
+ float humidity; // 婀垮害
+};
+
// 璀︽姤鍝嶅簲缁撴瀯浣�
struct WarningRes {
Head head;
--
Gitblit v1.8.0