projects
/
smartthings-infrastructure.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6da0a8c
)
Fixing a bug: unlock is supposed to be recognized as lock event.
author
rtrimana
<rtrimana@uci.edu>
Wed, 7 Aug 2019 00:51:52 +0000
(17:51 -0700)
committer
rtrimana
<rtrimana@uci.edu>
Wed, 7 Aug 2019 00:51:52 +0000
(17:51 -0700)
Extractor/ExtractorScript.py
patch
|
blob
|
history
diff --git
a/Extractor/ExtractorScript.py
b/Extractor/ExtractorScript.py
index 5d92fc4dd1e315263098affa8265f16f695e4bd1..1172b4e392a6d987c1ea764a0a74109fb268e9fd 100644
(file)
--- a/
Extractor/ExtractorScript.py
+++ b/
Extractor/ExtractorScript.py
@@
-76,6
+76,7
@@
eventTypesMap = {'alarm.both': 'alarm',
'mode.away' : 'location',
'mode.home' : 'location',
'mode.night' : 'location',
'mode.away' : 'location',
'mode.home' : 'location',
'mode.night' : 'location',
+ 'unlock' : 'lock',
'lock.locked' : 'lock',
'lock.unlocked' : 'lock',
'motion.active' : 'motion',
'lock.locked' : 'lock',
'lock.unlocked' : 'lock',
'motion.active' : 'motion',
@@
-331,6
+332,7
@@
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 eventList
isApp1 = True
while counter < numOfActualEvents:
# Interleave events from App1 and App2
isApp1 = True
while counter < numOfActualEvents:
# Interleave events from App1 and App2
@@
-359,9
+361,6
@@
def ExtractEvents(extractedEvents):
for line in event:
extractedEvents.write(line)
event.close()
for line in event:
extractedEvents.write(line)
event.close()
- elif eventList[i] == "unlock":
- #Don't do anything for this case
- counter = counter - 1
elif eventList[i] == "nfcTouch":
event = open("eventSimulator/nfcTouchEvent.groovy", "r")
for line in event:
elif eventList[i] == "nfcTouch":
event = open("eventSimulator/nfcTouchEvent.groovy", "r")
for line in event: