Skip to content

Commit bca135b

Browse files
petervanderwaltpetervanderwalt
committed
Preselect tools based on machine type
1 parent e03c201 commit bca135b

File tree

3 files changed

+34
-11
lines changed

3 files changed

+34
-11
lines changed

‎app/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1815,11 +1815,11 @@
18151815
<!-- end job completion confirmation -->
18161816

18171817
<!-- Saving Grbl Parameters Progress -->
1818-
<div class="dialog dark" data-role="dialog" id="savingGrblSettingsProgress" data-role="dialog" data-overlay-click-close="false" data-close-button="false">
1818+
<div class="dialog dark" data-role="dialog" id="savingGrblSettingsProgress" data-role="dialog" data-overlay-click-close="false" data-close-button="false" data-width="600">
18191819
<div class="dialog-title"><i class="fas fa-microchip"></i> Saving Grbl Settings</div>
18201820
<div class="dialog-content">
18211821

1822-
Writing changed parameters to controller:<p>
1822+
Writing changed parameters to controller's onboard memory:<p>
18231823

18241824
<table class="table striped compact">
18251825
<thead>

‎app/js/grbl-settings-defaults.js‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ function selectMachine(type) {
8181
$131: "325.000", //"Y-axis maximum travel, millimeters"
8282
$132: "85.000", //"Z-axis maximum travel, millimeters"
8383
}
84+
setSelectedToolhead('router11');
8485
} else if (type == "sphinx1050") {
8586
// Sphinx 1050
8687
var customFirmware = false;
@@ -120,6 +121,7 @@ function selectMachine(type) {
120121
$131: "325", //"Y-axis maximum travel, millimeters"
121122
$132: "85", //"Z-axis maximum travel, millimeters"
122123
}
124+
setSelectedToolhead('router11');
123125
} else if (type == "workbee1050") {
124126
//Workbee 1050 COMPLETE with homing switches
125127
var customFirmware = false;
@@ -159,6 +161,7 @@ function selectMachine(type) {
159161
$131: "762.000", //"Y-axis maximum travel, millimeters"
160162
$132: "122.000", //"Z-axis maximum travel, millimeters"
161163
}
164+
setSelectedToolhead('router11');
162165
} else if (type == "workbee1010") {
163166
// Workbee 1010
164167
var customFirmware = false;
@@ -198,6 +201,7 @@ function selectMachine(type) {
198201
$131: "780.000", //"Y-axis maximum travel, millimeters"
199202
$132: "122.000", //"Z-axis maximum travel, millimeters"
200203
}
204+
setSelectedToolhead('router11');
201205
} else if (type == "workbee1510") {
202206
// Workbee1510
203207
var customFirmware = false;
@@ -237,6 +241,7 @@ function selectMachine(type) {
237241
$131: "1280.000", //"Y-axis maximum travel, millimeters"
238242
$132: "122.000", //"Z-axis maximum travel, millimeters"
239243
}
244+
setSelectedToolhead('router11');
240245
} else if (type == "acro55") {
241246
// Acro 55
242247
var customFirmware = 'acro';
@@ -276,6 +281,7 @@ function selectMachine(type) {
276281
$131: "300.000", //Y-axis maximum travel, millimeters
277282
$132: "70.000", //Z-axis maximum travel, millimeters
278283
}
284+
setSelectedToolhead('laser');
279285
} else if (type == "acro510") {
280286
// Acro 510
281287
var customFirmware = 'acro';
@@ -315,6 +321,7 @@ function selectMachine(type) {
315321
$131: "300.000", //Y-axis maximum travel, millimeters
316322
$132: "70.000", //Z-axis maximum travel, millimeters
317323
}
324+
setSelectedToolhead('laser');
318325
} else if (type == "acro1010") {
319326
// Acro 1010
320327
var customFirmware = 'acro';
@@ -354,6 +361,7 @@ function selectMachine(type) {
354361
$131: "800.000", //Y-axis maximum travel, millimeters
355362
$132: "70.000", //Z-axis maximum travel, millimeters
356363
}
364+
setSelectedToolhead('laser');
357365
} else if (type == "acro1510") {
358366
// Acro 1510
359367
var customFirmware = 'acro';
@@ -393,6 +401,7 @@ function selectMachine(type) {
393401
$131: "1300.000", //Y-axis maximum travel, millimeters
394402
$132: "70.000", //Z-axis maximum travel, millimeters
395403
}
404+
setSelectedToolhead('laser');
396405
} else if (type == "acro1515") {
397406
// Acro 1515
398407
var customFirmware = 'acro';
@@ -432,6 +441,7 @@ function selectMachine(type) {
432441
$131: "1300.000", //Y-axis maximum travel, millimeters
433442
$132: "70.000", //Z-axis maximum travel, millimeters
434443
}
444+
setSelectedToolhead('laser');
435445
} else if (type == "acroa1") {
436446
// Acro 1010
437447
var customFirmware = false;
@@ -479,14 +489,7 @@ function selectMachine(type) {
479489
$131: "609.000", //Y-axis maximum travel, millimeters
480490
$132: "50.000", //Z-axis maximum travel, millimeters
481491
}
482-
// Set Default Pen Up/Down values
483-
penupval = 250
484-
pendownval = 0
485-
servo = {
486-
up: penupval,
487-
down: pendownval
488-
}
489-
localStorage.setItem("servo-calibration", JSON.stringify(servo));
492+
setSelectedToolhead('scribe')
490493
// End default pen up/down
491494
} else if (type == "minimill") {
492495
// minimill
@@ -527,6 +530,7 @@ function selectMachine(type) {
527530
$131: "120.000", //"Y-axis maximum travel, millimeters"
528531
$132: "60.000", //"Z-axis maximum travel, millimeters"
529532
}
533+
setSelectedToolhead('router11');
530534
} else if (type == "cbeam") {
531535
// C-Beam Machine
532536
var customFirmware = false;
@@ -566,6 +570,7 @@ function selectMachine(type) {
566570
$131: "270.000", //"Y-axis maximum travel, millimeters"
567571
$132: "80.000", //"Z-axis maximum travel, millimeters"
568572
}
573+
setSelectedToolhead('router11');
569574
} else if (type == "cbeamxl") {
570575
// C-Beam XL:
571576
var customFirmware = false;
@@ -605,6 +610,7 @@ function selectMachine(type) {
605610
$131: "200.000", //"Y-axis maximum travel, millimeters"
606611
$132: "200.000", //"Z-axis maximum travel, millimeters"
607612
}
613+
setSelectedToolhead('router11');
608614
} else if (type == "leadmachine1010") {
609615
// Leadmachine 1010
610616
var customFirmware = false;
@@ -644,6 +650,7 @@ function selectMachine(type) {
644650
$131: "730", //"Y-axis maximum travel, millimeters"
645651
$132: "90", //"Z-axis maximum travel, millimeters"
646652
}
653+
setSelectedToolhead('router11');
647654
} else if (type == "leadmachine1010plasma") {
648655
// Leadmachine 1010
649656
var customFirmware = false;
@@ -683,6 +690,7 @@ function selectMachine(type) {
683690
$131: "830", //"Y-axis maximum travel, millimeters"
684691
$132: "80", //"Z-axis maximum travel, millimeters"
685692
}
693+
setSelectedToolhead('plasma')
686694
} else if (type == "leadmachine1515") {
687695
// Leadmachine 1010
688696
var customFirmware = false;
@@ -722,6 +730,7 @@ function selectMachine(type) {
722730
$131: "1270", //"Y-axis maximum travel, millimeters"
723731
$132: "90", //"Z-axis maximum travel, millimeters"
724732
}
733+
setSelectedToolhead('router11');
725734
} else if (type == "leadmachine1010laser") {
726735
// Leadmachine 55
727736
var customFirmware = false;
@@ -761,6 +770,7 @@ function selectMachine(type) {
761770
$131: "730", //"Y-axis maximum travel, millimeters"
762771
$132: "90", //"Z-axis maximum travel, millimeters"
763772
}
773+
setSelectedToolhead('laser');
764774
} else if (type == "custom") {
765775
// Leadmachine 55
766776
var customFirmware = false;
@@ -800,7 +810,9 @@ function selectMachine(type) {
800810
$131: "1000", //"Y-axis maximum travel, millimeters"
801811
$132: "100", //"Z-axis maximum travel, millimeters"
802812
}
813+
setSelectedToolhead('router11')
803814
}
815+
804816
for (var key in grblParams_def) {
805817
if (grblParams_def.hasOwnProperty(key)) {
806818
var j = key.substring(1)

‎app/js/grbl-settings.js‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ function grblSaveSettings() {
572572
toSaveCommands = [];
573573
askToResetOnGrblSettingsChange();
574574
}
575-
}, 400); // send another command every 200ms
575+
}, 400); // send another command every 400ms
576576
}
577577

578578
}
@@ -1027,4 +1027,15 @@ function setSelectedToolhead(value) {
10271027
} else {
10281028
console.error('Toolhead not found:', value);
10291029
}
1030+
1031+
if (value == "scribe") {
1032+
// Set Default Pen Up/Down values
1033+
penupval = 250
1034+
pendownval = 0
1035+
servo = {
1036+
up: penupval,
1037+
down: pendownval
1038+
}
1039+
localStorage.setItem("servo-calibration", JSON.stringify(servo));
1040+
}
10301041
}

0 commit comments

Comments
 (0)