From 23d49a5787b7b2e18b2a44863544dac0ca03532e Mon Sep 17 00:00:00 2001
From: Elisa <20030784@studenti.uniupo.it>
Date: Mon, 25 Jul 2022 15:02:15 +0200
Subject: [PATCH] risolto alcuni errori

---
 antifurto/bin/code/Esecutore.class | Bin 4046 -> 4081 bytes
 antifurto/res/stato.json           |   2 +-
 antifurto/src/code/Esecutore.java  |   3 ++-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/antifurto/bin/code/Esecutore.class b/antifurto/bin/code/Esecutore.class
index e5c632a21e44d6bef8a89c8062d1b7beae587149..e24fea388535f4190506bc649548f272b0ddc74b 100644
GIT binary patch
delta 1358
zcmZ9LYfzMB6vuzh-rkpocd^l+)EcJCIL3@Ij?@$wg-Hb>o34mxnk(VD1gyY<nALW*
zOuG46hGiEk=^`bpE)HW&n)RV6zBSYL`qtI*OH(eL=UpbO5AXjx=klC${^vaJWa+um
z^jEowPk{>l(A3gbz;gNx>@YB3V5h|c7Q1X7)I7w)nh<H5dLth({zq*Zw8+P79=C}a
z`xBZc*=?Lp8F)HS-SG7{nms(DvDjO{AkSJnr<s?g&*phK@PdIC4eZmn?AN@+%N7ST
zSM!R=KV%XdH0kBat46+Nb4c?#Z`izPbh-EzhfRsMZQikY*XD@nWY~Z>L%gSXpAQUt
zXtEu(moQ@DKQh!lwm7D#V$@<xa|@%UYR1$*Zkjn^AS-+_H>lmp+GTM{CX+ei)9SKj
z;tqFkr$dCh9ahrlu!`00_x@#zn>p=phR+@9S>ez_ha%XUilvecXZg(H6NfMO(jm$k
zhXz)-YXd!@Hi!FYb0-5ms@tsz&WVcQM}AV2BzxlJ?Y+sa^7?3`v38)fZF?$_>~i>-
zxMEIwtUp$sNS4<{E^>96_I}}4hu=8o@Vil)SerQ<Jnx@X6mLsKO*=Jxsbpu&-CuBM
z!*Y2GVB<5SP~0V&k2?8;gPgVL)3XUxPYQ2O3Tsaa8IjtQ5m_KPnpuaR7I#p`)q3~5
zUQ)e5Jo8ag5)`ty$6}+!CX0J5He1BRxkbK^6s?kN<XdPJP39u$THLn6s}`^KB9!0)
zv27)8JkskA1f(eH+p^<?Zwv_fvs^x;#xvuEC8}^+-f;a8o80f5(!ix9mUb^V6^Wa&
zESejfT{K2<mW9o7yd)ob^R#N8q;fddQW=~Z%(8Si7s;QhhjX>lMGoew%Cg)#oU4#t
zTh)j<CjA>ZAuN2Dj`wk`yEnWsy@fh8$Vzp9Ms<XU8lg#|SE(^pt8qC`5LKsGqfX2D
zEbG*ya5F<|LQlzHf-*GGg#DE4Ca)>cX8%Rw-=t)Q7pSz@7Wk9vrnqJ%LRlp0EYj^$
zGNhR-lIear@)KmC^y-uBj?nVWKgn%bYDT?khJp5cn<<n%Ddc@k-&!PgvyE_>|Ac^C
z&9ZFfT9Lc}WPw3hp+kDBl<&%KQ_NR*Hz6RyKPtNNW)<?R3BlyQkynalssyD#`2V4u
zl5{)W5+Dyjk{S|T(%VNwUYxYBTSDc3l#mv;W7dMDmGd$b&vaWNeL^2$`YC3Iyww3p
P+4-Mmspyp$AE|!;t+xJ+

delta 1350
zcmZ9LX>3$g6vuyeIy3jpn>U3Ztpb`xO$au@+DO!tS_Q3A=mKq#+JdxBciT>#P8S6n
zSKN#G+zN_S#A2mlJ7pwB3Ajax`o#~%Pkt6x{ASdt=e}uDbdq<LdzSk@|8wVD!8ZlT
zGno%g0&Dog<`#xRlrwC^h!OV~aj#~VX1B#2oBK%G1i9a0lhF^D_=6Tzw&;f}9=51A
z=a1Oz<xvxS%!tSRWtCrjZSw?A+Gw5%@ie2FeKyOJ3|TxQ2G1JtoDr_g^Sog5A}?uP
zwz-Tk(|^BdaKN;el2?p=)#9MdYm8gGZhR?xgG1(uH!TiZyk#+AkQ^~Wf<fN4ndBWK
zj+$;$foo-U^9xwKYsNdKdC#VlY0ZpH8Pn$Gl)*4-03A0XEi<Kx)n27{Yd#cqQYU@3
zy0C#xhg;d;u$e6m)zmoDQs@4Vv%a{2(+(f=iNhu;9R}!C1O^f<iI~HuoYH*c@EM;w
z)U(y0ib}WE9}l)Ww9)RK@yC;Khwu4Op?5`lTT8Cm<8YRr6#21uM^X1ctgmQeT}^fQ
zNVKg#(G}}+_?b?{1>G$}Ek#|iqKcaHLVX73FZ}B88^1f8Gwy9{Q{+Ztt!+i+18vd4
zL@eH>SnSpJwDfhPP6fWpagT%!G?mLM0SliQ6-9-3J~qlHlZkB`^xl~e;AvsQ)53+P
zWkk`oxl?pVdNgo5IW)Ql?GDxC2E$jEZI{Rj)SRRSH9ItSXm)CvH7%MuB^Z@2D3_MX
zj<OJ1#S^xqU86f3zO=Z>%TOX$%2@}UCL&nB#V?nlz9^g}a*bbPPMV9x)MV<*aJ~w6
zXAiC%quD*{6a@40^-`{LBat<YC23YK3oOZ<Aur9UZDLv{SUZtvF9|FQq`7_~vps9w
zFp;U9@4G*<p)k#j6Pa}aFRI4XA%Sf4lmPc(K#p>`I~m!LY^6etQl-YIR^!x5=4N%6
zEoxHiDQeX*>eQ^*@5`=E3ulI-t=MzILqIqZPllZnHnN@)Z^>U&|4l+D`-f6Zm;X<$
zm}BWehSGFbXzrRLlsvDCbn2luOBkyJr%$>&GLmn_3D%`qKkeOS(A!>YCt;c;U*6Vy
z)oM96<VOl~j*F1eG&e1j<;ud%76Y_mUU>)|n_u4IMS0x|%QOA@vk@t{L_E_qAPpl&
z#ZVrFLGQ3fy4+1%Y}qpxd%(ay!_8Cw%j}m-`437)qq}d>%F?yVQ{*jx%NJOXAi^Md
U49QCzrht+EJUS(D^YRD(1=oN6I{*Lx

diff --git a/antifurto/res/stato.json b/antifurto/res/stato.json
index a8a6224..0645a2f 100644
--- a/antifurto/res/stato.json
+++ b/antifurto/res/stato.json
@@ -1 +1 @@
-{"soglia":30,"stato":0,"valore":0,"tempoAllarme":"2022-07-24T19:48:50.175953"}
\ No newline at end of file
+{"soglia":100,"stato":1,"valore":0,"tempoAllarme":"2022-07-24T20:28:17.430601"}
\ No newline at end of file
diff --git a/antifurto/src/code/Esecutore.java b/antifurto/src/code/Esecutore.java
index 77614b9..2a52fda 100644
--- a/antifurto/src/code/Esecutore.java
+++ b/antifurto/src/code/Esecutore.java
@@ -39,7 +39,7 @@ public class Esecutore extends Thread {
 	}
 	
 	public void run() {
-		final long DURATA_SUONO = 5; // l'allarme dura 5 minuti e poi smette di suonare. 
+		final long DURATA_SUONO = 1; // l'allarme dura 1 minuti e poi smette di suonare. 
 		int delta;
 		int valoreToSend = valore; // ogni volta che aumento / diminuisco il valore di 5, notifico la web app pubblicando un messaggio 
 		while(true) {
@@ -75,6 +75,7 @@ public class Esecutore extends Thread {
 						}
 					}
 					statoJson.put("soglia", soglia);
+					statoJson.put("stato", automa.getStatoAutoma());
 					Helper.scriviFile(statoJson, Automa.FILE_STATO); 
 				}
 				catch (JSONException e) {
-- 
GitLab