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 b8b5b75afc00ef5ef49236535f3bfd1fe52d1ab4..8a0aa7fbc7cfff4ebbad836e16e5194700c4d420 100644 (file)
--- 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 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<Instant> triggerTimes = ttfr.readTriggerTimes(triggerTimesFile, false);
 
         TriggerTimesFileReader ttfr = new TriggerTimesFileReader();
         List<Instant> triggerTimes = ttfr.readTriggerTimes(triggerTimesFile, false);

diff --git a/automation/clicker.sh b/automation/clicker.sh
index f65601bfe74e17d049ae50fe8f0296a085b11d53..ba75e256ef309a7adfac590196ddefcf8fc7f29a 100755 (executable)
--- 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
        # 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
        # D-Link switch
        #./adb shell input tap 987 346
        # SmartThings


@@ -38,6 +38,8 @@ do
                # unlocking
        #       ./adb shell input tap 520 1211
        #fi
                # 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`]
        #date +%r
        #RAND=$[( $RANDOM % $RAN_END ) + $RAN_STA]
        #RAND=$[`jot -r 1 $RAN_STA $RAN_END`]