From 99d08b18f8da203d4d6fdc8299e7c18e92213645 Mon Sep 17 00:00:00 2001 From: sqozz Date: Sun, 28 Feb 2021 16:54:12 +0100 Subject: [PATCH] =?UTF-8?q?Add=20web=20W=C3=A4hlscheibe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webinterface/css/normalize.css | 349 +++++++++++++++++++++++++++ webinterface/css/style.css | 0 webinterface/css/styles.css | 7 + webinterface/images/drehscheibe.scad | 15 ++ webinterface/images/drehscheibe.svg | 194 +++++++++++++++ webinterface/images/fingeranstoß.svg | 65 +++++ webinterface/index.html | 3 + webinterface/js/scripts.js | 81 +++++++ 8 files changed, 714 insertions(+) create mode 100644 webinterface/css/normalize.css delete mode 100644 webinterface/css/style.css create mode 100644 webinterface/css/styles.css create mode 100644 webinterface/images/drehscheibe.scad create mode 100644 webinterface/images/drehscheibe.svg create mode 100644 webinterface/images/fingeranstoß.svg diff --git a/webinterface/css/normalize.css b/webinterface/css/normalize.css new file mode 100644 index 0000000..192eb9c --- /dev/null +++ b/webinterface/css/normalize.css @@ -0,0 +1,349 @@ +/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */ + +/* Document + ========================================================================== */ + +/** + * 1. Correct the line height in all browsers. + * 2. Prevent adjustments of font size after orientation changes in iOS. + */ + +html { + line-height: 1.15; /* 1 */ + -webkit-text-size-adjust: 100%; /* 2 */ +} + +/* Sections + ========================================================================== */ + +/** + * Remove the margin in all browsers. + */ + +body { + margin: 0; +} + +/** + * Render the `main` element consistently in IE. + */ + +main { + display: block; +} + +/** + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/* Grouping content + ========================================================================== */ + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ + +hr { + box-sizing: content-box; /* 1 */ + height: 0; /* 1 */ + overflow: visible; /* 2 */ +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +pre { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/* Text-level semantics + ========================================================================== */ + +/** + * Remove the gray background on active links in IE 10. + */ + +a { + background-color: transparent; +} + +/** + * 1. Remove the bottom border in Chrome 57- + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. + */ + +abbr[title] { + border-bottom: none; /* 1 */ + text-decoration: underline; /* 2 */ + text-decoration: underline dotted; /* 2 */ +} + +/** + * Add the correct font weight in Chrome, Edge, and Safari. + */ + +b, +strong { + font-weight: bolder; +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +code, +kbd, +samp { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/** + * Add the correct font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` elements from affecting the line height in + * all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sub { + bottom: -0.25em; +} + +sup { + top: -0.5em; +} + +/* Embedded content + ========================================================================== */ + +/** + * Remove the border on images inside links in IE 10. + */ + +img { + border-style: none; +} + +/* Forms + ========================================================================== */ + +/** + * 1. Change the font styles in all browsers. + * 2. Remove the margin in Firefox and Safari. + */ + +button, +input, +optgroup, +select, +textarea { + font-family: inherit; /* 1 */ + font-size: 100%; /* 1 */ + line-height: 1.15; /* 1 */ + margin: 0; /* 2 */ +} + +/** + * Show the overflow in IE. + * 1. Show the overflow in Edge. + */ + +button, +input { /* 1 */ + overflow: visible; +} + +/** + * Remove the inheritance of text transform in Edge, Firefox, and IE. + * 1. Remove the inheritance of text transform in Firefox. + */ + +button, +select { /* 1 */ + text-transform: none; +} + +/** + * Correct the inability to style clickable types in iOS and Safari. + */ + +button, +[type="button"], +[type="reset"], +[type="submit"] { + -webkit-appearance: button; +} + +/** + * Remove the inner border and padding in Firefox. + */ + +button::-moz-focus-inner, +[type="button"]::-moz-focus-inner, +[type="reset"]::-moz-focus-inner, +[type="submit"]::-moz-focus-inner { + border-style: none; + padding: 0; +} + +/** + * Restore the focus styles unset by the previous rule. + */ + +button:-moz-focusring, +[type="button"]:-moz-focusring, +[type="reset"]:-moz-focusring, +[type="submit"]:-moz-focusring { + outline: 1px dotted ButtonText; +} + +/** + * Correct the padding in Firefox. + */ + +fieldset { + padding: 0.35em 0.75em 0.625em; +} + +/** + * 1. Correct the text wrapping in Edge and IE. + * 2. Correct the color inheritance from `fieldset` elements in IE. + * 3. Remove the padding so developers are not caught out when they zero out + * `fieldset` elements in all browsers. + */ + +legend { + box-sizing: border-box; /* 1 */ + color: inherit; /* 2 */ + display: table; /* 1 */ + max-width: 100%; /* 1 */ + padding: 0; /* 3 */ + white-space: normal; /* 1 */ +} + +/** + * Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ + +progress { + vertical-align: baseline; +} + +/** + * Remove the default vertical scrollbar in IE 10+. + */ + +textarea { + overflow: auto; +} + +/** + * 1. Add the correct box sizing in IE 10. + * 2. Remove the padding in IE 10. + */ + +[type="checkbox"], +[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Correct the cursor style of increment and decrement buttons in Chrome. + */ + +[type="number"]::-webkit-inner-spin-button, +[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Correct the odd appearance in Chrome and Safari. + * 2. Correct the outline style in Safari. + */ + +[type="search"] { + -webkit-appearance: textfield; /* 1 */ + outline-offset: -2px; /* 2 */ +} + +/** + * Remove the inner padding in Chrome and Safari on macOS. + */ + +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * 1. Correct the inability to style clickable types in iOS and Safari. + * 2. Change font properties to `inherit` in Safari. + */ + +::-webkit-file-upload-button { + -webkit-appearance: button; /* 1 */ + font: inherit; /* 2 */ +} + +/* Interactive + ========================================================================== */ + +/* + * Add the correct display in Edge, IE 10+, and Firefox. + */ + +details { + display: block; +} + +/* + * Add the correct display in all browsers. + */ + +summary { + display: list-item; +} + +/* Misc + ========================================================================== */ + +/** + * Add the correct display in IE 10+. + */ + +template { + display: none; +} + +/** + * Add the correct display in IE 10. + */ + +[hidden] { + display: none; +} diff --git a/webinterface/css/style.css b/webinterface/css/style.css deleted file mode 100644 index e69de29..0000000 diff --git a/webinterface/css/styles.css b/webinterface/css/styles.css new file mode 100644 index 0000000..cb47298 --- /dev/null +++ b/webinterface/css/styles.css @@ -0,0 +1,7 @@ +#drehscheibe { + display: block; + margin-left: auto; + margin-right: auto; + border: 1px solid black; + transform: rotate(0deg); +} diff --git a/webinterface/images/drehscheibe.scad b/webinterface/images/drehscheibe.scad new file mode 100644 index 0000000..5c77bd1 --- /dev/null +++ b/webinterface/images/drehscheibe.scad @@ -0,0 +1,15 @@ +waehlscheibe_diameter=80; +fingerhole_diameter=13; +fingerhole_clearance=2.5; + +difference() { + circle(d=waehlscheibe_diameter, $fn=100); + circle(d=waehlscheibe_diameter-fingerhole_diameter*2-fingerhole_clearance*4, $fn=100); + for ( number = [0 : 9] ) { + rotate([0, 0, -((360/14)*number)+(360/14)]) { + translate([0, -waehlscheibe_diameter/2+fingerhole_diameter/2+fingerhole_clearance, 0]) { + circle(d=fingerhole_diameter,$fn=100); + } + } + } +} \ No newline at end of file diff --git a/webinterface/images/drehscheibe.svg b/webinterface/images/drehscheibe.svg new file mode 100644 index 0000000..90a302b --- /dev/null +++ b/webinterface/images/drehscheibe.svg @@ -0,0 +1,194 @@ + + + +OpenSCAD Model + + diff --git a/webinterface/images/fingeranstoß.svg b/webinterface/images/fingeranstoß.svg new file mode 100644 index 0000000..711a512 --- /dev/null +++ b/webinterface/images/fingeranstoß.svg @@ -0,0 +1,65 @@ + + + + + + image/svg+xml + + OpenSCAD Model + + + + + + OpenSCAD Model + + + diff --git a/webinterface/index.html b/webinterface/index.html index 95410c2..642a100 100644 --- a/webinterface/index.html +++ b/webinterface/index.html @@ -4,9 +4,12 @@ FeTap Webinterface + + + diff --git a/webinterface/js/scripts.js b/webinterface/js/scripts.js index 5f0b70f..18f6f09 100644 --- a/webinterface/js/scripts.js +++ b/webinterface/js/scripts.js @@ -13,8 +13,89 @@ function connect_ws() { webSocket.onopen = ws_connected; } +function drehscheibe_init() { + drehscheibe = document.querySelector("#drehscheibe") + drehscheibe.onmousedown = drehscheibe_click; + document.onmouseup = function(e){ + document.onmousemove = function(){}; + rotateBack(drehscheibe); + }; +} + +function drehscheibe_click(e) { + e.preventDefault(); + document.onmousemove = drehscheibe_drag; + click_degree = 0; + drehscheibe_rect = drehscheibe.getBoundingClientRect(); + drehscheibe_center = { x: (drehscheibe_rect.x + drehscheibe_rect.width/2), y: (drehscheibe_rect.y + drehscheibe_rect.height/2) }; + if (e.clientX > drehscheibe_center.x) { + base_vector = [ 10, 0 ]; + deg_offset = 0; + } else { + base_vector = [ -10, 0 ]; + deg_offset = 180; + } + mouse_vector = [ e.clientX - drehscheibe_center.x, e.clientY - drehscheibe_center.y ]; + vector_product = (mouse_vector[0]*base_vector[1])-(mouse_vector[1]*base_vector[0]); + scalar_product = (Math.sqrt(Math.pow(mouse_vector[0], 2) + Math.pow(mouse_vector[1], 2))) * Math.sqrt(Math.pow(base_vector[0], 2) + Math.pow(base_vector[1], 2)) + rad = Math.acos(vector_product/scalar_product); + degree = rad * (180/Math.PI); + degree = degree + deg_offset; + click_degree = degree; + //console.log("Click deg: " + click_degree); +} + +function drehscheibe_drag(e) { + max_rotate = 125; + drehscheibe_rect = drehscheibe.getBoundingClientRect(); + drehscheibe_center = { x: (drehscheibe_rect.x + drehscheibe_rect.width/2), y: (drehscheibe_rect.y + drehscheibe_rect.height/2) }; + if(e.clientX > drehscheibe_center.x) { + base_vector = [ 10, 0 ]; + degree_offset = 0; + } else if (e.clientX < drehscheibe_center.x) { + base_vector = [ -10, 0]; + degree_offset = 180; + } + mouse_vector = [ e.clientX - drehscheibe_center.x, e.clientY - drehscheibe_center.y ]; + vector_product = (mouse_vector[0]*base_vector[1])-(mouse_vector[1]*base_vector[0]); + scalar_product = (Math.sqrt(Math.pow(mouse_vector[0], 2) + Math.pow(mouse_vector[1], 2))) * Math.sqrt(Math.pow(base_vector[0], 2) + Math.pow(base_vector[1], 2)) + rad = Math.acos(vector_product/scalar_product); + degree = rad * (180/Math.PI); + real_degree = (degree+degree_offset)-click_degree; + if(real_degree < 0) { + real_degree = 360 + real_degree; + } + if(click_degree > 125) { + rotation_degree = -(360-click_degree); + } else { + rotation_degree = click_degree; + } + if(real_degree+rotation_degree < 125){ + drehscheibe.style.transform = "rotate(" + real_degree + "deg)"; + } +} + +function rotateBack(e) { + drehscheibe.style.transform = "rotate(" + 0 + "deg)"; +} + +function getRotation(e) { + var st = window.getComputedStyle(e, null); + var tr = st.getPropertyValue("transform"); + var values = tr.split('(')[1], + values = values.split(')')[0], + values = values.split(','); + var a = values[0]; + var b = values[1]; + var c = values[2]; + var d = values[3]; + var angle = Math.asin(b) * (180/Math.PI); + return angle; +} + function init() { connect_ws(); + drehscheibe_init(); } document.addEventListener("DOMContentLoaded", init);