From a78de66c478e9268f752e7b38e0acd3d27637eb6 Mon Sep 17 00:00:00 2001 From: rtrimana Date: Thu, 8 Aug 2019 09:47:46 -0700 Subject: [PATCH] Adding events to emulate values above and below thresholds. --- Extractor/ExtractorScript.py | 11 +++++++++-- eventSimulator/humidityHighMeasurementEvent.groovy | 2 ++ eventSimulator/humidityLowMeasurementEvent.groovy | 2 ++ 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 eventSimulator/humidityHighMeasurementEvent.groovy create mode 100644 eventSimulator/humidityLowMeasurementEvent.groovy diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py index b274e4d..fb03c70 100644 --- a/Extractor/ExtractorScript.py +++ b/Extractor/ExtractorScript.py @@ -48,7 +48,7 @@ eventTypeCounterMap = {'lock': 2, 'energy' : 1, 'power' : 2, 'illuminance' : 1, - 'humidity' : 1, + 'humidity' : 2, 'alarm' : 4, 'contact' : 2, 'status' : 3, @@ -820,7 +820,14 @@ def ExtractEvents(extractedEvents): extractedEvents.write(line) event.close() elif eventList[i] == "humidity": - event = open("eventSimulator/humidityMeasurementEvent.groovy", "r") + event = open("eventSimulator/humidityHighMeasurementEvent.groovy", "r") + for line in event: + extractedEvents.write(line) + event.close() + extractedEvents.write("\n\t\t\tbreak\n") + counter = counter + 1 + extractedEvents.write("\t\tcase %d:\n" % counter) + event = open("eventSimulator/humidityLowMeasurementEvent.groovy", "r") for line in event: extractedEvents.write(line) event.close() diff --git a/eventSimulator/humidityHighMeasurementEvent.groovy b/eventSimulator/humidityHighMeasurementEvent.groovy new file mode 100644 index 0000000..bcfe170 --- /dev/null +++ b/eventSimulator/humidityHighMeasurementEvent.groovy @@ -0,0 +1,2 @@ + humidityMeasurementObject.setValue([name: "humidity", value: "70"/*A number between 0 to 100 as a charge*/, deviceId: "humidityMeasurementID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}']) diff --git a/eventSimulator/humidityLowMeasurementEvent.groovy b/eventSimulator/humidityLowMeasurementEvent.groovy new file mode 100644 index 0000000..4692c5d --- /dev/null +++ b/eventSimulator/humidityLowMeasurementEvent.groovy @@ -0,0 +1,2 @@ + humidityMeasurementObject.setValue([name: "humidity", value: "30"/*A number between 0 to 100 as a charge*/, deviceId: "humidityMeasurementID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}']) -- 2.34.1