diff --git a/antifurtoMicroservizio/bin/code/.gitkeep b/antifurtoMicroservizio/bin/code/.gitkeep deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/antifurtoMicroservizio/bin/code/Antifurto.class b/antifurtoMicroservizio/bin/code/Antifurto.class index d6f4ba9bea18666d38d728c79280722453be486a..7ba10aa3dc11a49844d2936c44f00ca5bf6e2541 100644 Binary files a/antifurtoMicroservizio/bin/code/Antifurto.class and b/antifurtoMicroservizio/bin/code/Antifurto.class differ diff --git a/antifurtoMicroservizio/bin/code/Automa.class b/antifurtoMicroservizio/bin/code/Automa.class index 9ee24747ba7dfbd2afb48f9cf9bbb09b3eade611..0857fc703aca582e3be1e7fd5764a13efe7ab816 100644 Binary files a/antifurtoMicroservizio/bin/code/Automa.class and b/antifurtoMicroservizio/bin/code/Automa.class differ diff --git a/antifurtoMicroservizio/bin/code/Esecutore.class b/antifurtoMicroservizio/bin/code/Esecutore.class index 1fc1e97c6cefdfc2062e12a2a78255e6b47fab53..13992791c175bfc38c3ea876bf1cc63c4b68a773 100644 Binary files a/antifurtoMicroservizio/bin/code/Esecutore.class and b/antifurtoMicroservizio/bin/code/Esecutore.class differ diff --git a/antifurtoMicroservizio/bin/code/Helper.class b/antifurtoMicroservizio/bin/code/Helper.class index ea26265fab53cc99cd4b3c07b1b7eacf98dfec5b..f7837f33f2e069d637ee8e4960de41fbd7a900c8 100644 Binary files a/antifurtoMicroservizio/bin/code/Helper.class and b/antifurtoMicroservizio/bin/code/Helper.class differ diff --git a/antifurtoMicroservizio/bin/code/MyQueue.class b/antifurtoMicroservizio/bin/code/MyQueue.class index 50ac71d1e9f4ea9afa31bd320196bcda41a7245b..ed2e5723fce7851871a4a9af7d4f0488a9fd9085 100644 Binary files a/antifurtoMicroservizio/bin/code/MyQueue.class and b/antifurtoMicroservizio/bin/code/MyQueue.class differ diff --git a/antifurtoMicroservizio/bin/code/Pair.class b/antifurtoMicroservizio/bin/code/Pair.class index 86b1dcf26b53593f2adc887c6453e5aa817d353f..bc35695cbabdef40977fd46aa1e90872db7492b9 100644 Binary files a/antifurtoMicroservizio/bin/code/Pair.class and b/antifurtoMicroservizio/bin/code/Pair.class differ diff --git a/antifurtoMicroservizio/bin/code/Publisher.class b/antifurtoMicroservizio/bin/code/Publisher.class index 4d607d806d239c2b6883e4b242d430e7d963e18a..8de9acadd209f5f38899e2483f883717d2e272e2 100644 Binary files a/antifurtoMicroservizio/bin/code/Publisher.class and b/antifurtoMicroservizio/bin/code/Publisher.class differ diff --git a/antifurtoMicroservizio/bin/code/SubscribeCallback.class b/antifurtoMicroservizio/bin/code/SubscribeCallback.class index 14ba243c7875a098da4b00884d3c97d5396620ef..5bcb3204c2279abda8c624facbde1ad1e061ac69 100644 Binary files a/antifurtoMicroservizio/bin/code/SubscribeCallback.class and b/antifurtoMicroservizio/bin/code/SubscribeCallback.class differ diff --git a/antifurtoMicroservizio/bin/code/Timer.class b/antifurtoMicroservizio/bin/code/Timer.class index 453e7f52694373063e3dfdbee7b4c29d1ec4ba84..d654725c207e22d4edc0a4be7b852efbcda43a88 100644 Binary files a/antifurtoMicroservizio/bin/code/Timer.class and b/antifurtoMicroservizio/bin/code/Timer.class differ diff --git a/antifurtoMicroservizio/res/stato.json b/antifurtoMicroservizio/res/stato.json index cfa7ea4736ba49bb4b3576258b247941bb1e7708..6f0298e6f7103575cc186f3d9419eb6a93ed009d 100644 --- a/antifurtoMicroservizio/res/stato.json +++ b/antifurtoMicroservizio/res/stato.json @@ -1 +1 @@ -{"soglia":30,"stato":0,"valore":0,"tempoAllarme":"2022-11-19T10:25:14.275028"} \ No newline at end of file +{"soglia":30,"stato":0,"valore":0,"tempoAllarme":"2022-11-20T18:55:59.768946"} \ No newline at end of file diff --git a/antifurtoMicroservizio/src/code/Antifurto.java b/antifurtoMicroservizio/src/code/Antifurto.java index de6eadb5a6675488204237acaefc08af2aa66a89..e55f6bc9852a7084941d8620feaf1f3c7b90e145 100644 --- a/antifurtoMicroservizio/src/code/Antifurto.java +++ b/antifurtoMicroservizio/src/code/Antifurto.java @@ -50,8 +50,11 @@ public class Antifurto { private static String mqttDomain; private static String mqttSubdomain; - private final String CONF_FILE = "../res/CONF/conf.json"; - public static final String CONF_ZONA = "../res/CONF/zona.json"; + public static final String PATH_BB = "/home/debian/CONFIG/antifurto"; + + private final String CONF_FILE = PATH_BB + "/res/CONF/conf.json"; + public static final String CONF_ZONA = PATH_BB + "/res/CONF/zona.json"; + public Antifurto(Automa automa) throws JSONException, IOException, MqttException { this.automa = automa; @@ -108,9 +111,9 @@ public class Antifurto { MqttConnectOptions options = new MqttConnectOptions(); options.setCleanSession(false); if(brokerUrl.contains("luci.local")) { // devo connettermi al mosquitto della beaglebone - caFilePath = "../certificates/beaglebone/caGruppo2.crt"; - clientCrtFilePath = "../certificates/beaglebone/clientGruppo2.crt"; - clientKeyFilePath = "../certificates/beaglebone/clientGruppo2.key"; + caFilePath = PATH_BB + "/certificates/beaglebone/caGruppo2.crt"; + clientCrtFilePath = PATH_BB + "/certificates/beaglebone/clientGruppo2.crt"; + clientKeyFilePath = PATH_BB + "/certificates/beaglebone/clientGruppo2.key"; options.setUserName("gruppo2"); options.setPassword("funziona".toCharArray()); diff --git a/antifurtoMicroservizio/src/code/Automa.java b/antifurtoMicroservizio/src/code/Automa.java index 6481fb8c5a0a72d69538088c6bf0c7c0e9da3c31..dfdf869f633e04b2ae4a6beddfce0f6e10f9380c 100644 --- a/antifurtoMicroservizio/src/code/Automa.java +++ b/antifurtoMicroservizio/src/code/Automa.java @@ -12,9 +12,9 @@ public class Automa { private int statoAttuale; private String statoInterruttore; private String statoSuono; - private static final String FILE_AUTOMA = "../res/automa.json"; - public static final String FILE_STATO = "../res/stato.json"; - public static final String FILE_DELTA_SENSORI = "../res/CONF/deltaSensoriMovimento.json"; + private static final String FILE_AUTOMA = Antifurto.PATH_BB + "/res/automa.json"; + public static final String FILE_STATO = Antifurto.PATH_BB + "/res/stato.json"; + public static final String FILE_DELTA_SENSORI = Antifurto.PATH_BB + "/res/CONF/deltaSensoriMovimento.json"; public Automa() throws JSONException, IOException {