From e254d1b8ddfe7e9687113df5d0499f0fb4e38d52 Mon Sep 17 00:00:00 2001 From: Gazebo Date: Sun, 21 Jun 2020 19:54:03 -0300 Subject: [PATCH] ajustandoImagem --- .../src/main/resources/fxml/Scene.fxml | 2 +- Interface/Interface/target/Interface-6.0.jar | Bin 132235 -> 132226 bytes .../Interface/target/classes/fxml/Scene.fxml | 2 +- Sexta-Feira(A.I.)/Commands.py | 2 +- .../__pycache__/Commands.cpython-36.pyc | Bin 2940 -> 2948 bytes 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Interface/Interface/src/main/resources/fxml/Scene.fxml b/Interface/Interface/src/main/resources/fxml/Scene.fxml index a3929be..69ff33b 100644 --- a/Interface/Interface/src/main/resources/fxml/Scene.fxml +++ b/Interface/Interface/src/main/resources/fxml/Scene.fxml @@ -29,6 +29,6 @@ - + diff --git a/Interface/Interface/target/Interface-6.0.jar b/Interface/Interface/target/Interface-6.0.jar index b3b9e6b012f8097028d8eb18de66a7563604bca3..3e3b7025fb87a04a30ca5bde4516f44a1ec9df49 100644 GIT binary patch delta 2396 zcmaJ?3s_S}8ohIaAwZzugM}KJG+KFxKoG@>ENDe}?HXVewJI+WBCm=;iK!-{t01h1 zSsewUVsR@KyXvJrHlSteD%3|%bO~++OqEKDmH0XmZ#MD6$OeBa#j|NoqGX70Uz zZu0Y3Ie9F$FpOa~nP9P4gz{Js+mA%okScr~{Uf?k0f5KA7-z;M5h~PdZ>oyfGZw=P zJus)V7Qf&ErDlJG$wrck?Q0UXY|?nV#lCw?OqDw7jJiS&|F!NJx9jz~#Wb25XC|OL zW{l|s@LE4$QJ=d0Y$6J%YU$km2GMZ<;KOtMz=nDdTx*AK8?J6N?Zl_{uiG#IKZ3r5 z*%)T77s%Qgz2=ERW3`SGy#q_iVZphk6H5*|d|KWR6H~8=^}DWYZ?M|Xy7p|9`s-)4 z&pgT>&0H*aa(m(7biVbGo7?}r!e;QILsObq5^=`bBjoavqJ|yXXijIZhQa)oT-gv1 zHY)M8&{?(&X6!C&{yVXc4b2eSREr>+rX-1$O!JJ3q^l3BNL z7UwTpR|PuQNy{IYYxA=rrgyG!iOcxJ*UoHJ>ZLfhe}slI&hAkLpVve=L~?H0tj?5O zTXSl4HPbfIaPpTM3%%OwKY68f5M781-`2D!b#PD7;SQbGaEeA09H3F=Tb4JTJ7C{A z=;~`(wCjeQPNr)~Bu^636NTIi=kLDYu6^M1r>WT~i-uV%<6Yx&VBm5$tzWK3N6v0} z730Oyetn0N4 zULNVOyjovc-`CvyP{&vmdw0eCm7(u{_u;%cYhTTz3$9NuRmtXG3{8Csrw-^D({}1S zip}LPrCNQj={|=pUt{9E(u&OTaQhxi-%Fl}|x|w|; z@gago?J=j*H^o;n3S@@5s%_7Xo)7n1r4Nli_>}GSx3X_z>;KyJWE1&)W5jUIl>SFk z6c4@bOpGaPOsm^)g4MD)w0e8q7I3io>-e2V-81Lalz484e);(Mpk!{bDqxBFRb!st z=Wf1jx0#F|kMwG+qPL&!uHhZ!{TjmezL@6c7*tW7ELFa&;9l^*lfGP~Ile-h^uu1! zV!4I;L3O2c>+IqyR?RcCHQ~+CR}*)X&QYCQHn5~zy1eYqal!1HQfX|d{h9|OgfPsU zwRt3b*>#d2M$8G6kAEr@bCUdVgNu_^Vz`^M9)nMEHv-BFfpmf)W>e7e`bj?LE?CJ)4F-m&C#~7=6 zKp@7HQNV!{djSt8KD|JQaZfLZ#Q3NeL}B#QgD95r*h68)Wz~nURS)dp2|d8K2%FIo zMvp!aWq~QzJUNDYuuTu9z~g;1M}yWdXVxnkb4=J|Lic`pJ9)p!WBxENObrDC$V1mp zd$CXF!%tcBAmv+mSHfUj$;8;d2&~0RSMX9051ZL)&!*=P1Od@pjOO^@ zCd1ZYFi-KB$V?$mwuE^jfNhlc$QVHZ41&nDCJ6s=K8hxZ#w6xz-`@A35ED_a8i$z) zX{bphh>Xl6&;O^ecuS#!5u*V2k+CU&8_XRAT%1;*9w9fTDGJkg?(f>w#kZGn(9TXQ zg5bVoClo8rOY9Z-VyoYY3?=uy_aJf^ns1A)WMk2xE#x22#)k??4p|^U75*VL$;Oq( zsFEQw8h<6Td-pYX0kr&?+_-#3ZUr-dQ3bc7IyeAZ0r~#ScW)r4)bQ&O&p1 zG-1I4`~aLtQE_cs-1rKd`8ka3BkxE W5ly={+z8@-FwTse&W!H?sQep>)s+tb delta 2304 zcmZWq2~<xbe36QU znuZWAR{f~p)LN&91;yf*g4U`GDt?42;!r9>l_7yB!hiQAXldVCdHbGy_Br>QJG|`J z%_!W>un>gP=xmI^U|{v%C@mJ@;4lsyHA1a7Y`Z`mYQE(4mUkVyq29CT<>c3d? zb{re@j?W9xPVw;j*T6&-Wy2({gmqJ75a5<-0kd=*7!w^UYOT>iz?eIR$+%E44(y1^ zjRGUIGTJSE2s{&ba=a)$?RLq38~j%Oj3pOu^sO&FYrk%@L>VmK?kdk6U{&8bG&8PC zeXpZuLt(4VoBNCTmo_(#(=67Sm>qT;=51K?sB>$_4_9>SzTSe@ynxHCc< ztJRfTtDf|VltBlsTE|vYXR3oQe&m!IIM1@}VY94gsEj}0n%4Y-{Qm0o73RJ9UUhkF z59?nyI9+01pmlg#&Tq`Is?1VscZ>>)i2R^&WZ?Fyq8*!)yY9LQJ)W6c-udLn&KIWk zHf1i%XrBCXOi#=VZbSZ9*xK_EEq2dgudAtGXZ)uLp-l@ySKa6wi7uJE+n;lNe*1wK z+k(n}Vy^9$=_&L^X4zGF`>t%bm2J`z+B?$yTUO4`c|_@9cW0l528H!1XOGyQY`N#y z+V_H^5_UV&ONz9468?aHA?LjozL}ko<4^PZWc_uYJ{4cbL;b9dma$B7%tt7qm_oA<9zlv!~yd$n$mM=@Vf9_1w!&B-} zMHTyMt@sb?th$}AXB=4Ce6r=ardQgZV)@B25vSX$!A%lrz30%7+s9|UqSM6N?B^ai zHs)S=GG7roBR8dC=*+Scr>)*EIoYHPUj9F6UwO=njH1!?k>Qi4@4>XNmTg5F3$>X} z1#{Z3CAu`o)_;EJRoiZ!uYA@s<#T4Q-aq4

Qz~B08dDrEcmJ+)SmF9Yl0lW;b<{vgMP=%*l0RAl3eY zFl0U{FapSw?DK#x0ZxaJIL;#6zVt&Z5nIS)A(ZS}j#3ln%L`{A45`VY>Zz;clV+Z# zwpvpQUIvh3*fRunAxs+vfe61F2EhmihQVTlo+ChjaQg^YgRpf32pRR?v$x^LelBLy4nhoeOs<$%@*knNGG5u`Y#`ON1 z26WN^p(&dEbg`7%3R`u+78dIO)yXe9eT?HPu!ho9uv0(3tJmy#1p+88?(0k1J9_Rh z$)R%XU+d#i3|RkK-!Xd}tVI4z<9a_a4tPv7_q!tjhsJ>q2XPqrkf(%ttPH3J4;cIg zIHE*xZ-4_X7O8v^z2LWRfCb`e5Lb`5g^)R+=Nu+T&RtA$i($qDutT~%h;v9JxggkQ z(CJ9d?y3aCQn!kH1mOT@V^jZe&~p+v%z0(-{VP2+<*x#Ae;t4ylurT<%72j5gLL@g zB=`WC{iKPnld2?AC$%SzDpd#K4xnBgg?rCM{krc{%u^d-7~KNH=1%KZovAvW$@QFG zPn#h9+zZYrQrJcQT&D%d)PuM`m2`deAANUBFf4~$LC!QyX0ECz*GVnIE&jIJGp7mn zLM6cGp%yLxvfxL^v`06EO9dt+UD!VxkhhuKE6-_xJ&=dvAELly94C7(gpY81wkp4n z^|w~e`?4Otq+!?*@{=$KlRZC$(RAF!IBA&d G6Z=03Je+|5 diff --git a/Interface/Interface/target/classes/fxml/Scene.fxml b/Interface/Interface/target/classes/fxml/Scene.fxml index a3929be..69ff33b 100644 --- a/Interface/Interface/target/classes/fxml/Scene.fxml +++ b/Interface/Interface/target/classes/fxml/Scene.fxml @@ -29,6 +29,6 @@ - + diff --git a/Sexta-Feira(A.I.)/Commands.py b/Sexta-Feira(A.I.)/Commands.py index 056729b..f817a63 100644 --- a/Sexta-Feira(A.I.)/Commands.py +++ b/Sexta-Feira(A.I.)/Commands.py @@ -14,7 +14,7 @@ def dateTime(speech, connection): def updateFriday(speech, connection): Functions.speak('Certo. Estou baixando as atualizações de meu sistema') - os.system('git pull origin master') + os.system('git reset --hard origin/master') def sendCloseToInterface(speech, connection): connection.send(Functions.setRequestJson('setDevicesStatus', 'Interface', 0, '.com')) diff --git a/Sexta-Feira(A.I.)/__pycache__/Commands.cpython-36.pyc b/Sexta-Feira(A.I.)/__pycache__/Commands.cpython-36.pyc index bc2cd71dd07e9d4bcfe5e365a842b8018163efef..1c6132ea4137ad0e36b6fa80a01c357ab664b9c8 100644 GIT binary patch delta 49 zcmew()*{Yn%*)Hw`1pO?)s39LnIz@XGfNbTQj1ed6m)en5{pt4@{2OlGxPK}i!!Hk F006-D5i|0Bj}%*)Fq5%xCj>_*PtOoC$RnI#GZr8zkY`9+!OnRyDEWtr1C03V|bod5s;