From ba13bc15506c98e90dee462c47988cdc410b15ce Mon Sep 17 00:00:00 2001 From: "Mariel V. Tatel" <mariel.tatel@eee.upd.edu.ph> Date: Tue, 27 Jun 2023 01:01:07 +0800 Subject: [PATCH] Edited the range for random values --- .../demo_app/apps/onem2m/aqm/care-ipe-http-final.py | 4 ++-- .../demo_app/apps/onem2m/aqm/care-ipe-mqtt-final.py | 4 ++-- .../apps/onem2m/smart_farm/spice-ipe-http-final.py | 12 ++++++------ .../apps/onem2m/smart_farm/spice-ipe-mqtt-final.py | 12 ++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/OpenMTC/care_app/demo_app/apps/onem2m/aqm/care-ipe-http-final.py b/OpenMTC/care_app/demo_app/apps/onem2m/aqm/care-ipe-http-final.py index c35d3c4..d6d1d0e 100644 --- a/OpenMTC/care_app/demo_app/apps/onem2m/aqm/care-ipe-http-final.py +++ b/OpenMTC/care_app/demo_app/apps/onem2m/aqm/care-ipe-http-final.py @@ -154,8 +154,8 @@ class IPE(XAE): self.get_sensor_data() - if self.pm25_in >= 100: - if self.pm25_out >= 100: + if self.pm25_in >= 80: + if self.pm25_out >= 80: if self.window_actuation == self.window_OPEN: print("\nPLEASE ACTUATE: Close the window\n") time.sleep(5) diff --git a/OpenMTC/care_app/demo_app/apps/onem2m/aqm/care-ipe-mqtt-final.py b/OpenMTC/care_app/demo_app/apps/onem2m/aqm/care-ipe-mqtt-final.py index 0f16706..99d4ce3 100644 --- a/OpenMTC/care_app/demo_app/apps/onem2m/aqm/care-ipe-mqtt-final.py +++ b/OpenMTC/care_app/demo_app/apps/onem2m/aqm/care-ipe-mqtt-final.py @@ -147,8 +147,8 @@ class IPE(XAE): self.get_sensor_data() - if self.pm25_in >= 100: - if self.pm25_out >= 100: + if self.pm25_in >= 80: + if self.pm25_out >= 80: if self.window_actuation == self.window_OPEN: print("\nPLEASE ACTUATE: Close the window\n") time.sleep(5) diff --git a/OpenMTC/care_app/demo_app/apps/onem2m/smart_farm/spice-ipe-http-final.py b/OpenMTC/care_app/demo_app/apps/onem2m/smart_farm/spice-ipe-http-final.py index 7443281..fefa349 100644 --- a/OpenMTC/care_app/demo_app/apps/onem2m/smart_farm/spice-ipe-http-final.py +++ b/OpenMTC/care_app/demo_app/apps/onem2m/smart_farm/spice-ipe-http-final.py @@ -37,13 +37,13 @@ class IPE(XAE): # offset = minimum value # range = max - min - # Humidity: 40% to 90% - humi_range = 50 + # Humidity: 40% to 70% + humi_range = 30 humi_offset = 40 - # Temperature: 30degC to 50degC - temp_range = 20 - temp_offset = 30 + # Temperature: 20degC to 30degC + temp_range = 10 + temp_offset = 20 # pH value: 5.5 to 7.5 pH_range = 20 @@ -378,7 +378,7 @@ class IPE(XAE): data = { 'value': value, 'type': 'electric conductivity', - 'unit': 'uS/cm', + 'unit': 'mS/cm', 'time': time } diff --git a/OpenMTC/care_app/demo_app/apps/onem2m/smart_farm/spice-ipe-mqtt-final.py b/OpenMTC/care_app/demo_app/apps/onem2m/smart_farm/spice-ipe-mqtt-final.py index ef15324..c01ef2c 100644 --- a/OpenMTC/care_app/demo_app/apps/onem2m/smart_farm/spice-ipe-mqtt-final.py +++ b/OpenMTC/care_app/demo_app/apps/onem2m/smart_farm/spice-ipe-mqtt-final.py @@ -39,13 +39,13 @@ class IPE(XAE): # offset = minimum value # range = max - min - # Humidity: 40% to 90% - humi_range = 50 + # Humidity: 40% to 70% + humi_range = 30 humi_offset = 40 - # Temperature: 30degC to 50degC - temp_range = 20 - temp_offset = 30 + # Temperature: 20degC to 30degC + temp_range = 10 + temp_offset = 20 # pH value: 5.5 to 7.5 pH_range = 20 @@ -334,7 +334,7 @@ class IPE(XAE): data = { 'value': value, 'type': 'electric conductivity', - 'unit': 'uS/cm', + 'unit': 'mS/cm', 'time': time } elif sensor.startswith('MotorSensor'): -- GitLab