From 22fcd0d263770c8371bd03ca53f097a6ec1678f7 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 24 十二月 2020 12:06:26 +0800
Subject: [PATCH] 20201224-2
---
HDL_ON/Entity/Function/Sensor.cs | 33 ++++++---------------------------
1 files changed, 6 insertions(+), 27 deletions(-)
diff --git a/HDL_ON/Entity/Function/Sensor.cs b/HDL_ON/Entity/Function/Sensor.cs
index 3244716..17475e4 100644
--- a/HDL_ON/Entity/Function/Sensor.cs
+++ b/HDL_ON/Entity/Function/Sensor.cs
@@ -62,33 +62,12 @@
};
trait_values.curValue = trait_values.min;
}
-#if DEBUG
- //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);
}
--
Gitblit v1.8.0