From: rtrimana <rtrimana@uci.edu>
Date: Mon, 17 Sep 2018 23:30:54 +0000 (-0700)
Subject: Resolving conflict.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f314a6e02dad77f006f7acea08d3304569fc5ea9;p=pingpong.git

Resolving conflict.
---

f314a6e02dad77f006f7acea08d3304569fc5ea9
diff --cc Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java
index 6dbd63b,8c83363..0f837b2
--- a/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java
+++ b/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java
@@@ -92,14 -96,7 +96,14 @@@ public class Main 
  //        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!)
+ 
 +        // September 12, 2018 - includes both wlan1 and eth1 interfaces
 +        //final String inputPcapFile = path + "/2018-08/kwikset-doorlock/kwikset3.wlan1.local.pcap";
 +//        final String inputPcapFile = path + "/2018-08/kwikset-doorlock/kwikset3.eth1.local.pcap";
 +//        final String outputPcapFile = path + "/2018-08/kwikset-doorlock/kwikset3-processed.pcap";
 +//        final String triggerTimesFile = path + "/2018-08/kwikset-doorlock/kwikset-doorlock-sept-12-2018.timestamps";
 +//        final String deviceIp = "192.168.1.142"; // .246 == phone; .142 == SmartThings Hub (note: use eth0 capture for this!)
 +
- 
          // 8) Hue Bulb August 7 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";
@@@ -153,12 -150,6 +157,12 @@@
  //        final String triggerTimesFile = path + "/2018-08/alexa/alexa-aug-17-2018.timestamps";
  //        final String deviceIp = "192.168.1.225"; // .246 == phone; .225 == Alexa
  
 +        // September 17
-         final String inputPcapFile = path + "/2018-08/noise/noise.eth1.pcap";
-         final String outputPcapFile = path + "/2018-08/noise/noise-processed.pcap";
-         final String triggerTimesFile = path + "/2018-08/noise/noise-sept-17-2018.timestamps";
-         final String deviceIp = "192.168.1.142"; //  .142 == SmartThings Hub; .199 == dlink plug; .183 == siren
++//        final String inputPcapFile = path + "/2018-08/noise/noise.eth1.pcap";
++//        final String outputPcapFile = path + "/2018-08/noise/noise-processed.pcap";
++//        final String triggerTimesFile = path + "/2018-08/noise/noise-sept-17-2018.timestamps";
++//        final String deviceIp = "192.168.1.142"; //  .142 == SmartThings Hub; .199 == dlink plug; .183 == siren
 +
          TriggerTimesFileReader ttfr = new TriggerTimesFileReader();
          List<Instant> triggerTimes = ttfr.readTriggerTimes(triggerTimesFile, false);
          // Tag each trigger with "ON" or "OFF", assuming that the first trigger is an "ON" and that they alternate.