From 871dda7f97e8b838b275fa159071bf7a1fc7e7a4 Mon Sep 17 00:00:00 2001 From: openbuilds-engineer Date: Wed, 8 May 2019 21:06:34 +0200 Subject: [PATCH] Update --- CHANGELOG.txt | 1 + app/css/main.css | 4 + app/img/grbl.png | Bin 1123 -> 671 bytes app/img/grbltop.png | Bin 0 -> 1090 bytes app/index.html | 80 +- app/js/calibrate-x.js | 11 +- app/js/calibrate-y.js | 11 +- app/js/calibrate-z.js | 11 +- app/js/grbl-defaults.js | 11 +- app/js/grbl-flashing.js | 43 + app/js/grblsettings.js | 21 - app/js/keyboard.js | 1 + app/lib/3dview/3dview.js | 5 + app/lib/3dview/workers/gcodeparser.js | 39 +- app/lib/metro4/css/metro-all.css | 7696 ++----- app/lib/metro4/css/metro-all.min.css | 2 +- app/lib/metro4/css/metro-colors.css | 160 +- app/lib/metro4/css/metro-colors.min.css | 2 +- app/lib/metro4/css/metro-icons.css | 55 +- app/lib/metro4/css/metro-icons.min.css | 2 +- app/lib/metro4/css/metro-rtl.css | 4 +- app/lib/metro4/css/metro.css | 7489 ++----- app/lib/metro4/css/metro.min.css | 2 +- app/lib/metro4/css/schemes/darcula.css | 4 +- app/lib/metro4/css/schemes/red-alert.css | 4 +- app/lib/metro4/css/schemes/red-dark.css | 4 +- app/lib/metro4/css/schemes/red-mirohost.css | 4 +- app/lib/metro4/css/schemes/sky-net.css | 4 +- app/lib/metro4/css/third-party/datatables.css | 4 +- app/lib/metro4/css/third-party/select2.css | 4 +- app/lib/metro4/js/metro.js | 6874 ++++--- app/lib/metro4/js/metro.min.js | 6 +- app/lib/metro4/js/metro.min.js.map | 2 +- app/lib/metro4/mif/metro.json | 16859 +--------------- app/lib/metro4/mif/metro.svg | 17 + app/lib/metro4/mif/metro.ttf | Bin 143232 -> 145444 bytes app/lib/metro4/mif/metro.woff | Bin 143308 -> 145520 bytes grbl-2axes-closeddoor.hex | 1907 ++ grbl-2axes-nodoor.hex | 1907 ++ grbl-2axes-opendoor.hex | 1907 ++ grbl-3axes-closeddoor.hex | 1907 ++ grbl-3axes-nodoor.hex | 1907 ++ grbl-3axes-opendoor.hex | 1907 ++ grbl-servo-closeddoor.hex | 1907 ++ grbl-servo-nodoor.hex | 1907 ++ grbl-servo-opendoor.hex | 1907 ++ index.js | 2 + 47 files changed, 25785 insertions(+), 30816 deletions(-) create mode 100644 app/img/grbltop.png create mode 100644 app/js/grbl-flashing.js create mode 100644 grbl-2axes-closeddoor.hex create mode 100644 grbl-2axes-nodoor.hex create mode 100644 grbl-2axes-opendoor.hex create mode 100644 grbl-3axes-closeddoor.hex create mode 100644 grbl-3axes-nodoor.hex create mode 100644 grbl-3axes-opendoor.hex create mode 100644 grbl-servo-closeddoor.hex create mode 100644 grbl-servo-nodoor.hex create mode 100644 grbl-servo-opendoor.hex diff --git a/CHANGELOG.txt b/CHANGELOG.txt index cd086f2..01358e5 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,4 @@ +v1.0.167 (Coming soon): Improved Memory management for 3D Viewer, Added Inch Mode (Issue#59), Moved Steps/mm Calibration Tools to "Wizards and Tools" menu, Improved Grbl Flashing Tool and Moved to "Wizards and Tools" v1.0.166: Fix for ElectronSecondInstance Behaviour and Updated SSL Certificates v1.0.165: Surfacing Wizard v1.0.164: Fix for odd JS bug that affected users in v1.0.161 and 10.0.162 diff --git a/app/css/main.css b/app/css/main.css index 5678f72..bdef017 100644 --- a/app/css/main.css +++ b/app/css/main.css @@ -45,6 +45,10 @@ body { box-shadow: 0 0 2px 2px #ddd; } +#console > p { + margin-top: 5px; +} + #console { /*font-family: "Courier New", Courier, monospace;*/ font-family: "Lucida Console", Monaco, monospace; diff --git a/app/img/grbl.png b/app/img/grbl.png index 964029914c6b41b3251a4d842fd97a7a6c3a3eb2..37fe4834083a1abb4f692db90f849f7c8071480c 100644 GIT binary patch delta 635 zcmV->0)+kJ2%iNZiBL{Q4GJ0x0000DNk~Le0000K0000C2nGNE0AdWC`;j3re+38+ z2np*65rO~!0xU^HK~yNurINvm5@8s|-E)Pa*EQT`U&ojttA?@%%l(bixv*mgJ^2N>fAjYgvvkH;aC$wa2p>BHr6xuz(J<$0d> zcswsSjys4(qfhGfdegEj!Z6IS4)Qcj6HydF8Z%AvGQ%*$fA9DAbY0)k zG_C9N`P$)d_?;w4eTt$;B9XW%2*NFl@vomtlGKtU>4VKY&+luRw(IqJU$QJauys{c z_gI#FW3!?t??qAkEC|AlU@%Ak04kLVAONtOPUo55YUr)k>wslhYnEjftJUhT8-&IP zp}75sqNpE)kTu5md$-$#e}2EuYnt|r7De&Vcs$;6yWL+nj(d#|!iP(+7|XJbg3{^q zO#nFSa=G^1Zuh6*aG3S`{r8+s=PR0~SB7DX1A)L}0078lv*#5>X~?qt*6a1|%Cfu{ ziA1)O$>eSq=&8fuAf{a= Vs;%TOQkeh%002ovPDHLkV1gxGG9dr} delta 1091 zcmV-J1ibs71>*=IiBL{Q4GJ0x0000DNk~Le0000W0000K2nGNE0PK-JPmv)pe*qR0 z3JMhi=tlqm1Mo>iK~zY`rIyP}TuBthf7RV~w;g(XKosL552HlEptlchBjZudD+(JUlEwBO@b`4M;IUkpzH2$bb=Gz?e{P0DK#Oa=8pZ zEEXqJ0zwGGg?}=c1R#}4oxc)eAaOAXEQJYT7(6jV7fl3UsEHZhuEM`Ef6}>l43x`d z3}CHwj5s|C{w1tz6@V9Ftvx5KLj1)9fR!a?Vtn}Uft{Tlnwy*H>+2&Pk0S|VOu$RH zvG?!a^Y!ajlBpzTXJK$4D+kJa4VtPr02 zy?OJ-%h9#9H6;=W&t`spe_ntdJb0idPo8+Xk>4*8ZftB!fX4qA_mVya(Ae0>j~_n( z=M8(JQ&U{OejR{fvB<*W0sy8O`)&94AN6q2kp#Y^)DM?aYU7Y}JZ*QwuEIPY# zx$OLBXJ_5|%*>2;1k20IZvOG(M`wp5H8wUnWqW(O?%utt)z#Ii016QRlJxA^Gw0vZ z(xRrOCO7|cdfM5wx3|0X+qZA);NTztP$(4C-QDe7p`oE6e@edozvXhocs@cMZ;nJT#&u!YHa9Zqw|XX!)r(u78blDdi?mY7f6*2iM^t8ir}o; zWkrN&prfNB_4f8^XlO`p-@f&|ZIw2y0-T~9k+p%^88L7<#y=nvqvRwfHKzao002ov JPDHLkV1h7#4SfIr diff --git a/app/img/grbltop.png b/app/img/grbltop.png new file mode 100644 index 0000000000000000000000000000000000000000..ce9b04591355a703d28d2651c4518f5eb7d2f0df GIT binary patch literal 1090 zcmV-I1ikx-P)n1$a{BxG??ob!fXn5&hs%tfo}Lbp4244buj2&*0T)Tm z&(DW4asB@lke!`P0MP68%IkQFq7VQ`rY=>$n})$)P|w4!Oh8pt)tPlNnKYco%hF!z z>guv8D=Xj2%gcM;=kxt@`_Ap(9(?xTFKyr9aKLJ{qO-H}t^NJ|yOoudxvHufMN!Pr zO3>Zi{b6BYQNGW&YOq)=<7Tt@&-V6qG&VNEXf$42qNb*%qHs9O%t#~>bUK|60ie3N z8UWDM)pa+KNStz#$s`8`26{;{8jU{R+1XjjJY!{LLpl9Xjxm1Q|4NfHMK2Y*frc;@%}pQiDYCSrAU z^>+Z++S+oRD_~(^;aif7#bT_esJLY|n{@zm+uPeAk~}#%`5OQ>HZ~4PG8hcf;c(n2 zDJjtv7Z>aL`uZM|WH=n&1%RTWA{_vXjEsColJR()01VsP+drKv!0-1@k>uv)=C7If z#Kc5t`kGS!Aj>jI(rUF@UK%iuNiq_NywI?kni>GW?(QyCRpsdD=>3aIpjQ;dkZzMR zE;SmB5&-CQIskyG{?|ni_E9Zf$AHEeiz7yyuylLG*dBuO8QM)d$tP*8BT z8|LTdS~Sx&H#dKz;px%JR4SDMfOtGkk_-d_@4V!po7&#Y%*+oO=<#@-Xr%>^H8eEz zN%}n6?eDkGFDokp04y#p z_N7v%=BF&n^msf!0ziI#K1jl5vt_TZuRqr~f*>p)J)Z#py}iBVZnyjE>FMb&CnqOw zW(u&|?dGwuvHR!Ek^1_206<%7>m9csd?5(J=WT6mCIGNlEU)lgF4qTBQ&V4EIG7q5 z8ZbLM`);OyYY#yXz9&gZk`mXF&}1^fX0zQ`Sy}nU>-COnb#lAiPnw#VuIH=A$HyOL z8Zj6QZd`TF)8BDvX({&h_5@KBcMlE@{umw}ZZ(-q=BpO)FPp6aaNv-j3jhEB07*qo IM6N<$f*y$arT_o{ literal 0 HcmV?d00001 diff --git a/app/index.html b/app/index.html index b45952b..a4581dd 100644 --- a/app/index.html +++ b/app/index.html @@ -278,6 +278,8 @@
  • Calibrate Z-Axes Steps/mm
  • Customise Shortcut Key Assignments
    • +
  • +
  • Flashing Tool
    • @@ -660,7 +662,7 @@