From 86c861ff59c870277d034de77d6cef2a4c6f5aa4 Mon Sep 17 00:00:00 2001 From: amiraj Date: Mon, 29 Jul 2019 14:15:22 -0700 Subject: [PATCH] Infrastructure that works for all the locks' group! --- Battery/Batteries.groovy | 3 -- .../CarbonMonoxideDetectors.groovy | 4 -- ColorControl/ColorControls.groovy | 13 ----- DoorControl/DoorControls.groovy | 4 -- EnergyMeter/EnergyMeters.groovy | 7 --- Extractor/Extractor.groovy | 7 --- Extractor/ExtractorScript.py | 9 ---- .../GlobalVariablesBothApps.groovy | 3 -- Methods/eventHandler.groovy | 8 ---- ModelCheck.py | 8 ---- MusicPlayer/MusicPlayers.groovy | 29 ------------ Runner.py | 5 -- Switch/Switches.groovy | 13 ----- Thermostat/Thermostats.groovy | 4 -- .../acfanheaterSwitchesAppList | 3 -- appLists/device-interaction/alarmsAppList | 4 -- .../device-interaction/cameraSwitchesAppList | 2 - appLists/device-interaction/camerasAppList | 3 -- appLists/device-interaction/hueLightsAppList | 13 ----- .../device-interaction/lightSwitchesAppList | 32 ------------- appLists/device-interaction/locksAppList | 21 --------- .../device-interaction/musicPlayersAppList | 5 -- .../device-interaction/nonHueLightsAppList | 11 ----- .../device-interaction/relaySwitchesAppList | 5 -- appLists/device-interaction/speechesAppList | 3 -- appLists/device-interaction/switchesAppList | 24 ---------- .../device-interaction/thermostatsAppList | 19 -------- appLists/device-interaction/valvesAppList | 7 --- .../device-interaction/ventfanSwitchesAppList | 3 -- .../globalstatevariableAppList | 47 ------------------- .../illuminancesensorAppList | 5 -- appLists/physical-interaction/lightAppList | 42 ----------------- appLists/physical-interaction/motionAppList | 2 - .../physical-interaction/motionsensorAppList | 37 --------------- appLists/physical-interaction/soundAppList | 23 --------- .../physical-interaction/soundsensorAppList | 1 - .../physical-interaction/watersensorAppList | 11 ----- .../physical-interaction/watervalveAppList | 2 - eventSimulator/accelerationActiveEvent.groovy | 4 -- .../accelerationInactiveEvent.groovy | 4 -- eventSimulator/beaconLeftEvent.groovy | 5 -- eventSimulator/beaconPresentEvent.groovy | 5 -- .../carbonMonoxideClearEvent.groovy | 4 -- .../carbonMonoxideDetectedEvent.groovy | 4 -- .../carbonMonoxideTestedEvent.groovy | 4 -- eventSimulator/colorChangedEvent.groovy | 4 -- eventSimulator/hueChangedEvent.groovy | 4 -- eventSimulator/saturationChangedEvent.groovy | 4 -- .../smokeCarbonMonoxideClearEvent.groovy | 4 -- .../smokeCarbonMonoxideDetectedEvent.groovy | 4 -- .../smokeCarbonMonoxideTestedEvent.groovy | 4 -- run.sh | 10 +--- 52 files changed, 1 insertion(+), 505 deletions(-) delete mode 100644 appLists/device-interaction/acfanheaterSwitchesAppList delete mode 100644 appLists/device-interaction/alarmsAppList delete mode 100644 appLists/device-interaction/cameraSwitchesAppList delete mode 100644 appLists/device-interaction/camerasAppList delete mode 100644 appLists/device-interaction/hueLightsAppList delete mode 100644 appLists/device-interaction/lightSwitchesAppList delete mode 100644 appLists/device-interaction/locksAppList delete mode 100644 appLists/device-interaction/musicPlayersAppList delete mode 100644 appLists/device-interaction/nonHueLightsAppList delete mode 100644 appLists/device-interaction/relaySwitchesAppList delete mode 100644 appLists/device-interaction/speechesAppList delete mode 100644 appLists/device-interaction/switchesAppList delete mode 100644 appLists/device-interaction/thermostatsAppList delete mode 100644 appLists/device-interaction/valvesAppList delete mode 100644 appLists/device-interaction/ventfanSwitchesAppList delete mode 100644 appLists/global-state-variable-interaction/globalstatevariableAppList delete mode 100644 appLists/physical-interaction/illuminancesensorAppList delete mode 100644 appLists/physical-interaction/lightAppList delete mode 100644 appLists/physical-interaction/motionAppList delete mode 100644 appLists/physical-interaction/motionsensorAppList delete mode 100644 appLists/physical-interaction/soundAppList delete mode 100644 appLists/physical-interaction/soundsensorAppList delete mode 100644 appLists/physical-interaction/watersensorAppList delete mode 100644 appLists/physical-interaction/watervalveAppList diff --git a/Battery/Batteries.groovy b/Battery/Batteries.groovy index 4664fb9..8aca5e2 100644 --- a/Battery/Batteries.groovy +++ b/Battery/Batteries.groovy @@ -22,9 +22,6 @@ public class Batteries { this.sendEvent = sendEvent this.deviceNumbers = deviceNumbers this.batteries = [] - - def init = Verify.getIntFromList(30, 50, 70) - this.battery = init def init = Verify.getIntFromList(30, 50, 70) this.battery = init diff --git a/CarbonMonoxideDetector/CarbonMonoxideDetectors.groovy b/CarbonMonoxideDetector/CarbonMonoxideDetectors.groovy index d61bc59..2eb9d74 100644 --- a/CarbonMonoxideDetector/CarbonMonoxideDetectors.groovy +++ b/CarbonMonoxideDetector/CarbonMonoxideDetectors.groovy @@ -35,11 +35,7 @@ public class CarbonMonoxideDetectors { this.carbonMonoxide = "tested" this.carbonMonoxideLatestValue = "tested" } -<<<<<<< HEAD carbonMonoxideDetectors.add(new CarbonMonoxideDetector(id, label, displayName, this.currentCarbonMonoxideValue, this.carbonMonoxideLatestValue)) -======= - carbonMonoxideDetectors.add(new CarbonMonoxideDetector(id, label, displayName, this.carbonMonoxide, this.carbonMonoxideLatestValue)) ->>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c } //By Model Checker diff --git a/ColorControl/ColorControls.groovy b/ColorControl/ColorControls.groovy index 3538447..d96b978 100644 --- a/ColorControl/ColorControls.groovy +++ b/ColorControl/ColorControls.groovy @@ -23,19 +23,6 @@ public class ColorControls { this.sendEvent = sendEvent this.deviceNumbers = deviceNumbers this.colorControls = [] - - def initHue = Verify.getIntFromList(30, 50, 70) - this.hue = initHue - def initSat = Verify.getIntFromList(40, 50, 60) - this.saturation = initSat - def init = Verify.getInt(0,2) - if (init == 0) { - this.color = "red" - } else if (init == 1) { - this.color = "green" - } else { - this.color = "blue" - } def initHue = Verify.getIntFromList(30, 50, 70) this.hue = initHue diff --git a/DoorControl/DoorControls.groovy b/DoorControl/DoorControls.groovy index e8e067a..2581800 100644 --- a/DoorControl/DoorControls.groovy +++ b/DoorControl/DoorControls.groovy @@ -23,11 +23,7 @@ public class DoorControls { this.timers = new SimulatedTimer() this.deviceNumbers = deviceNumbers this.doorControls = [] -<<<<<<< HEAD -======= - ->>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c def init = Verify.getBoolean() if (init) { this.doorState = "closed" diff --git a/EnergyMeter/EnergyMeters.groovy b/EnergyMeter/EnergyMeters.groovy index 8554495..a3f2b8d 100644 --- a/EnergyMeter/EnergyMeters.groovy +++ b/EnergyMeter/EnergyMeters.groovy @@ -22,17 +22,10 @@ public class EnergyMeters { this.sendEvent = sendEvent this.deviceNumbers = deviceNumbers this.energyMeters = [] -<<<<<<< HEAD def init = Verify.getIntFromList(30, 50, 70) this.energy = init -======= - - def init = Verify.getIntFromList(30, 50, 70) - this.energy = init - ->>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c energyMeters.add(new EnergyMeter(id, label, displayName, this.energy)) } diff --git a/Extractor/Extractor.groovy b/Extractor/Extractor.groovy index e8ccbda..309223d 100644 --- a/Extractor/Extractor.groovy +++ b/Extractor/Extractor.groovy @@ -1365,13 +1365,6 @@ def input(LinkedHashMap metaData) { } break case "enum": -<<<<<<< HEAD -======= - def randomVariable = Math.abs(new Random().nextInt() % 2) - def modes = ["Yes", "No"] - //def userInput = modes[randomVariable] - //def modes = metaData['options'] ->>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c if (metaData['options'] != null) modes = metaData['options'] else // If it is not named 'options' then it is captured as 'metadata' diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py index 27abbc1..5bd867a 100644 --- a/Extractor/ExtractorScript.py +++ b/Extractor/ExtractorScript.py @@ -419,12 +419,8 @@ def CheckIfOnlyTouchEvents(): onlyTouchEvents = False if onlyTouchEvents is True and app1Subscribe is True and app2Subscribe is True: raise Exception("\n\nDirect-Direct Interaction detected: we are skipping this pair...\n\n") -<<<<<<< HEAD -======= - ->>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c #Extract objects to call functions from App1 F1 = open("Extractor/App1/App1.groovy", "r") extractedFunctionsApp1 = open("Extractor/App1/extractedFunctionsApp1.groovy", "w+") @@ -483,10 +479,5 @@ extractorFile.close() Extractor.close() F2.close() os.system("groovy -classpath lib/jpf.jar Extractor/extractorFile.groovy") -<<<<<<< HEAD -======= - - ->>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c diff --git a/GlobalVariables/GlobalVariablesBothApps.groovy b/GlobalVariables/GlobalVariablesBothApps.groovy index bb45ddf..998778b 100644 --- a/GlobalVariables/GlobalVariablesBothApps.groovy +++ b/GlobalVariables/GlobalVariablesBothApps.groovy @@ -8,11 +8,8 @@ @Field def appObject = new Touched(sendEvent, 0) //Create a global list for events //@Field def evt = [] -<<<<<<< HEAD //Global Object for class AtomicState! @Field def atomicState = new AtomicState() -======= ->>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c //Global Object for class Touch Sensor! @Field def touchSensorObject = new NfcTouch(sendEvent, 1) //Global Object for class switch! diff --git a/Methods/eventHandler.groovy b/Methods/eventHandler.groovy index 1a3dd01..b838418 100644 --- a/Methods/eventHandler.groovy +++ b/Methods/eventHandler.groovy @@ -13,10 +13,6 @@ def eventHandler(LinkedHashMap eventDataMap) { for (int i = 0;i < app2.eventList.size();i++) { if (app2.eventList[i] == name) { def event = new Event(value, name, deviceId, descriptionText, displayed, linkText, linkText, isStateChange, unit, data) -<<<<<<< HEAD -======= - //evt.add(event) ->>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c app2.functionList[i](event) } } @@ -24,10 +20,6 @@ def eventHandler(LinkedHashMap eventDataMap) { for (int i = 0;i < app1.eventList.size();i++) { if (app1.eventList[i] == name) { def event = new Event(value, name, deviceId, descriptionText, displayed, linkText, linkText, isStateChange, unit, data) -<<<<<<< HEAD -======= - //evt.add(event) ->>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c app1.functionList[i](event) } } diff --git a/ModelCheck.py b/ModelCheck.py index e3c6ff9..d00c699 100644 --- a/ModelCheck.py +++ b/ModelCheck.py @@ -117,11 +117,3 @@ writeLogList.close() -<<<<<<< HEAD -======= - - - - - ->>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c diff --git a/MusicPlayer/MusicPlayers.groovy b/MusicPlayer/MusicPlayers.groovy index 3e5f4f3..63a213b 100644 --- a/MusicPlayer/MusicPlayers.groovy +++ b/MusicPlayer/MusicPlayers.groovy @@ -27,35 +27,6 @@ public class MusicPlayers { this.sendEvent = sendEvent this.deviceNumbers = deviceNumbers this.musicPlayers = [] - - def initLevel = Verify.getIntFromList(10, 20, 30) - this.level = initLevel - def initTrack = Verify.getIntFromList(1, 2, 3) - this.trackNumber = initTrack - def initMute = Verify.getBoolean() - if (initMute) { - this.mute = "unmuted" - } else { - this.mute = "mute" - } - def initStatus = Verify.getBoolean() - if (initStatus) { - this.status = "pause" - } else { - this.status = "play" - } - def initTrackData = Verify.getBoolean() - if (initTrackData) { - this.trackData = "someTrack" - } else { - this.trackData = "someOtherTrack" - } - def initTrackDesc = Verify.getBoolean() - if (initTrackDesc) { - this.trackDescription = "someDescriptions" - } else { - this.trackDescription = "someOtherDescriptions" - } def initLevel = Verify.getIntFromList(10, 20, 30) this.level = initLevel diff --git a/Runner.py b/Runner.py index 5d3e101..d72844d 100644 --- a/Runner.py +++ b/Runner.py @@ -303,13 +303,8 @@ Out.write("if (installOrder) {\n") Out.write("\tapp1.installed()\n") Out.write("\tapp2.installed()\n") Out.write("} else {\n") -<<<<<<< HEAD Out.write("\tapp2.installed()\n") Out.write("\tapp1.installed()\n") -======= -Out.write("\tapp1.installed()\n") -Out.write("\tapp2.installed()\n") ->>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c Out.write("}\n\n") for line in eventSimulator: Out.write(line) diff --git a/Switch/Switches.groovy b/Switch/Switches.groovy index d396b90..5a4ef48 100644 --- a/Switch/Switches.groovy +++ b/Switch/Switches.groovy @@ -25,19 +25,6 @@ public class Switches { this.timers = new SimulatedTimer() this.deviceNumbers = deviceNumbers this.switches = [] - - def initLevel = Verify.getIntFromList(30, 50, 70) - this.currentLevel = initLevel - def init = Verify.getBoolean() - if (init) { - this.switchState = "off" - this.currentSwitch = "off" - this.switchLatestValue = "off" - } else { - this.switchState = "on" - this.currentSwitch = "on" - this.switchLatestValue = "on" - } def initLevel = Verify.getIntFromList(30, 50, 70) this.currentLevel = initLevel diff --git a/Thermostat/Thermostats.groovy b/Thermostat/Thermostats.groovy index d77af21..19f5d6f 100644 --- a/Thermostat/Thermostats.groovy +++ b/Thermostat/Thermostats.groovy @@ -50,11 +50,7 @@ public class Thermostats{ this.heatingSetpoint = initHeatingSetpoint def initThermostatSetpoint = Verify.getIntFromList(50, 60, 70) -<<<<<<< HEAD this.thermostatSetpoint = initThermostatSetpoint -======= - this.currentHeatingSetpoint = initThermostatSetpoint ->>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c def initFanMode = Verify.getInt(0,4) if (initFanMode == 0) { diff --git a/appLists/device-interaction/acfanheaterSwitchesAppList b/appLists/device-interaction/acfanheaterSwitchesAppList deleted file mode 100644 index bcb0fdd..0000000 --- a/appLists/device-interaction/acfanheaterSwitchesAppList +++ /dev/null @@ -1,3 +0,0 @@ -its-too-cold.groovy -its-too-hot.groovy -virtual-thermostat.groovy \ No newline at end of file diff --git a/appLists/device-interaction/alarmsAppList b/appLists/device-interaction/alarmsAppList deleted file mode 100644 index 51487f7..0000000 --- a/appLists/device-interaction/alarmsAppList +++ /dev/null @@ -1,4 +0,0 @@ -lock-it-at-a-specific-time.groovy -#lock-it-when-i-leave.groovy -#make-it-so.groovy -nfc-tag-toggle.groovy diff --git a/appLists/device-interaction/cameraSwitchesAppList b/appLists/device-interaction/cameraSwitchesAppList deleted file mode 100644 index 26b4300..0000000 --- a/appLists/device-interaction/cameraSwitchesAppList +++ /dev/null @@ -1,2 +0,0 @@ -camera-power-scheduler.groovy -cameras-on-when-im-away.groovy \ No newline at end of file diff --git a/appLists/device-interaction/camerasAppList b/appLists/device-interaction/camerasAppList deleted file mode 100644 index b2376c2..0000000 --- a/appLists/device-interaction/camerasAppList +++ /dev/null @@ -1,3 +0,0 @@ -foscam-connect.groovy -opent2t-smartapp-test.groovy -photo-burst-when.groovy \ No newline at end of file diff --git a/appLists/device-interaction/hueLightsAppList b/appLists/device-interaction/hueLightsAppList deleted file mode 100644 index 6f94562..0000000 --- a/appLists/device-interaction/hueLightsAppList +++ /dev/null @@ -1,13 +0,0 @@ -03-sms-to-hue.groovy -door-state-to-color-light-hue-bulb.groovy -hue-minimote.groovy -hue-mood-lighting.groovy -jenkins-notifier.groovy -notify-me-with-hue.groovy -step-notifier.groovy -tweet-to-hue.groovy -BetterLaundryMonitor.groovy -Hue Party Mode.groovy -mini-hue-controller.groovy -hue-lights-and-groups-and-scenes-oh-my.groovy -loft.groovy \ No newline at end of file diff --git a/appLists/device-interaction/lightSwitchesAppList b/appLists/device-interaction/lightSwitchesAppList deleted file mode 100644 index 11cab3f..0000000 --- a/appLists/device-interaction/lightSwitchesAppList +++ /dev/null @@ -1,32 +0,0 @@ -brighten-dark-places.groovy -brighten-my-path.groovy -darken-behind-me.groovy -forgiving-security.groovy -good-night-house.groovy -hall-light-welcome-home.groovy -hue-minimote.groovy -laundry-monitor.groovy -let-there-be-dark.groovy -let-there-be-light.groovy -Light_Rule.groovy -light-follows-me.groovy -lighting-director.groovy -lights-off-with-no-motion-and-presence.groovy -light-up-the-night.groovy -mood-cube.groovy -my-light-toggle.groovy -smart-light-timer-x-minutes-unless-already-on.groovy -smart-nightlight.groovy -smart-security.groovy -step-notifier.groovy -turn-on-at-sunset.groovy -turn-on-before-sunset.groovy -turn-on-by-zip-code.groovy -turn-it-on-when-im-here.groovy -turn-it-on-when-it-opens.groovy -turn-off-with-motion.groovy -turn-on-only-if-i-arrive-after-sunset.groovy -undead-early-warning.groovy -vacation-lighting-director.groovy -ecobeeAwayFromHome.groovy -FireCO2Alarm.groovy \ No newline at end of file diff --git a/appLists/device-interaction/locksAppList b/appLists/device-interaction/locksAppList deleted file mode 100644 index 860b434..0000000 --- a/appLists/device-interaction/locksAppList +++ /dev/null @@ -1,21 +0,0 @@ -#beacon-control.groovy -enhanced-auto-lock-door.groovy -good-night-house.groovy -#initial-state-event-streamer.groovy -lock-it-at-a-specific-time.groovy -lock-it-when-i-leave.groovy -make-it-so.groovy -nfc-tag-toggle.groovy -#single-button-controller.groovy -#smart-auto-lock-unlock.groovy -unlock-it-when-i-arrive.groovy -auto-lock-door.smartapp.groovy -#buffered-event-sender.groovy -#ecobeeAwayFromHome.groovy -#FireCO2Alarm.groovy -#groveStreams.groovy -#influxdb-logger.groovy -#initial-state-event-sender.groovy -#initialstate-smart-app-v1.2.0.groovy -#NotifyIfLeftUnlocked.groovy -#unbuffered-event-sender.groovy \ No newline at end of file diff --git a/appLists/device-interaction/musicPlayersAppList b/appLists/device-interaction/musicPlayersAppList deleted file mode 100644 index 9c5b6f8..0000000 --- a/appLists/device-interaction/musicPlayersAppList +++ /dev/null @@ -1,5 +0,0 @@ -initial-state-event-streamer.groovy -buffered-event-sender.groovy -influxdb-logger.groovy -initialstate-smart-app-v1.2.0.groovy -unbuffered-event-sender.groovy \ No newline at end of file diff --git a/appLists/device-interaction/nonHueLightsAppList b/appLists/device-interaction/nonHueLightsAppList deleted file mode 100644 index 7d58810..0000000 --- a/appLists/device-interaction/nonHueLightsAppList +++ /dev/null @@ -1,11 +0,0 @@ -color-coordinator.groovy -initial-state-event-streamer.groovy -medicine-management-contact-sensor.groovy -medicine-management-temp-motion.groovy -buffered-event-sender.groovy -circadian-daylight.groovy -influxdb-logger.groovy -initial-state-event-sender.groovy -initialstate-smart-app-v1.2.0.groovy -unbuffered-event-sender.groovy -hue-minimote.groovy \ No newline at end of file diff --git a/appLists/device-interaction/relaySwitchesAppList b/appLists/device-interaction/relaySwitchesAppList deleted file mode 100644 index 75b2486..0000000 --- a/appLists/device-interaction/relaySwitchesAppList +++ /dev/null @@ -1,5 +0,0 @@ -initial-state-event-streamer.groovy -buffered-event-sender.groovy -initial-state-event-sender.groovy -initialstate-smart-app-v1.2.0.groovy -unbuffered-event-sender.groovy \ No newline at end of file diff --git a/appLists/device-interaction/speechesAppList b/appLists/device-interaction/speechesAppList deleted file mode 100644 index a232cd6..0000000 --- a/appLists/device-interaction/speechesAppList +++ /dev/null @@ -1,3 +0,0 @@ -BetterLaundryMonitor.groovy -FireCO2Alarm.groovy -WindowOrDoorOpen.groovy \ No newline at end of file diff --git a/appLists/device-interaction/switchesAppList b/appLists/device-interaction/switchesAppList deleted file mode 100644 index fdadf64..0000000 --- a/appLists/device-interaction/switchesAppList +++ /dev/null @@ -1,24 +0,0 @@ -01-control-lights-and-locks-with-contact-sensor.groovy -beacon-control.groovy -big-turn-off.groovy -big-turn-on.groovy -control-switch-with-contact-sensor.groovy -double-tap.groovy -energy-saver.groovy -gentle-wake-up.groovy -good-night.groovy -humidity-alert.groovy -jenkins-notifier.groovy -make-it-so.groovy -monitor-on-sense.groovy -nfc-tag-toggle.groovy -once-a-day.groovy -power-allowance.groovy -rise-and-shine.groovy -smart-turn-it-on.groovy -sunrise-sunset.groovy -the-big-switch.groovy -turn-it-on-for-5-minutes.groovy -BetterLaundryMonitor.groovy -garage-switch.groovy -loft.groovy \ No newline at end of file diff --git a/appLists/device-interaction/thermostatsAppList b/appLists/device-interaction/thermostatsAppList deleted file mode 100644 index f0a6573..0000000 --- a/appLists/device-interaction/thermostatsAppList +++ /dev/null @@ -1,19 +0,0 @@ -initial-state-event-streamer.groovy -keep-me-cozy.groovy -keep-me-cozy-ii.groovy -make-it-so.groovy -talking-alarm-clock.groovy -thermostat.groovy -thermostat-auto-off.groovy -thermostat-mode-director.groovy -thermostat-window-check.groovy -whole-house-fan.groovy -buffered-event-sender.groovy -FireCO2Alarm.groovy -groveStreams.groovy -hvac-auto-off.smartapp.groovy -influxdb-logger.groovy -initial-state-event-sender.groovy -initialstate-smart-app-v1.2.0.groovy -unbuffered-event-sender.groovy -WindowOrDoorOpen.groovy \ No newline at end of file diff --git a/appLists/device-interaction/valvesAppList b/appLists/device-interaction/valvesAppList deleted file mode 100644 index 2d2ba98..0000000 --- a/appLists/device-interaction/valvesAppList +++ /dev/null @@ -1,7 +0,0 @@ -close-the-valve.groovy -initial-state-event-streamer.groovy -buffered-event-sender.groovy -influxdb-logger.groovy -initial-state-event-sender.groovy -initialstate-smart-app-v1.2.0.groovy -unbuffered-event-sender.groovy \ No newline at end of file diff --git a/appLists/device-interaction/ventfanSwitchesAppList b/appLists/device-interaction/ventfanSwitchesAppList deleted file mode 100644 index b827486..0000000 --- a/appLists/device-interaction/ventfanSwitchesAppList +++ /dev/null @@ -1,3 +0,0 @@ -auto-humidity-vent.groovy -smart-home-ventilation.groovy -whole-house-fan.groovy \ No newline at end of file diff --git a/appLists/global-state-variable-interaction/globalstatevariableAppList b/appLists/global-state-variable-interaction/globalstatevariableAppList deleted file mode 100644 index 04c4d0a..0000000 --- a/appLists/global-state-variable-interaction/globalstatevariableAppList +++ /dev/null @@ -1,47 +0,0 @@ -beacon-control.groovy -bon-voyage.groovy -bose-soundtouch-control.groovy -bright-when-dark-and-or-bright-after-sunset.groovy -button-controller.groovy -forgiving-security.groovy -gentle-wake-up.groovy -good-night.groovy -good-night-house.groovy -greetings-earthling.groovy -hello-home-phrase-director.groovy -hue-mood-lighting.groovy -keep-me-cozy.groovy -lighting-director.groovy -make-it-so.groovy -nobody-home.groovy -notify-me-with-hue.groovy -rise-and-shine.groovy -routine-director.groovy -scheduled-mode-change.groovy -simple-sync-trigger.groovy -single-button-controller.groovy -smart-alarm.groovy -smart-home-ventilation.groovy -smart-security.groovy -sonos-music-modes.groovy -speaker-control.groovy -speaker-mood-music.groovy -speaker-notify-with-sound.groovy -speaker-weather-forecast.groovy -sunrise-sunset.groovy -switch-activates-home-phrase-or-mode.groovy -switch-changes-mode.groovy -talking-alarm-clock.groovy -thermostat-mode-director.groovy -vacation-lighting-director.groovy -working-from-home.groovy -button-controller-for-hlgs.groovy -circadian-daylight.groovy -ecobeeChangeMode.groovy -ecobeeGenerateWeeklyStats.groovy -ecobeeManageClimate.groovy -ecobeeResumeProg.groovy -MonitorAndSetEcobeeHumidity.groovy -SmartPresence.groovy -Switches.groovy -WorkingFromHome.groovy \ No newline at end of file diff --git a/appLists/physical-interaction/illuminancesensorAppList b/appLists/physical-interaction/illuminancesensorAppList deleted file mode 100644 index 07f39ee..0000000 --- a/appLists/physical-interaction/illuminancesensorAppList +++ /dev/null @@ -1,5 +0,0 @@ -brighten-dark-places.groovy -bright-when-dark-and-or-bright-after-sunset.groovy -lighting-director.groovy -light-up-the-night.groovy -smart-nightlight.groovy \ No newline at end of file diff --git a/appLists/physical-interaction/lightAppList b/appLists/physical-interaction/lightAppList deleted file mode 100644 index e5fac4e..0000000 --- a/appLists/physical-interaction/lightAppList +++ /dev/null @@ -1,42 +0,0 @@ -brighten-dark-places.groovy -brighten-my-path.groovy -darken-behind-me.groovy -forgiving-security.groovy -good-night-house.groovy -hall-light-welcome-home.groovy -hue-minimote.groovy -laundry-monitor.groovy -let-there-be-dark.groovy -let-there-be-light.groovy -Light_Rule.groovy -light-follows-me.groovy -lighting-director.groovy -lights-off-with-no-motion-and-presence.groovy -light-up-the-night.groovy -mood-cube.groovy -my-light-toggle.groovy -smart-light-timer-x-minutes-unless-already-on.groovy -smart-nightlight.groovy -smart-security.groovy -step-notifier.groovy -turn-on-at-sunset.groovy -turn-on-before-sunset.groovy -turn-on-by-zip-code.groovy -turn-it-on-when-im-here.groovy -turn-it-on-when-it-opens.groovy -turn-off-with-motion.groovy -turn-on-only-if-i-arrive-after-sunset.groovy -undead-early-warning.groovy -vacation-lighting-director.groovy -ecobeeAwayFromHome.groovy -FireCO2Alarm.groovy -bright-when-dark-and-or-bright-after-sunset.groovy -03-sms-to-hue.groovy -color-coordinator.groovy -door-state-to-color-light-hue-bulb.groovy -hue-mood-lighting.groovy -medicine-management-contact-sensor.groovy -medicine-management-temp-motion.groovy -notify-me-with-hue.groovy -tweet-to-hue.groovy -gentle-wake-up.groovy \ No newline at end of file diff --git a/appLists/physical-interaction/motionAppList b/appLists/physical-interaction/motionAppList deleted file mode 100644 index 149e456..0000000 --- a/appLists/physical-interaction/motionAppList +++ /dev/null @@ -1,2 +0,0 @@ -coffee-after-shower.groovy -neato-connect.groovy \ No newline at end of file diff --git a/appLists/physical-interaction/motionsensorAppList b/appLists/physical-interaction/motionsensorAppList deleted file mode 100644 index 1b8ca82..0000000 --- a/appLists/physical-interaction/motionsensorAppList +++ /dev/null @@ -1,37 +0,0 @@ -bose-soundtouch-control.groovy -brighten-my-path.groovy -bright-when-dark-and-or-bright-after-sunset.groovy -curling-iron.groovy -darken-behind-me.groovy -elder-care-daily-routine.groovy -elder-care-slip-fall.groovy -forgiving-security.groovy -good-night.groovy -hue-mood-lighting.groovy -light-follows-me.groovy -lights-off-with-no-motion-and-presence.groovy -my-light-toggle.groovy -notify-me-when.groovy -notify-me-with-hue.groovy -photo-burst-when.groovy rise-and-shine.groovy -safe-watch.groovy -send-ham-bridge-command-when.groovy -simple-sync-trigger.groovy -smart-alarm.groovy -smart-light-timer-x-minutes-unless-already-on.groovy -smart-nightlight.groovy smart-security.groovy -speaker-control.groovy -speaker-mood-music.groovy -speaker-notify-with-sound.groovy -speaker-weather-forecast.groovy -text-me-when-theres-motion-and-im-not-here.groovy -the-flasher.groovy -turn-off-with-motion.groovy -ubi.groovy -virtual-thermostat.groovy -camera-motion.groovy -ecobeeAwayFromHome.groovy -ecobeeResumeProg.groovy -loft.groovy -MonitorAndSetEcobeeTemp.groovy -it-moved.groovy \ No newline at end of file diff --git a/appLists/physical-interaction/soundAppList b/appLists/physical-interaction/soundAppList deleted file mode 100644 index 635b0d2..0000000 --- a/appLists/physical-interaction/soundAppList +++ /dev/null @@ -1,23 +0,0 @@ -bose-soundtouch-control.groovy -forgiving-security.groovy -ifttt.groovy -initial-state-event-streamer.groovy -logitech-harmony-connect.groovy -smart-alarm.groovy -smart-security.groovy -initial-state-event-streamer.groovy -simple-control.groovy -single-button-controller.groovy -sonos-music-modes.groovy -sonos-remote-control.groovy -step-notifier.groovy -talking-alarm-clock.groovy -buffered-event-sender.groovy -influxdb-logger.groovy -initialstate-smart-app-v1.2.0.groovy -Sonos.groovy -unbuffered-event-sender.groovy -BetterLaundryMonitor.groovy -FireCO2Alarm.groovy -loft.groovy -WindowOrDoorOpen.groovy \ No newline at end of file diff --git a/appLists/physical-interaction/soundsensorAppList b/appLists/physical-interaction/soundsensorAppList deleted file mode 100644 index afc906c..0000000 --- a/appLists/physical-interaction/soundsensorAppList +++ /dev/null @@ -1 +0,0 @@ -influxdb-logger.groovy \ No newline at end of file diff --git a/appLists/physical-interaction/watersensorAppList b/appLists/physical-interaction/watersensorAppList deleted file mode 100644 index f036a84..0000000 --- a/appLists/physical-interaction/watersensorAppList +++ /dev/null @@ -1,11 +0,0 @@ -bose-soundtouch-control.groovy -close-the-valve.groovy -dry-the-wetspot.groovy -flood-alert.groovy -hue-mood-lighting.groovy -notify-me-when.groovy -notify-me-with-hue.groovy -speaker-control.groovy -speaker-mood-music.groovy -speaker-notify-with-sound.groovy -speaker-weather-forecast.groovy \ No newline at end of file diff --git a/appLists/physical-interaction/watervalveAppList b/appLists/physical-interaction/watervalveAppList deleted file mode 100644 index b3e5dfc..0000000 --- a/appLists/physical-interaction/watervalveAppList +++ /dev/null @@ -1,2 +0,0 @@ -close-the-valve.groovy -sprayer-controller-2.groovy \ No newline at end of file diff --git a/eventSimulator/accelerationActiveEvent.groovy b/eventSimulator/accelerationActiveEvent.groovy index 06ec00b..6991b56 100644 --- a/eventSimulator/accelerationActiveEvent.groovy +++ b/eventSimulator/accelerationActiveEvent.groovy @@ -1,6 +1,2 @@ accelerationSensorObject.setValue([name: "acceleration", value: "active", deviceId: "accelerationSensorID0", descriptionText: "", -<<<<<<< HEAD displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}']) -======= - displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) ->>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c diff --git a/eventSimulator/accelerationInactiveEvent.groovy b/eventSimulator/accelerationInactiveEvent.groovy index 2e5b672..eaa876f 100644 --- a/eventSimulator/accelerationInactiveEvent.groovy +++ b/eventSimulator/accelerationInactiveEvent.groovy @@ -1,6 +1,2 @@ accelerationSensorObject.setValue([name: "acceleration", value: "inactive", deviceId: "accelerationSensorID0", descriptionText: "", -<<<<<<< HEAD displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}']) -======= - displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) ->>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c diff --git a/eventSimulator/beaconLeftEvent.groovy b/eventSimulator/beaconLeftEvent.groovy index 36f8bd8..445e51f 100644 --- a/eventSimulator/beaconLeftEvent.groovy +++ b/eventSimulator/beaconLeftEvent.groovy @@ -1,7 +1,2 @@ -<<<<<<< HEAD beaconSensorObject.setValue([name: "presence", value: "not present", deviceId: "beaconSensorID0", descriptionText: "", displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"presence":"0","dni":"mobile0"}']) -======= - beaconSensorObject.setValue([name: "beacon", value: "not present", deviceId: "beaconSensorID0", descriptionText: "", - displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) ->>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c diff --git a/eventSimulator/beaconPresentEvent.groovy b/eventSimulator/beaconPresentEvent.groovy index 7ce002b..816a129 100644 --- a/eventSimulator/beaconPresentEvent.groovy +++ b/eventSimulator/beaconPresentEvent.groovy @@ -1,7 +1,2 @@ -<<<<<<< HEAD beaconSensorObject.setValue([name: "presence", value: "present", deviceId: "beaconeSensorID0", descriptionText: "", displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"presence":"1","dni":"mobile0"}']) -======= - beaconSensorObject.setValue([name: "beacon", value: "present", deviceId: "beaconeSensorID0", descriptionText: "", - displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) ->>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c diff --git a/eventSimulator/carbonMonoxideClearEvent.groovy b/eventSimulator/carbonMonoxideClearEvent.groovy index 0101c3f..fb3520d 100644 --- a/eventSimulator/carbonMonoxideClearEvent.groovy +++ b/eventSimulator/carbonMonoxideClearEvent.groovy @@ -1,6 +1,2 @@ carbonMonoxideDetectorObject.setValue([name: "carbonMonoxide", value: "clear", deviceId: "carbonMonoxideDetectorID0", descriptionText: "", -<<<<<<< HEAD displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}']) -======= - displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) ->>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c diff --git a/eventSimulator/carbonMonoxideDetectedEvent.groovy b/eventSimulator/carbonMonoxideDetectedEvent.groovy index 5a3464c..6686f91 100644 --- a/eventSimulator/carbonMonoxideDetectedEvent.groovy +++ b/eventSimulator/carbonMonoxideDetectedEvent.groovy @@ -1,6 +1,2 @@ carbonMonoxideDetectorObject.setValue([name: "carbonMonoxide", value: "tested", deviceId: "carbonMonoxideDetectorID0", descriptionText: "", -<<<<<<< HEAD displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}']) -======= - displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) ->>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c diff --git a/eventSimulator/carbonMonoxideTestedEvent.groovy b/eventSimulator/carbonMonoxideTestedEvent.groovy index 5a3464c..6686f91 100644 --- a/eventSimulator/carbonMonoxideTestedEvent.groovy +++ b/eventSimulator/carbonMonoxideTestedEvent.groovy @@ -1,6 +1,2 @@ carbonMonoxideDetectorObject.setValue([name: "carbonMonoxide", value: "tested", deviceId: "carbonMonoxideDetectorID0", descriptionText: "", -<<<<<<< HEAD displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}']) -======= - displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) ->>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c diff --git a/eventSimulator/colorChangedEvent.groovy b/eventSimulator/colorChangedEvent.groovy index 598e011..5ed3b4f 100644 --- a/eventSimulator/colorChangedEvent.groovy +++ b/eventSimulator/colorChangedEvent.groovy @@ -1,6 +1,2 @@ colorControlObject.setValue([name: "color", value: "red", deviceId: "colorControlID0", descriptionText: "", -<<<<<<< HEAD displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}']) -======= - displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) ->>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c diff --git a/eventSimulator/hueChangedEvent.groovy b/eventSimulator/hueChangedEvent.groovy index de7e537..b5d20d2 100644 --- a/eventSimulator/hueChangedEvent.groovy +++ b/eventSimulator/hueChangedEvent.groovy @@ -1,6 +1,2 @@ colorControlObject.setValue([name: "hue", value: "50", deviceId: "colorControlID0", descriptionText: "", -<<<<<<< HEAD displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}']) -======= - displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) ->>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c diff --git a/eventSimulator/saturationChangedEvent.groovy b/eventSimulator/saturationChangedEvent.groovy index 842d28b..5327de2 100644 --- a/eventSimulator/saturationChangedEvent.groovy +++ b/eventSimulator/saturationChangedEvent.groovy @@ -1,6 +1,2 @@ colorControlObject.setValue([name: "saturation", value: "50", deviceId: "colorControlID0", descriptionText: "", -<<<<<<< HEAD displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}']) -======= - displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) ->>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c diff --git a/eventSimulator/smokeCarbonMonoxideClearEvent.groovy b/eventSimulator/smokeCarbonMonoxideClearEvent.groovy index 06728c7..7c1df43 100644 --- a/eventSimulator/smokeCarbonMonoxideClearEvent.groovy +++ b/eventSimulator/smokeCarbonMonoxideClearEvent.groovy @@ -1,6 +1,2 @@ smokeDetectorObject.setValue([name: "carbonMonoxide", value: "clear", deviceId: "smokeDetectorID0", descriptionText: "", -<<<<<<< HEAD displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}']) -======= - displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) ->>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c diff --git a/eventSimulator/smokeCarbonMonoxideDetectedEvent.groovy b/eventSimulator/smokeCarbonMonoxideDetectedEvent.groovy index 2f2fa4e..b889098 100644 --- a/eventSimulator/smokeCarbonMonoxideDetectedEvent.groovy +++ b/eventSimulator/smokeCarbonMonoxideDetectedEvent.groovy @@ -1,6 +1,2 @@ smokeDetectorObject.setValue([name: "carbonMonoxide", value: "detected", deviceId: "smokeDetectorID0", descriptionText: "", -<<<<<<< HEAD displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}']) -======= - displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) ->>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c diff --git a/eventSimulator/smokeCarbonMonoxideTestedEvent.groovy b/eventSimulator/smokeCarbonMonoxideTestedEvent.groovy index 04b1805..2ce58bc 100644 --- a/eventSimulator/smokeCarbonMonoxideTestedEvent.groovy +++ b/eventSimulator/smokeCarbonMonoxideTestedEvent.groovy @@ -1,6 +1,2 @@ smokeDetectorObject.setValue([name: "carbonMonoxide", value: "tested", deviceId: "smokeDetectorID0", descriptionText: "", -<<<<<<< HEAD displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}']) -======= - displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) ->>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c diff --git a/run.sh b/run.sh index b0f8b05..7ba9baa 100755 --- a/run.sh +++ b/run.sh @@ -1,10 +1,2 @@ #!/bin/bash - -# Device conflict -#python ModelCheck.py ../jpf-core/ ../logs/ ../smartapps/ ../smartapps/appList1 - -# Physical conflict -python ModelCheck.py ../jpf-core/ ../logs/ ../smartapps/ appLists/physical-interaction/soundsensorAppList appLists/physical-interaction/soundAppList -python ModelCheck.py ../jpf-core/ ../logs/ ../smartapps/ appLists/physical-interaction/motionsensorAppList appLists/physical-interaction/motionAppList -python ModelCheck.py ../jpf-core/ ../logs/ ../smartapps/ appLists/physical-interaction/illuminancesensorAppList appLists/physical-interaction/lightAppList -python ModelCheck.py ../jpf-core/ ../logs/ ../smartapps/ appLists/physical-interaction/watersensorAppList appLists/physical-interaction/watervalveAppList \ No newline at end of file +python ModelCheck.py ../jpf-core/ ../logs/ ../smartapps/ ../smartapps/appList1 -- 2.34.1