lkjhgf

e9295ba5 · Elisa Giglio · 9db51f3b · e9295ba5 · e9295ba5 · e9295ba5
Commit e9295ba5 authored 2 years ago by Elisa Giglio
--- a/antifurto/src/org.eclipse.paho.client.mqttv3_1.2.5.jar
+++ b/antifurto/src/org.eclipse.paho.client.mqttv3_1.2.5.jar
--- a/antifurto/src/org.json-1.0.0.v201011060100.jar
+++ b/antifurto/src/org.json-1.0.0.v201011060100.jar
--- a/antifurto/src/org.json-chargebee-1.0-javadoc.jar
+++ b/antifurto/src/org.json-chargebee-1.0-javadoc.jar
--- a/antifurto/src/CONF/conf.json
+++ b/antifurto/src/CONF/conf.json
@@ -3,5 +3,7 @@
    "homedir": "./home",
    "broker": "localhost",
    "protocol": "tcp",
-    "port": 1883
+    "port": 1883,
+    "mqttDomain": "gruppo2",
+    "mqttSubdomain":"luci"
 }
--- a/antifurto/src/CONF/deltaSensoriMovimento.json
+++ b/antifurto/src/CONF/deltaSensoriMovimento.json
--- a/antifurto/src/CONF/zona.json
+++ b/antifurto/src/CONF/zona.json
@@ -5,5 +5,5 @@
      "IN2",
      "IN3"
    ],
-    "outputSuono":"OUT3"
+    "outputSuono":"OUT0"
 }
--- a/antifurto/src/automa.json
+++ b/antifurto/src/automa.json
--- a/antifurto/res/stato.json
+++ b/antifurto/res/stato.json
+{"stato":0,"valore":0,"codaVal":[],"codaMsg":[{"msg":{"status":{"stato":0,"interruttore":"off","allarme":"off"}},"topic":"from/gruppo2/luci/antifurto"},{"msg":{"status":{"stato":0,"interruttore":"off","allarme":"off"}},"topic":"from/gruppo2/luci/antifurto"},{"msg":{"status":{"stato":0,"interruttore":"off","allarme":"off"}},"topic":"from/gruppo2/luci/antifurto"}]}
\ No newline at end of file
--- a/antifurto/src/Antifurto.class
+++ b/antifurto/src/Antifurto.class
--- a/antifurto/src/Automa.class
+++ b/antifurto/src/Automa.class
--- a/antifurto/src/Conf.class
+++ b/antifurto/src/Conf.class
--- a/antifurto/src/Esecutore.class
+++ b/antifurto/src/Esecutore.class
--- a/antifurto/src/MsgQueue.class
+++ b/antifurto/src/MsgQueue.class
--- a/antifurto/src/MyQueue.class
+++ b/antifurto/src/MyQueue.class
--- a/antifurto/src/Pair.class
+++ b/antifurto/src/Pair.class
--- a/antifurto/src/Publisher.class
+++ b/antifurto/src/Publisher.class
--- a/antifurto/src/SubscribeCallback.class
+++ b/antifurto/src/SubscribeCallback.class
--- a/antifurto/src/Timer.class
+++ b/antifurto/src/Timer.class
--- a/antifurto/src/ValQueue.class
+++ b/antifurto/src/ValQueue.class
--- a/antifurto/src/Antifurto.java
+++ b/antifurto/src/Antifurto.java
+package code;
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
@@ -28,8 +29,8 @@ public class Antifurto {
 	private static String mqttDomain;
 	private static String mqttSubdomain;
 	
-	private final String CONF_FILE = "../CONF/conf.json";
-	private final String CONF_ZONA = "../CONF/zona.json";
+	private final String CONF_FILE = "../res/CONF/conf.json";
+	private final String CONF_ZONA = "../res/CONF/zona.json";
 	public Antifurto(Automa automa) throws JSONException, IOException, MqttException {
 		this.automa = automa;