From 26311630ef0d0bd5545cd70acdf3ed2a8bbce575 Mon Sep 17 00:00:00 2001 From: openbuilds-engineer Date: Mon, 22 Apr 2019 21:17:09 +0200 Subject: [PATCH] v1.0.158 --- CHANGELOG.txt | 3 +- app/css/mobilejog.css | 4 +- app/jog/index.html | 413 ++++++++++++++++++------------------------ app/js/mobilejog.js | 34 +--- app/js/probe.js | 16 +- app/js/websocket.js | 2 +- domain-crt.cer_old | 68 ------- domain-crt.cer_old2 | 65 ------- package.json | 2 +- 9 files changed, 197 insertions(+), 410 deletions(-) delete mode 100644 domain-crt.cer_old delete mode 100644 domain-crt.cer_old2 diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 7374a0a..eb77fd7 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,4 +1,5 @@ -v1.0.157: Fix Bug#66 -Grbl settings invert display: , Fix Bug#68 - Machine Image for Custom, Fix Bug#69 - Keyboard: disable bindings in Macro Inputs, Improvement: Keyboard Binding for UNLOCK will also close Alarm Dialog now. +v1.0.158: Improvements to the Mobile Jog UI +v1.0.157: Fix Bug#66 -Grbl settings invert display: , Fix Bug#68 - Machine Image for Custom, Fix Bug#69 - Keyboard: disable bindings in Macro Inputs, Improvement: Keyboard Binding for UNLOCK will also close Alarm Dialog now. v1.0.156: Added Job Time Remaining functionality v1.0.155: Added Continuous Jog Functionality (Enable from the Keyboard Shortcuts icon on the top toolbar) (BETA) v1.0.154: added Keyboard Shortcuts Frontend diff --git a/app/css/mobilejog.css b/app/css/mobilejog.css index 8e6aa76..3a84fc6 100644 --- a/app/css/mobilejog.css +++ b/app/css/mobilejog.css @@ -1,4 +1,4 @@ -#svgview { +/* #svgview { /* Note only uses height attribs from here, before we connect to websocket. After that, it gets set by websocket.js */ height: 200px; width: calc(100vw - 30px); @@ -50,4 +50,4 @@ #qrcode canvas { display: block; margin: 0 auto; -} +} */ diff --git a/app/jog/index.html b/app/jog/index.html index e1a5674..1c2b9bd 100644 --- a/app/jog/index.html +++ b/app/jog/index.html @@ -36,7 +36,6 @@ - @@ -44,32 +43,31 @@
- OpenBuilds CONTROL
- -
- + +
- -
- - - - -
- - - - -
-
- - -
- - - + +
-
+
- - - - - - +
- + @@ -426,17 +371,17 @@
- Not Connected + Not Connected
- Not Connected + Not Connected
- Job Queue: 0 + Job Queue: 0
diff --git a/app/js/mobilejog.js b/app/js/mobilejog.js index 81bdb06..825a67e 100644 --- a/app/js/mobilejog.js +++ b/app/js/mobilejog.js @@ -1,33 +1 @@ -var draw; -var line; -var isJogWidget = true; - -SVG.on(document, 'DOMContentLoaded', function() { - draw = SVG('svgview') -}) - -$(document).ready(function() { - $("#svgview").swipe(function(direction, offset, eventstate) { - if (laststatus.comms.connectionStatus == 1 || laststatus.comms.connectionStatus == 2) { - event.preventDefault(); - draw.clear() - console.log("Moving", direction.x, "and", direction.y); - console.log("Touch moved by", offset.x, "horizontally and", offset.y, "vertically"); - console.log("Event state ", eventstate) - var height = draw.node.clientHeight; - var width = draw.node.clientWidth; - line = draw.line(width / 2, height / 2, (width / 2) + offset.x, (height / 2) + offset.y * -1).stroke({ - width: 5 - }) - if (eventstate == 'up') { - var feedrate = $('#jograte').val(); - jogXY((offset.x / 10).toFixed(2), (offset.y / 10).toFixed(2), feedrate) - Metro.toast.create("Delta move: X: " + (offset.x / 10).toFixed(2) + " / Y: " + (offset.y / 10).toFixed(2), null, 1000); - setTimeout(function() { - draw.clear() - }, 1000) - - } - } - }); -}); \ No newline at end of file +var isJogWidget = true; \ No newline at end of file diff --git a/app/js/probe.js b/app/js/probe.js index ad2573a..6c59675 100644 --- a/app/js/probe.js +++ b/app/js/probe.js @@ -12,13 +12,18 @@ function z0probe() { } var z0probetemplate = ` +
- - + ` - + ` + } + + z0probetemplate += `
- probe-info -
+ if (!window.matchMedia("only screen and (max-width: 760px)").matches) { + z0probetemplate += ` + probe-info + This is how far (maximum) the Z-Probe will move downward @@ -40,6 +45,7 @@ function z0probe() {
+
` diff --git a/app/js/websocket.js b/app/js/websocket.js index 8505945..8774499 100644 --- a/app/js/websocket.js +++ b/app/js/websocket.js @@ -165,7 +165,7 @@ function initSocket() { socket.on("machinename", function(data) { - if (setMachineButton) { + if (typeof setMachineButton !== 'undefined') { setMachineButton(data) } }); diff --git a/domain-crt.cer_old b/domain-crt.cer_old deleted file mode 100644 index 3e3a5c6..0000000 --- a/domain-crt.cer_old +++ /dev/null @@ -1,68 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIHGjCCBgKgAwIBAgISBMQKlFZDOTaad2vlXsUGmhfCMA0GCSqGSIb3DQEBCwUA -MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD -ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xODA5MTcxNDI4MjZaFw0x -ODEyMTYxNDI4MjZaMCMxITAfBgNVBAMTGG15bWFjaGluZS5vcGVuYnVpbGRzLmNv -bTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAPUouBqHb8L0+FaFl903 -9BmkzBoeaLMCHV6fk1HLme9ric/gq/hbxlVscf+dWyxOzEEyFVTe2dbUjtniqEFm -GlyP4wMzAU11sMdtCHGugbxOCQJ1C94OkdGLPom5rfWFcgu5rTADd/D8+pBmdXLi -UcUNaVQEd5b+JiHICf+HETQuJWG/wvf5q+6BwkEEJezYeb9JSTvXvJHvqA3VNAxE -SLGm0SRi05i/JVuCJ3tBtyd+fk6uuCTeWfPYRMaIxnTfeevxCM8pCyrhgM3iAEyI -wbM33ghHnBdIj2QLJ8lPK3DrC8wIKDI6lEy+Ku62kdm5wDxFVAJIkxQk9PdENa8j -Edb3aUsPHVpQGy9ULHo3avR8CdLxyeQUHO+OQbXNSgFsAy1PPnI4sa+QgZL4b+rH -lkErDr2xDlLT46VYEi7mjUyxT1Y2EhSsZnFgjkbCQa4JXDxVcugG8dvAxKn9os7A -fUAo+Bzpn6ihjx4RMWpkvYJeLTUjcQWn6fVIU+cJejIs09vDWWUL6CDtC5lpM1iy -5vp6VB8WPnT3U91lVbaYQXCXYBUVR2qkyEw5eeIUzadIenQ6yvtIkIzbrpvBBuA7 -pR8MbG1yPeZdMWPsTl0DsYTvK1174hxNcibaA7mXil3NwR0pjfnDsXPyna3ddwJr -oh+aztnJCGbfrwyajqiMshS1AgMBAAGjggMfMIIDGzAOBgNVHQ8BAf8EBAMCBaAw -HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYD -VR0OBBYEFFlMbbgitNSUgYq3xh1/5BUVKRusMB8GA1UdIwQYMBaAFKhKamMEfd26 -5tE5t6ZFZe/zqOyhMG8GCCsGAQUFBwEBBGMwYTAuBggrBgEFBQcwAYYiaHR0cDov -L29jc3AuaW50LXgzLmxldHNlbmNyeXB0Lm9yZzAvBggrBgEFBQcwAoYjaHR0cDov -L2NlcnQuaW50LXgzLmxldHNlbmNyeXB0Lm9yZy8wIwYDVR0RBBwwGoIYbXltYWNo -aW5lLm9wZW5idWlsZHMuY29tMIH+BgNVHSAEgfYwgfMwCAYGZ4EMAQIBMIHmBgsr -BgEEAYLfEwEBATCB1jAmBggrBgEFBQcCARYaaHR0cDovL2Nwcy5sZXRzZW5jcnlw -dC5vcmcwgasGCCsGAQUFBwICMIGeDIGbVGhpcyBDZXJ0aWZpY2F0ZSBtYXkgb25s -eSBiZSByZWxpZWQgdXBvbiBieSBSZWx5aW5nIFBhcnRpZXMgYW5kIG9ubHkgaW4g -YWNjb3JkYW5jZSB3aXRoIHRoZSBDZXJ0aWZpY2F0ZSBQb2xpY3kgZm91bmQgYXQg -aHR0cHM6Ly9sZXRzZW5jcnlwdC5vcmcvcmVwb3NpdG9yeS8wggEDBgorBgEEAdZ5 -AgQCBIH0BIHxAO8AdQBVgdTCFpA2AUrqC5tXPFPwwOQ4eHAlCBcvo6odBxPTDAAA -AWXoJaYnAAAEAwBGMEQCIGbL3klQxUQQYwNk6/RuFshAFhPpLxFmIpoiy4WrFCzd -AiBkcPC5/jk7Qw1J026ldfsR+bI4GM6D0K6P/guoEhCglwB2AKRQEmkFWhVUXmIR -qze8ED9irlV2pF5LFxRFPhsiEGolAAABZeglqAUAAAQDAEcwRQIgBQR8aNdSVRg7 -LShUV6sWcMNBnc1jSW/UMsE/oTfqsm8CIQCEenKzCth3h4d6x7QV7XqicGqG2HLX -DDD5yguGAFOO/zANBgkqhkiG9w0BAQsFAAOCAQEAEsksPkd2qItzu02SAVnnh+Vn -108930nk0FXQ04M7sXIXHifpNR9eVvSleFaQKxldcNG5vUmx1ti5An3sHW/H+CHq -zo+vVa+AS7O2zZNs5ZAPTcItpZjw3SaESOFV6KVgd04auQSHEWW6gA5WWSHoIY6F -LuvMdu6OHGVQAA4DsxhcTy1pJ7R+Df8eAzOQLxNEkMACOhDpTDXwNR5A7FGoTixr -HW2SxKmDAe4vCDpFAGdmZUiT3OwC0trwxaTEBzALA4hxI5hk9QsMDPeLSU2WOLwS -fn3OW2N8cIHHygEL5aHdF4AVzAO3bINLmyXeAOS5B9iKk7lEVcwXkIeaF+cCfg== ------END CERTIFICATE----- - ------BEGIN CERTIFICATE----- -MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/ -MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT -DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow -SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT -GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC -AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF -q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8 -SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0 -Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA -a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj -/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T -AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG -CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv -bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k -c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw -VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC -ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz -MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu -Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF -AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo -uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/ -wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu -X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG -PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6 -KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg== ------END CERTIFICATE----- diff --git a/domain-crt.cer_old2 b/domain-crt.cer_old2 deleted file mode 100644 index 9712183..0000000 --- a/domain-crt.cer_old2 +++ /dev/null @@ -1,65 +0,0 @@ ------BEGIN CERTIFICATE----- -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 -uv3qKQgKCJGV/+A= ------END CERTIFICATE----- - ------BEGIN CERTIFICATE----- -MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/ -MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT -DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow -SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT -GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC -AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF -q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8 -SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0 -Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA -a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj -/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T -AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG -CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv -bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k -c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw -VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC -ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz -MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu -Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF -AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo -uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/ -wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu -X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG -PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6 -KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg== ------END CERTIFICATE----- diff --git a/package.json b/package.json index 238300c..2fa59f8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "OpenBuildsCONTROL", - "version": "1.0.157", + "version": "1.0.158", "license": "AGPL-3.0", "description": "Machine Interface Driver for OpenBuilds", "author": "github.com/openbuilds ",