projects
/
smartthings-infrastructure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some minor changes!
[smartthings-infrastructure.git]
/
Extractor
/
ExtractorScript.py
diff --git
a/Extractor/ExtractorScript.py
b/Extractor/ExtractorScript.py
index 81948167ff4e386e19bf8cb09e2657b1fc40cd4e..2c965908705c6ce01e97c1a12739009886ffa5c4 100644
(file)
--- a/
Extractor/ExtractorScript.py
+++ b/
Extractor/ExtractorScript.py
@@
-59,7
+59,8
@@
eventTypeCounterMap = {'lock': 2,
'temperature' : 2,
'heatingSetpoint' : 1,
'coolingSetpoint' : 1,
'temperature' : 2,
'heatingSetpoint' : 1,
'coolingSetpoint' : 1,
- 'thermostatSetpoint' : 1}
+ 'thermostatSetpoint' : 1,
+ 'threeAxis' : 1}
# Mapping for specific event types
eventTypesMap = {'alarm.both': 'alarm',
# Mapping for specific event types
eventTypesMap = {'alarm.both': 'alarm',
@@
-71,6
+72,7
@@
eventTypesMap = {'alarm.both': 'alarm',
'tamper.tampered' : 'contact',
'doorState.open' : 'doorState',
'doorState.closed' : 'doorState',
'tamper.tampered' : 'contact',
'doorState.open' : 'doorState',
'doorState.closed' : 'doorState',
+ 'position' : 'location',
'mode' : 'location',
'mode.away' : 'location',
'mode.home' : 'location',
'mode' : 'location',
'mode.away' : 'location',
'mode.home' : 'location',
@@
-333,8
+335,12
@@
def ExtractEvents(extractedEvents):
#print "DEBUG: App1: %d" % indexApp1
#print "DEBUG: App2: %d" % indexApp2
#print "DEBUG: eventList: %d" % len(eventList)
#print "DEBUG: App1: %d" % indexApp1
#print "DEBUG: App2: %d" % indexApp2
#print "DEBUG: eventList: %d" % len(eventList)
+ #print eventAppList
#print eventList
#print eventList
- isApp1 = True
+ if indexApp2Start > 0:
+ isApp1 = True
+ else:
+ isApp1 = False
while counter < numOfActualEvents:
# Interleave events from App1 and App2
if isApp1 is True:
while counter < numOfActualEvents:
# Interleave events from App1 and App2
if isApp1 is True:
@@
-455,6
+461,7
@@
def ExtractEvents(extractedEvents):
extractedEvents.write(line)
event.close()
elif eventList[i] == "motion":
extractedEvents.write(line)
event.close()
elif eventList[i] == "motion":
+ print("HERE????")
#Write two events subsequently
event = open("eventSimulator/motionActiveEvent.groovy", "r")
for line in event:
#Write two events subsequently
event = open("eventSimulator/motionActiveEvent.groovy", "r")
for line in event:
@@
-645,7
+652,6
@@
def ExtractEvents(extractedEvents):
extractedEvents.write(line)
event.close()
elif eventList[i] == "switch":
extractedEvents.write(line)
event.close()
elif eventList[i] == "switch":
-
#Check which capability
variable = eventVarMap[eventList[i]]
if eventList[i] not in eventVarCounterMap.keys():
#Check which capability
variable = eventVarMap[eventList[i]]
if eventList[i] not in eventVarCounterMap.keys():
@@
-996,6
+1002,11
@@
def ExtractEvents(extractedEvents):
for line in event:
extractedEvents.write(line)
event.close()
for line in event:
extractedEvents.write(line)
event.close()
+ elif eventList[i] == "threeAxis":
+ event = open("eventSimulator/threeAxisChangeEvent.groovy", "r")
+ for line in event:
+ extractedEvents.write(line)
+ event.close()
###TODO: Add more events later
extractedEvents.write("\n\t\t\tbreak\n")
###TODO: Add more events later
extractedEvents.write("\n\t\t\tbreak\n")