From 7542ba3a134da697a8a82d0f7aa4e8c28783cb7d Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 11 一月 2021 14:07:14 +0800
Subject: [PATCH] 2021-1-11-1
---
HDL_ON/Entity/Function/Sensor.cs | 31 ++++---------------------------
1 files changed, 4 insertions(+), 27 deletions(-)
diff --git a/HDL_ON/Entity/Function/Sensor.cs b/HDL_ON/Entity/Function/Sensor.cs
index 0141474..17475e4 100644
--- a/HDL_ON/Entity/Function/Sensor.cs
+++ b/HDL_ON/Entity/Function/Sensor.cs
@@ -62,36 +62,13 @@
};
trait_values.curValue = trait_values.min;
}
-#if DEBUG1
- //if ( Convert.ToInt32(trait_values.value) == 0)
- {
- double level = 1;
- Random random = new Random();
- switch (functionType)
- {
- case FunctionType.PM25:
- level = Math.Round(random.NextDouble() * 130, 0);
- break;
- case FunctionType.CO2:
- level = Math.Round(random.NextDouble() * 6000, 0);
- break;
- case FunctionType.Temp:
- level = Math.Round(random.NextDouble() * 40, 0);
- break;
- case FunctionType.TVOC:
- level = Math.Round(random.NextDouble() * 10, 1);
- break;
- case FunctionType.Humidity:
- level = Math.Round(random.NextDouble() * 100, 0);
- break;
- }
- trait_values.curValue = level;
- }
-#endif
-
}
if (trait_values.curValue.ToString() == "{}")
trait_values.curValue = 0;
+ if(spk == SPK.SensorTVOC)
+ {
+ return Convert.ToDouble(trait_values.curValue.ToString()) / 100000;
+ }
return Convert.ToDouble(trait_values.curValue);
}
set
--
Gitblit v1.8.0