From: rtrimana Date: Wed, 8 Aug 2018 00:27:57 +0000 (-0700) Subject: Adding one more entry in clicker.sh and Main.java X-Git-Url: http://plrg.eecs.uci.edu/git/?p=pingpong.git;a=commitdiff_plain;h=2e29319e311ab1cb579a42f3664dabc029bd819d;ds=inline Adding one more entry in clicker.sh and Main.java --- diff --git a/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java b/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java index b8b5b75..8a0aa7f 100644 --- a/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java +++ b/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java @@ -74,10 +74,16 @@ public class Main { // final String deviceIp = "192.168.1.140"; // Kwikset Doorlock August 6 experiment - final String inputPcapFile = path + "/2018-08/kwikset-doorlock/kwikset-doorlock.wlan1.local.pcap"; - final String outputPcapFile = path + "/2018-08/kwikset-doorlock/kwikset-doorlock-processed.pcap"; - final String triggerTimesFile = path + "/2018-08/kwikset-doorlock/kwikset-doorlock-aug-6-2018.timestamps"; - final String deviceIp = "192.168.1.246"; // .246 == phone; .142 == SmartThings Hub (note: use eth0 capture for this!) +// final String inputPcapFile = path + "/2018-08/kwikset-doorlock/kwikset-doorlock.wlan1.local.pcap"; +// final String outputPcapFile = path + "/2018-08/kwikset-doorlock/kwikset-doorlock-processed.pcap"; +// final String triggerTimesFile = path + "/2018-08/kwikset-doorlock/kwikset-doorlock-aug-6-2018.timestamps"; +// final String deviceIp = "192.168.1.246"; // .246 == phone; .142 == SmartThings Hub (note: use eth0 capture for this!) + + // Hue BULB August 1 experiment + final String inputPcapFile = path + "/2018-08/hue-bulb/hue-bulb.wlan1.local.pcap"; + final String outputPcapFile = path + "/2018-08/hue-bulb/hue-bulb-processed.pcap"; + final String triggerTimesFile = path + "/2018-08/hue-bulb/hue-bulb-aug-7-2018.timestamps"; + final String deviceIp = "192.168.1.246"; TriggerTimesFileReader ttfr = new TriggerTimesFileReader(); List triggerTimes = ttfr.readTriggerTimes(triggerTimesFile, false); diff --git a/automation/clicker.sh b/automation/clicker.sh index f65601b..ba75e25 100755 --- a/automation/clicker.sh +++ b/automation/clicker.sh @@ -20,7 +20,7 @@ do # TP-Link switch #./adb shell input tap 1002 913 # TP-Link bulb on/off - ./adb shell input tap 994 560 + #./adb shell input tap 994 560 # D-Link switch #./adb shell input tap 987 346 # SmartThings @@ -38,6 +38,8 @@ do # unlocking # ./adb shell input tap 520 1211 #fi + # Hue bulb + ./adb shell input tap 923 383 #date +%r #RAND=$[( $RANDOM % $RAN_END ) + $RAN_STA] #RAND=$[`jot -r 1 $RAN_STA $RAN_END`]