Merge pull request #20 from rlwoodjr/OverRides

Add override menu to the ribbon
rlwoodjr · Feb 1, 2022 · e4c01d4 · e4c01d4
2 parents e98fb79 + 278d759
commit e4c01d4
Show file tree

Hide file tree

Showing 8 changed files with 296 additions and 391 deletions.
diff --git a/app/index.html b/app/index.html
diff --git a/app/js/jog.js b/app/js/jog.js
@@ -1,7 +1,6 @@
 var allowContinuousJog = false;
 var continuousJogRunning = false;
 var jogdist = 10;
-var safeToUpdateSliders = true;
 var jogRateX = 4000
 var jogRateY = 4000
 var jogRateZ = 2000
@@ -14,7 +13,7 @@ function jogOverride(newVal) {
     jogRateZ = (grblParams['$112'] * (newVal / 100)).toFixed(0);
     jogRateA = (grblParams['$111'] * (newVal / 100)).toFixed(0);
 
-    $('#jro').data('slider').val(newVal)
+
   }
   localStorage.setItem('jogOverride', newVal);
 }
@@ -146,17 +145,14 @@ $(document).ready(function() {
   }
 
   $(document).mousedown(function(e) {
-    safeToUpdateSliders = false;
   }).mouseup(function(e) {
-    safeToUpdateSliders = true;
     // Added to cancel Jog moves even when user moved the mouse off the button before releasing
     if (allowContinuousJog) {
       if (continuousJogRunning) {
         cancelJog()
       }
     }
   }).mouseleave(function(e) {
-    safeToUpdateSliders = true;
   });
 
   $("#xPosDro").click(function() {

diff --git a/app/js/keyboard.js b/app/js/keyboard.js
@@ -364,7 +364,6 @@ function bindKeys() {
     if (keyboardShortcuts.jogSpeedM.length) {
       $(document).bind('keydown', keyboardShortcuts.jogSpeedM, function(e) {
         e.preventDefault();
-    //    var currentJogOverride = $('#jro').data('slider').val();
         var newVal = currentJogOverride - 10
         if (newVal < 10) {
           newVal = 10;
@@ -376,8 +375,7 @@ function bindKeys() {
     if (keyboardShortcuts.jogSpeedP.length) {
       $(document).bind('keydown', keyboardShortcuts.jogSpeedP, function(e) {
         e.preventDefault();
-     //   var currentJogOverride = $('#jro').data('slider').val();
-        var newVal = currentJogOverride + 10
+         var newVal = currentJogOverride + 10
         if (newVal > 100) {
           newVal = 100;
         }

diff --git a/app/js/websocket.js b/app/js/websocket.js
@@ -4,7 +4,6 @@ var programBoard = {};
 var grblParams = {}
 var smoothieParams = {}
 var nostatusyet = true;
-var safeToUpdateSliders = false;
 var laststatus
 var simstopped = false;
 var bellstate = false;
@@ -622,21 +621,16 @@ function initSocket() {
               cone.position.x = status.machine.position.work.x
               cone.position.y = status.machine.position.work.y
               cone.position.z = status.machine.position.work.z + 20
-
-              // }
+              
+                            // }
             }
 
           }
         }
       }
     }
 
-    if (safeToUpdateSliders) {
-      if ($('#fro').data('slider') && $('#tro').data('slider')) {
-        $('#fro').data('slider').val(status.machine.overrides.feedOverride)
-        $('#tro').data('slider').val(status.machine.overrides.spindleOverride)
-      }
-    }
+
 
     if (unit == "mm") {
       $("#realFeed").html(status.machine.overrides.realFeed + "mm/min");
@@ -645,7 +639,9 @@ function initSocket() {
       $("#realFeed").html((status.machine.overrides.realFeed / 25.4).toFixed(0) + "in/min");
       //$("#realSpeed").html(("S=" + status.machine.overrides.realSpindle / 25.4).toFixed(0) + "in/min");
     }
+    $("#fDro").html(status.machine.overrides.feedOverride + "%");
 
+
     //console.log(JSON.stringify(status.machine.overrides, null, 4));
 
 
@@ -1023,14 +1019,15 @@ function sendGcode(gcode) {
 function feedOverride(step) {
   if (socket) {
     socket.emit('feedOverride', step);
-    $('#fro').data('slider').buff(((step - 10) * 100) / (200 - 10))
+
   }
+
 }
 
 function spindleOverride(step) {
   if (socket) {
     socket.emit('spindleOverride', step);
-    $('#tro').data('slider').buff(((step - 10) * 100) / (200 - 10))
+
   }
 }
 

diff --git a/dev-app-update.yml b/dev-app-update.yml
@@ -1,3 +1,3 @@
-owner: OpenBuilds
-repo: OpenBuilds-CONTROL
+owner: BobsCNC
+repo: Basic Sender
 provider: github
diff --git a/fullchain1.pem b/fullchain1.pem
@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIFNDCCBBygAwIBAgISA7xSior1O8o/eUSbjuhwbSKYMA0GCSqGSIb3DQEBCwUA
+MIIFNjCCBB6gAwIBAgISBI4Cn67WfNNJVdxMC4wCt7+GMA0GCSqGSIb3DQEBCwUA
 MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
-EwJSMzAeFw0yMTEwMDgxNDU4NDdaFw0yMjAxMDYxNDU4NDZaMCMxITAfBgNVBAMT
+EwJSMzAeFw0yMTEyMjcxMzUzMTZaFw0yMjAzMjcxMzUzMTVaMCMxITAfBgNVBAMT
 GG15bWFjaGluZS5vcGVuYnVpbGRzLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBALOMJdfDzwnnNO+gA9yKw8Qd0NYtHJVMBBgV97F4UNBr51gBvqTz
-4fehoMB6SobVJEpaV+U6H9DCOnILu7gHaRjXxyUo/M9qktKYXU7mB0m2hPmAnbW/
-u5QiuAyxwxj8MboC4S5ipzdIkpXevt386tAZhIGft1kH2WlxYk8xmszpc1BScGqa
-Ia96GK2K6xzu7PFRDweExi+HiHndOB5/aDADSQn1RJZ6+yzO+M8LnaMXJk9b8J0S
-p47c2MzQz5AjIqUdBUSq05okDfj8263EPscocBQMMP8m0+ZUZGutimHdLS9+ydKm
-Vey8SG1qg6rt0a1H8AJ6T6ReH4PTPcOaFtECAwEAAaOCAlEwggJNMA4GA1UdDwEB
+ADCCAQoCggEBAK26tBOpncp+Z6YJNumAVotaCFvwDzwZBnboETeEXc+pODtvWxXs
+QCKaoTnX/zgY9+bQSUnalaC0K8tCm8bdosG/gfxKght/2BHjfHlWSUjV5NP9ozIW
+LrIvh9Fc5ETQL/nkzqEH0ehdwX2RVaF7amTxoZzliSKUuSg5NZ/FMgy+KgXvNjeC
+zomKJ99qprwKwJfrdLxJLrNhBJjolbeaZlne9Hua1B9IemVXpKyrzS/roBS34Pmf
+8hQDQ/7XYBZllNSH6DfZMnowMTCf3z5gBIBkbdaTsvVc+3KkcpvP5bWcN0Rn3eg9
+72YNtn/d435lbd3gL0e3FKUdyw9scVih8TUCAwEAAaOCAlMwggJPMA4GA1UdDwEB
 /wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/
-BAIwADAdBgNVHQ4EFgQUg1cvyFUykpQYtXeYzBYmB7YykCIwHwYDVR0jBBgwFoAU
+BAIwADAdBgNVHQ4EFgQUpDOeSDNAxqlmsTTmXg1Ta9A5z6wwHwYDVR0jBBgwFoAU
 FC6zF7dYVsuuUAlA5h+vnYsUwsYwVQYIKwYBBQUHAQEESTBHMCEGCCsGAQUFBzAB
 hhVodHRwOi8vcjMuby5sZW5jci5vcmcwIgYIKwYBBQUHMAKGFmh0dHA6Ly9yMy5p
 LmxlbmNyLm9yZy8wIwYDVR0RBBwwGoIYbXltYWNoaW5lLm9wZW5idWlsZHMuY29t
 MEwGA1UdIARFMEMwCAYGZ4EMAQIBMDcGCysGAQQBgt8TAQEBMCgwJgYIKwYBBQUH
-AgEWGmh0dHA6Ly9jcHMubGV0c2VuY3J5cHQub3JnMIIBAgYKKwYBBAHWeQIEAgSB
-8wSB8ADuAHUARqVV63X6kSAwtaKJafTzfREsQXS+/Um4havy/HD+bUcAAAF8YKDd
-8AAABAMARjBEAiBDVYsIPSNUpaK4L0qEh0P2vc96bAFLL3cTjfDY13/9uwIgXUep
-BIXCRwgEI7Q3Q8oG1IQ8iE7ZcKe4kBTWsHDSE70AdQBByMqx3yJGShDGoToJQode
-TjGLGwPr60vHaPCQYpYG9gAAAXxgoN8uAAAEAwBGMEQCIFYtw6XaTBg9CEPR/dNH
-6Wdj65W2woiYybzXjj4dObBxAiBu5lK2PZ1LEytU73Ns9hgX0MTJRSggr1dUBCy8
-HN5cyDANBgkqhkiG9w0BAQsFAAOCAQEAL2M2cXPLefu1kk8B+J4G3v1G5mm/dhq2
-7Td71T/XFmeo4TCsbP0JJLfaaTfITrA+Yc3inC1idlThyudwJoJvrGEEfP+ZMBzk
-KnwYxv1WFSd7fixzHE+UHzZIbOTpld9jaGNrMjDe4jOUp+kKJZKgznZ+W+1jSxJw
-2DSvAh5HKNPhM945XCw6DyDGfTFPGYe1ZwwZ4eb/2z6lk054taRtlL6DC5Q13lD7
-hH4XC8wp5DFv6hfsb2Im0Crr/ovYz4QsipWjIgZpqHb5/nkteTjyW69egws2qv9B
-OPsHnl2EwTc87eNubvvUPHB9mn9zu4qKr/bvdGTc5nwAzQF3pAGr6A==
+AgEWGmh0dHA6Ly9jcHMubGV0c2VuY3J5cHQub3JnMIIBBAYKKwYBBAHWeQIEAgSB
+9QSB8gDwAHYA36Veq2iCTx9sre64X04+WurNohKkal6OOxLAIERcKnMAAAF9/GGj
+UgAABAMARzBFAiEA9zbO85zoD+jCmKOWvEXpXciZqeZf/vJxOZQ6dnp7YVoCIAQC
+ytSgTPQu++IHywsPUbMMGeNcCU57u9XyR5L31jcMAHYAKXm+8J45OSHwVnOfY6V3
+5b5XfZxgCvj5TV0mXCVdx4QAAAF9/GGjSgAABAMARzBFAiEA0QxdXaUh9UcBph5+
+Xu+CruICyLFkdxH3CrFLYTSiPP8CICsWmeA1pANFtjGAVJ3hvpmwxQ/7LUmPds/l
+23lFBjr3MA0GCSqGSIb3DQEBCwUAA4IBAQBYCs7xYxOzMt446JXg4GXCh0ZfG7Cz
+4fgkbhLT14eUgKfkbqDMEazc704ryqai4JcaVd+iS9zdjDspiX8lNl6sGK/9ZNtN
+qwFe0t3RyWko9S3KRt5GLDfABaLVyMsym2hBva1MNkLynFbt17N5b9LCki3nADpk
+YFKXxQ5ZFIHvCnckbNfaQh7DjpkjlQEL4ZhAnssXETuLEj/WfJdtbYnkOceF7IZW
+PG+TG9NVF2LFRQlbxxcSZRkrMmblams6PK2afhnW6ckxMAVmBTZyjWBdQF+X/Y7A
+Slz0ecPnH5BycecXUvEss9a6UOpf1ivHYPL/E7Vd9lXL6tuy+Y/CL50n
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw