From 8a5e499eb73fe95f25a49a96f06e3d7f2f8a0268 Mon Sep 17 00:00:00 2001 From: WickedJack99 Date: Fri, 11 Mar 2022 01:35:25 +0100 Subject: [PATCH] Fusing application to one --- bin/Backend/Runtime/Environment.class | Bin 4217 -> 4355 bytes .../PIC_SIMULATOR_GUI_JAVA/Main.class | Bin 553 -> 0 bytes .../ReadBackendToFrontendFile.class | Bin 530 -> 0 bytes src/Backend/Runtime/Environment.java | 3 +++ src/Frontend/PIC_SIMULATOR_GUI_JAVA/Main.java | 10 ---------- .../ReadBackendToFrontendFile.java | 12 ------------ 6 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 bin/Frontend/PIC_SIMULATOR_GUI_JAVA/Main.class delete mode 100644 bin/Frontend/PIC_SIMULATOR_GUI_JAVA/ReadBackendToFrontendFile.class delete mode 100755 src/Frontend/PIC_SIMULATOR_GUI_JAVA/Main.java delete mode 100755 src/Frontend/PIC_SIMULATOR_GUI_JAVA/ReadBackendToFrontendFile.java diff --git a/bin/Backend/Runtime/Environment.class b/bin/Backend/Runtime/Environment.class index 3b0048104915a342e08767af6ce7775f33a9d3b7..c1dd12b3bfe1fbd1fe709fc059d2fcf5af06abe4 100644 GIT binary patch delta 2040 zcmb7EYfw~W7=FIpvwN1qAul7|kc%4$ESJ@2DL@faE{h8i2m~dx%B3Y-Xjv__TyJHf znRT*^vNR;RsEM+R6P5O-W}0q)`qQ8O=S&LfBx0f6xLyUOlvZ^aw-CS{$QuS!&&Fv*xul-Y4ntB-BRCP+30SsE^8`t64ZEo z{)&KiXQzgAq^QU=+Dy*m45Y+CAX~>GBubR4V+j&fI0ed#F~x3tZ(5mCfGng!hYFiSRXPne4SA^6u^CAMmVux*5Y&*5YUxm` zLjzN0pial5s25Ou1LZsWgL?$bnOUv!%~l6&R%0sNm%lj z!2IaZ>+g0p1Oq;Qw~AKdvf{F};0f9MHshAEoQHNDPr_>?SX?XeutP_OEJ*3;^Z8{x zJ2Z5|r{XE2&2qo!F%DTeiY;Ao>;ie7|FfoIfz&SJ2UE&5tMx~d^<^E$FlhX0OWS-x zV8Lv$ZZ5vNGoax(PU?6Srvz+1f3V5hyNfy5zFR{oUe{sBSIU5IFBNbcr**uEw~X?* z4C~uEhVYINh_hSI>UfV?hT^sqjOx%4FA(3|8T5Duf*zm0Qx5wR9SPE|(O$pHAN0xA zm}YttmyJ~I_t2Lxb9cbEjtL|?CXw1Qft6v{Cy`FH%0p8IK~@-!S(r14ycWke7_+)& z68RG6Ou$t;i2^!5Ql!wgkf=C}wS*;vrD2pg7H$lqeEM0L6M;K75`xEJ4x?riPRSR+ zmLWXgh{A@OXbz)t5-pOyasrPRS(aJo)7H#$jcIu5Cz5Q>ji7TBT9I{`HG-}&wmpt7 zaD%%w<7sx*LqPypP>_as$mW&Fg`EP;#cC9Wumcqq2@bK%z(A%$9e=&is!Ha zFJKc6paO%a#2Hj!1a4fUZJheOj(R3*z}HmlH)uvLQ&mL=ik`W~JNB)z=5zEqbo8>N&7x9vDBOxnv^d^o+@JiA-Sd@|@ zibzyA6ng}(ouB$Gc?iAolyn_$L~y2g6x&QC<^pAu;-fiHiC{K-UZPSm6I!6$P4r8$ z=>qKXWpV`Xl4h~QW{E>HA!n!l9AkY^Ew*AYaUWam=XWxIc*3*=;L`m4)b>eCvcRXkU>iF7(Sr1W~DbQ2U^NRz%brt61n|h zoWptUC>}+0KhJ{hakrc%Hwr6-qdZKy6l|JvCD3vXBdtW?#;}9-uHR_&+|V2|2tg;|4cD{ z`uF?0gM%#O#x0}KrTDE`s(+HfR3>MlP-HS5uZ{dBPvg}owtjWhWCWOL@(d+bu{u|o zWrfrlPbo8X=33X)a?czl>pXA$rA~V)=^)1#9+BoG!>%QjIniNW{-(3aPb$v{+K_eUNlWkP+ z7S*?ec7;l!p;&Xtx_Cz<)?DFhv?E?N*~}|em3!W#09#E$c4t~kTO?*Tw$)%eJ9NU< z8TWHav-O>OyDNW(^|vjMqnEVS9LAm^@*x8?wH3XDl9Rb;{J)n_pYq#-E8^R6M|4e?NKt z0rEHW^K6m=fl~!ePg3{@`UVJW@PA8TKQrnFD7CS#pV_Mhm?OdSR!eA5!2Bd-0xJYA zOj79|w>Zhtp=VVfMNM&vTECj4u8%~CO_!p+hiQHXHr!)K(iWN($xsSXoV+;rTV4-Q`z!Yj-6^c5J~q25)u7fVUXx|7mf}%*wpXhh zP7P}RC;BDNby;qNq~xXeSZF5LShaCtIOY7{gIh9O$9fx?AUG0X|2;~mFP{Ie0g+oPuk=!=|f2jo51CmRz~{O^--lSrOmz~7xMAG%SJosO4{UW da^alhU_h$b(^G5>N1ph`h)m_-WpbMP=0AsJPpkj{ diff --git a/bin/Frontend/PIC_SIMULATOR_GUI_JAVA/Main.class b/bin/Frontend/PIC_SIMULATOR_GUI_JAVA/Main.class deleted file mode 100644 index 82d25a31011d2301729ddfbdfa3862e82d486c40..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 553 zcma)2T}uK%6g{(k>_?WCW%U?DXoUL%tY8rgW6elih#q9r$wqV*wzdD&lTgqP=tpID zOt6Q*=HbqqbMKsc?*06F`uNy{%Wft$L&5d+p|3_o`FxUVDM( zHn>zKk_@>Kf8p+!tD)QMjYL0YNS{k3<4cA_u@o>QtKmR6NWjh@g)~FfmrC4BCp{6h zd2cKjcKoo<#{rL|#!E68Kgnl?6aPP6D%58}o)`+n2Y=l#N2xrj_>PG?V9~A(YJw09riy{m#8oqt2@cjaDaHSCVMsLb1N)ER6Xt{j<>7B^g1ixPxvxj+Izj4$dptZN zNLH#AfzmiqxvGQCa>M zd+Ub*_r~?Al?B13f;FTF3I_Ms_3UBD0+SA1MxYwLLtTpoJnFwdDZJxTg1WH^|L;qQ zta9I<1rCdn6CD0|Q!UDiBVjTLh>FN*{36j!1dI)dGpz4r+|9)P0& diff --git a/src/Backend/Runtime/Environment.java b/src/Backend/Runtime/Environment.java index 6d6e5d9..293c02e 100755 --- a/src/Backend/Runtime/Environment.java +++ b/src/Backend/Runtime/Environment.java @@ -16,6 +16,7 @@ import Backend.FrontendCommandProcessing.CommandDecoder; import Backend.FrontendCommandProcessing.FrontendCommandProcessingThread; import Backend.Microcontroller.PIC; import Backend.Microcontroller.WATCHDOG; +import Frontend.PIC_SIMULATOR_GUI_JAVA.GUIMainFrame; public class Environment { @@ -39,6 +40,8 @@ public class Environment { public Environment() { + GUIMainFrame frame = new GUIMainFrame(); + frontendToMainQueue = new ConcurrentLinkedQueue(); mainToFrontendQueue = new ConcurrentLinkedQueue(); diff --git a/src/Frontend/PIC_SIMULATOR_GUI_JAVA/Main.java b/src/Frontend/PIC_SIMULATOR_GUI_JAVA/Main.java deleted file mode 100755 index ffb4cd9..0000000 --- a/src/Frontend/PIC_SIMULATOR_GUI_JAVA/Main.java +++ /dev/null @@ -1,10 +0,0 @@ -package Frontend.PIC_SIMULATOR_GUI_JAVA; - -import javax.swing.JLabel; - -public class Main { - public static void main(String[] args) { - - GUIMainFrame frame = new GUIMainFrame(); - } -} \ No newline at end of file diff --git a/src/Frontend/PIC_SIMULATOR_GUI_JAVA/ReadBackendToFrontendFile.java b/src/Frontend/PIC_SIMULATOR_GUI_JAVA/ReadBackendToFrontendFile.java deleted file mode 100755 index 179f89b..0000000 --- a/src/Frontend/PIC_SIMULATOR_GUI_JAVA/ReadBackendToFrontendFile.java +++ /dev/null @@ -1,12 +0,0 @@ -package Frontend.PIC_SIMULATOR_GUI_JAVA; - -import java.io.File; - -public class ReadBackendToFrontendFile { - File backendToFrontendFile = new File("../SIMULATOR_DAT/gui_set.dat"); - - - public ReadBackendToFrontendFile () { - - } -} \ No newline at end of file