diff --git a/antifurto/res/CONF/deltaSensoriMovimento.json b/antifurto/res/CONF/deltaSensoriMovimento.json index cfa0e95aa9e9ab6f6f34b4d0551f0d768eb874b0..54e876224801c257831395165991aea616deb60b 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 c2f6770ef6fe0867b1f4cfecf8c86bfff55a5e90..a702f5b9fb5a0945b7c8b9d7d1866e3785bde0a6 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 77e98d5f8e498a40a368c2ded67c2499c39fe902..39a64256237330da7ce02e3d25a06f0fdbb156ef 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());