From 9bbe2030328cfeb65469080afea2b8ad316518fd Mon Sep 17 00:00:00 2001 From: rtrimana Date: Fri, 31 Aug 2018 16:31:51 -0700 Subject: [PATCH] Merging --- .../src/main/java/edu/uci/iotproject/Main.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 1976870..669f7c0 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 @@ -84,10 +84,10 @@ public class Main { // final String deviceIp = "192.168.1.135"; // 6) TP-Link Bulb August 1 experiment -// final String inputPcapFile = path + "/2018-08/tplink-bulb/tplinkbulb.wlan1.local.pcap"; -// final String outputPcapFile = path + "/2018-08/tplink-bulb/tplinkbulb-processed.pcap"; -// final String triggerTimesFile = path + "/2018-08/tplink-bulb/tplink-bulb-aug-3-2018.timestamps"; -// final String deviceIp = "192.168.1.246"; + final String inputPcapFile = path + "/2018-08/tplink-bulb/tplinkbulb.wlan1.local.pcap"; + final String outputPcapFile = path + "/2018-08/tplink-bulb/tplinkbulb-processed.pcap"; + final String triggerTimesFile = path + "/2018-08/tplink-bulb/tplink-bulb-aug-3-2018.timestamps"; + final String deviceIp = "192.168.1.246"; // 7) Kwikset Doorlock August 6 experiment // final String inputPcapFile = path + "/2018-08/kwikset-doorlock/kwikset-doorlock.wlan1.local.pcap"; @@ -138,10 +138,10 @@ public class Main { // final String deviceIp = "192.168.1.246"; // .246 == phone; .127 == Nest thermostat // 15) Alexa August 16 experiment - final String inputPcapFile = path + "/2018-08/alexa/alexa.wlan1.local.pcap"; - final String outputPcapFile = path + "/2018-08/alexa/alexa-processed.pcap"; - final String triggerTimesFile = path + "/2018-08/alexa/alexa-aug-16-2018.timestamps"; - final String deviceIp = "192.168.1.225"; // .246 == phone; .225 == Alexa +// final String inputPcapFile = path + "/2018-08/alexa/alexa.wlan1.local.pcap"; +// final String outputPcapFile = path + "/2018-08/alexa/alexa-processed.pcap"; +// final String triggerTimesFile = path + "/2018-08/alexa/alexa-aug-16-2018.timestamps"; +// final String deviceIp = "192.168.1.225"; // .246 == phone; .225 == Alexa // August 17 // final String inputPcapFile = path + "/2018-08/alexa/alexa2.wlan1.local.pcap"; // final String outputPcapFile = path + "/2018-08/alexa/alexa2-processed.pcap"; -- 2.34.1