From 88923485a0fb94e50a57369537481dde310aacf9 Mon Sep 17 00:00:00 2001
From: Elisa <20030784@studenti.uniupo.it>
Date: Mon, 25 Jul 2022 15:47:36 +0200
Subject: [PATCH] tolto 2 sensori di movimento
---
antifurto/res/CONF/deltaSensoriMovimento.json | 2 +-
antifurto/res/CONF/zona.json | 2 +-
antifurto/src/code/SubscribeCallback.java | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/antifurto/res/CONF/deltaSensoriMovimento.json b/antifurto/res/CONF/deltaSensoriMovimento.json
index cfa0e95..54e8762 100644
--- a/antifurto/res/CONF/deltaSensoriMovimento.json
+++ b/antifurto/res/CONF/deltaSensoriMovimento.json
@@ -1 +1 @@
-{"IN6":33,"IN5":5,"IN2":4,"IN1":33,"IN3":8}
\ No newline at end of file
+{"IN2":4,"IN1":33,"IN3":8}
diff --git a/antifurto/res/CONF/zona.json b/antifurto/res/CONF/zona.json
index c2f6770..a702f5b 100644
--- a/antifurto/res/CONF/zona.json
+++ b/antifurto/res/CONF/zona.json
@@ -1 +1 @@
-{"interruttore":"IN0","sensoriMovimento":["IN1","IN2","IN3","IN5","IN6"],"outputSuono":"OUT0", "nomeOutputAntifurto":"OUT1"}
+{"interruttore":"IN0","sensoriMovimento":["IN1","IN2","IN3"],"outputSuono":"OUT0", "nomeOutputAntifurto":"OUT1"}
diff --git a/antifurto/src/code/SubscribeCallback.java b/antifurto/src/code/SubscribeCallback.java
index 77e98d5..39a6425 100644
--- a/antifurto/src/code/SubscribeCallback.java
+++ b/antifurto/src/code/SubscribeCallback.java
@@ -211,6 +211,7 @@ public class SubscribeCallback implements MqttCallback{
json.put("interruttore", nomeInterruttore);
json.put("sensori-movimento", Antifurto.getSensori());
json.put("output-suono", nomeOutputSuono);
+ json.put("output-antifurto", nomeOutputAntifurto);
json.put("soglia", Esecutore.getSoglia());
json.put("allarme", automa.getStatoSuonoTrueFalse());
json.put("valore-attuale", esec.getValore());
--
GitLab