From 62fb935883cf6bb9a0a61d431b48b36015be1677 Mon Sep 17 00:00:00 2001 From: Knutwurst <36196269+knutwurst@users.noreply.github.com> Date: Sun, 31 Oct 2021 00:17:57 +0200 Subject: [PATCH] A little cleanup --- LICENSE | 1 - data/www/index.html | 37 --------- data/www/marlin-logo.png | Bin 2349 -> 0 bytes data/www/marlin.css | 166 --------------------------------------- data/www/marlin.js | 24 ------ docs/Bresenham.md | 1 + 6 files changed, 1 insertion(+), 228 deletions(-) delete mode 100755 data/www/index.html delete mode 100755 data/www/marlin-logo.png delete mode 100755 data/www/marlin.css delete mode 100755 data/www/marlin.js diff --git a/LICENSE b/LICENSE index 7d917cf3..68247af8 100755 --- a/LICENSE +++ b/LICENSE @@ -674,4 +674,3 @@ may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read . - diff --git a/data/www/index.html b/data/www/index.html deleted file mode 100755 index d3291de8..00000000 --- a/data/www/index.html +++ /dev/null @@ -1,37 +0,0 @@ - - - - - Marlin - - - - - - -
- - - -
-
-
    - -
    -
    - - -
    -
    -
    -
    - - -
    -
    - #controls -
    -
    -
    - - diff --git a/data/www/marlin-logo.png b/data/www/marlin-logo.png deleted file mode 100755 index d0ce790141c7ff77bead81d5ba6777692102a242..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2349 zcmV+|3DWk7P)9M000McNliru;szBG0~IEXf)W4#2)ao` zK~#9!?VNjz9aSC2KQnvpKD*08L8RN(x^z(x5EaE#t)cPJpr(jV6a^KDKzyWHwJHXD zRURgSQN#z0FMPls619qoU<(p0iMS|Ki;xBcyDhW}`|9rAx&ATVYflbmX3oscmR@py z$t2y`Ij`UI`}_UQHsHxr0geaG2UY_MfQY$MRdYYxDA3u$lI9A_-kkaGMZg9L_Ito4 z;1MkvNYJxD%^EwccWG4DH#64QW~X{d^HhPefUnHgMvn*XmSDSR(NjTfz*;FySq}h9 zB;1QyJbucl0(@MavJ?SVfu8{1Zt?b@p(?Omp>NItelhT0puNS{gNi!jQK#l2;5Oi5 z;CH|+EuQ9bqf3D23YabidVw*y)-tFDY?Yu+kyRI>d$iHKU|Al!t(y1N3myoPWXy#=glzz0&kUkH55TH{s+U;+3j z@DHVR6U3dVMu+MNfx8=l6Ah+k(Oabyk1DP;x@FT6^23_*Ss51mC*b+k+@DmQJR)VC zkQYm$6;dYie6!lixc2yKc}r6{zou`UAS=y9pXwNJVFtslwrZ#~X=EB`xZGOfPU{ez zz)vN_EMO4<{|3(X5bkGzT^@7RfPbm1nUAIIgS(KOnMXW11T23<0`t?sJveSnJ!7dtF50W1v;-Z-0djv zW#Zd5SlNcF-f$N1vqlV#O19v70inBo-zlKgZM{ENDVb}IO-i|JSN&4s=c@8klePo* zC+zJ8M@ltBd2PX?9G>Jl$9H1_a{H|J-3jxa4Mce@n0d0`$l>M}%UVpjQ^H81N#HvP z#fAoTIpW1Mee(9;E7$t%@jKvv=uC}*vdVgV|3TnO!dSpcil%7W|m1N9JLBfX}GD>+3-R>s`&W_>e|5A$J>H_ZQ$# z#UsuhFc&=^0!~BGHxk#1&0OzH9qKxjBqtOXXA~P<+TSPT=w|x+A^lwp{XE#GRi{kbJ$i zM`MZ>8;UT08*%&eTAticY1flC-gjs4w#yS_4FJ0;0tIIf-?*^pUgDnVLQTGpxZ$2g zo8=xVhIQ`DK%}=DOll);+&^r6cfaD=CdI9ziR-XkV&s%!VvYFktY$nJS^@q}a@Quy zTMZL8I)0=uuv7+fpN!{9?XT`>jk{Ak+TG$oyUzD0$+t~j4QvU3R}%LkmpYgdD6VuE z8a_^Xcc@Ea0?$%lV@$Wfgqqfw&Bz}+*xx&D+{(l=T`_4Uqnecmxi-Aqn11fe=^Y}0 zu%x)!Z7A0i?pAC?NPbO&Q9mcX5zwNi2YrM1>eT;3-yrd=`%kxc)AY1n*kGCMieI3Z zyOGvk_%|bU3dh_-+$Rofh#e5O=q^)X;2Pqa0lV?*lGIx~o>vMI0O|noMTc`$6#5kV z|9;FlsH#fO`M_)N`(JiK#q!`FW=_RJQOm9glu5G&2yXmmIE~ij7J1%nHZc7k4;42@ T+d1LH00000NkvXXu0mjf*M?Xq diff --git a/data/www/marlin.css b/data/www/marlin.css deleted file mode 100755 index b29ec2e2..00000000 --- a/data/www/marlin.css +++ /dev/null @@ -1,166 +0,0 @@ -/* CSS reset */ - -html, body, div, span, applet, object, iframe, -h1, h2, h3, h4, h5, h6, p, blockquote, pre, -a, abbr, acronym, address, big, cite, code, -del, dfn, em, img, ins, kbd, q, s, samp, -small, strike, strong, sub, sup, tt, var, -b, u, i, center, -dl, dt, dd, ol, ul, li, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td, -article, aside, canvas, details, embed, -figure, figcaption, footer, header, hgroup, -menu, nav, output, ruby, section, summary, -time, mark, audio, video { - margin: 0; - padding: 0; - border: 0; - font-size: 100%; - font: inherit; - vertical-align: baseline; - font-family: Impact, Charcoal, sans-serif; - } -article, aside, details, figcaption, figure, -footer, header, hgroup, menu, nav, section { - display: block; - } -body { line-height: 1; } -ol, ul { list-style: none; } -blockquote, q { quotes: none; } -blockquote:before, blockquote:after, -q:before, q:after { content: ''; content: none; } -table { - border-collapse: collapse; - border-spacing: 0; - } - -/* Custom */ - -/* Tabs */ -* { box-sizing: border-box; } -body { - display: flex; - justify-content: center; - padding: 0px; - background: #1e1e1e; - color: #efefef; - } -h1 { - margin: 0; - font-size: 2em; - } -.tabs { - display: flex; - width: 100%; - flex-wrap: wrap; - background: #e5e5e5; - } -.input { - position: absolute; - opacity: 0; - } -.label { - width: 100%; - padding: 18px 28px; - background: #e5e5e5; - cursor: pointer; - font-weight: bold; - font-size: 18px; - color: #7f7f7f; - transition: background 0.1s, color 0.1s; - border-style: solid; - border-width: 0 0 4px 0; - border-color: #acacac; - } -.label:hover { - background: #d8d8d8; - } -.label:active { - background: #ccc; - } -.input:focus + .label { - z-index: 1; - } -.input:checked + .label { - background: #1e1e1e; - color: #efefef; - border-width: 4px 0 0 0; - border-color: #65a57d; - } -.panel { - display: none; - width: 100%; - padding: 20px 30px 30px; - background: #1e1e1e; - color: #e5e5e5; - } -.panel .panel-content { - width: 100%; - max-width: 800px; - } - -@media (min-width: 600px) { - .label { width: auto; } - .panel { order: 99; } -} - -.input:checked + .label + .panel { display: block; } - -#logo { - width: 130px; - height: 58px; - margin-right: 20px; - background: url(marlin-logo.png) no-repeat center center; - } - -input[type="text"], textarea { - background-color: #2c2c2c; - border: solid 2px #314b3b; - color: #e5e5e5; - outline: none; - } - -input[type="text"]:focus, textarea:focus { - border-color: #4d7a5e; - } - -ul#serial-output { - width: 100%; - height: 300px; - overflow-y: scroll; - background-color: #2c2c2c; - border: solid 2px #314b3b; - } - -ul#serial-output li { - padding: 4px; - font-family: "Lucida Console", Monaco, monospace; - font-size: 0.8em; - } - -ul#serial-output li:nth-child(odd) { - background-color: #3c3c3c; - } - -div.form-wrapper { - display: flex; - width: 100%; - margin: 6px 0; - } - -div.form-wrapper input { - font-size: 1.2em; - padding: 4px 6px; - } - -div.form-wrapper input[type="text"] { - flex: 1 1 auto; - } - -div.form-wrapper input[type="submit"], -div.form-wrapper button { - border: solid 2px #314b3b; - background-color: #4d7a5e; - color: #e5e5e5; - } diff --git a/data/www/marlin.js b/data/www/marlin.js deleted file mode 100755 index 0a95045a..00000000 --- a/data/www/marlin.js +++ /dev/null @@ -1,24 +0,0 @@ -document.addEventListener('DOMContentLoaded', () => { - const ws = new WebSocket(`ws://${location.host}/ws`); - - ws.onmessage = (e) => { - if (typeof e.data === 'string') { - let node = document.createElement('li'); - let text = document.createTextNode(e.data); - node.appendChild(text); - document.getElementById('serial-output').appendChild(node); - } - }; - - document.getElementById('serial-command-form').addEventListener('submit', (e) => { - e.preventDefault(); - - let value = document.getElementById('serial-command').value.trim(); - - if (!value) return; - - ws.send(`${value}\n`); - - document.getElementById('serial-command').value = ''; - }); -}); diff --git a/docs/Bresenham.md b/docs/Bresenham.md index 59a21509..02f42204 100755 --- a/docs/Bresenham.md +++ b/docs/Bresenham.md @@ -267,3 +267,4 @@ This can be implemented in C as: } }; ``` +