OpenBuilds Sphinx 55`
+ overlaytype = type;
+ } else if (type == "sphinx1050") {
+ template = `
Select Machine`
+ overlaytype = "custom"
+ }
+ $('#context_toggle2').html(template);
+ $('#overlayimg').html(`
`)
+};
\ No newline at end of file
diff --git a/app/js/grbl-settings-templates.js b/app/js/grbl-settings-templates.js
new file mode 100644
index 0000000..26130eb
--- /dev/null
+++ b/app/js/grbl-settings-templates.js
@@ -0,0 +1,689 @@
+//TODO: Merge Name, Description, Template into array under object
+
+var grblSettingsTemplate2 = {
+ 0: {
+ key: `$0`,
+ title: `Step pulse time, microseconds`,
+ description: `Stepper drivers are rated for a certain minimum step pulse length. Check the data sheet or just try some numbers. You want the shortest pulses the stepper drivers can reliably recognize. If the pulses are too long, you might run into trouble when running the system at very high feed and pulse rates, because the step pulses can begin to overlap each other. We recommend something around 10 microseconds, which is the default value`,
+ template: ``,
+ utils: ``
+ },
+ 1: {
+ key: `$1`,
+ title: `Step idle delay, milliseconds`,
+ description: `Every time your steppers complete a motion and come to a stop, Grbl will delay disabling the steppers by this value. OR, you can always keep your axes enabled (powered so as to hold position) by setting this value to the maximum 255 milliseconds. Again, just to repeat, you can keep all axes always enabled by setting $1=255. The stepper idle lock time is the time length Grbl will keep the steppers locked before disabling. Depending on the system, you can set this to zero and disable it. On others, you may need 25-50 milliseconds to make sure your axes come to a complete stop before disabling. This is to help account for machine motors that do not like to be left on for long periods of time without doing something. Also, keep in mind that some stepper drivers don't remember which micro step they stopped on, so when you re-enable, you may witness some 'lost' steps due to this. In this case, just keep your steppers enabled via $1=255`,
+ template: ``,
+ utils: ``
+ },
+ 2: {
+ key: `$2`,
+ title: `Step pulse invert, mask`,
+ description: `This setting inverts the step pulse signal. By default, a step signal starts at normal-low and goes high upon a step pulse event. After a step pulse time set by $0, the pin resets to low, until the next step pulse event. When inverted, the step pulse behavior switches from normal-high, to low during the pulse, and back to high. Most users will not need to use this setting, but this can be useful for certain CNC-stepper drivers that have peculiar requirements. For example, an artificial delay between the direction pin and step pulse can be created by inverting the step pin.`,
+ template: ``,
+ utils: ``
+ },
+ 3: {
+ key: `$3`,
+ title: `Step direction invert, mask`,
+ description: `This setting inverts the direction signal for each axis. By default, Grbl assumes that the axes move in a positive direction when the direction pin signal is low, and a negative direction when the pin is high. Often, axes don't move this way with some machines. This setting will invert the direction pin signal for those axes that move the opposite way.`,
+ template: `
+ $21=1 ; Hard Limits = Enabled in your settings. + // We detected one or more Limits inputs as Triggered.
+ // Please make sure none of the Limit switches are triggered before enabling Hard Limits:
+ // + //
| PIN | + //Status | + //
|---|---|
| X-Limit | + //NOCOMM | + //
| Y-Limit | + //NOCOMM | + //
| Z-Limit | + //NOCOMM | + //
" + newParam + " : " + newParamName + "")
+ $("#grblNewParamVal").html("" + newParamVal + "")
+
+ if (saveProgressBar) {
+ saveProgressBar.val(counter / toSaveCommands.length * 100);
+ }
+ //
+ sendGcode(toSaveCommands[counter] + "\n");;
+ counter++;
+ if (counter === toSaveCommands.length) {
+ // Finished running
+ clearInterval(i);
+ grblParams = {};
+ toSaveCommands = [];
+ setTimeout(function() {
+ Metro.dialog.close('#savingGrblSettingsProgress')
+ Metro.dialog.create({
+ title: "Configuration Updated. Reset Grbl?",
+ content: "Some changes in the Grbl Configuration only take effect after a restart/reset of the controller. Would you like to Reset the controller now?
",
+ clsDialog: 'dark',
+ actions: [{
+ caption: "Yes",
+ cls: "js-dialog-close success",
+ onclick: function() {
+ setTimeout(function() {
+ sendGcode(String.fromCharCode(0x18));
+ setTimeout(function() {
+ refreshGrblSettings()
+ }, 1000); // refresh grbl settings
+ }, 800); // reset
+ }
+ },
+ {
+ caption: "Later",
+ cls: "js-dialog-close",
+ onclick: function() {
+ console.log("Do nothing")
+ refreshGrblSettings();
+ }
+ }
+ ]
+ });
+ $('#grblSettingsBadge').hide();
+ }, 1000); // Just to show settings was written
+ }
+ }, 400); // send another command every 200ms
+ }
+
+}
+
+
+// Old Gnea-Grbl way
+// function grblSaveSettings() {
+// var commands = ""
+// for (var key in grblParams) {
+// if (grblParams.hasOwnProperty(key)) {
+// var j = key.substring(1)
+// var newVal = $("#val-" + j + "-input").val();
+// // Only send values that changed
+// if (newVal !== undefined) {
+// if (parseFloat(newVal) != parseFloat(grblParams[key])) {
+// // console.log(key + ' was ' + grblParams[key] + ' but now, its ' + newVal);
+// commands += key + '=' + newVal + "\n"
+// // sendGcode(key + '=' + newVal) + "\n";
+// }
+// }
+// }
+// }
+// console.log("commands", commands)
+// socket.emit('runJob', {
+// data: commands,
+// isJob: false,
+// fileName: ""
+// });
+// grblParams = {};
+//
+// Metro.dialog.create({
+// title: "Configuration Updated. Reset Grbl?",
+// content: "Some changes in the Grbl Configuration only take effect after a restart/reset of the controller. Would you like to Reset the controller now?
",
+// actions: [{
+// caption: "Yes",
+// cls: "js-dialog-close secondary",
+// onclick: function() {
+// setTimeout(function() {
+// sendGcode(String.fromCharCode(0x18));
+// setTimeout(function() {
+// refreshGrblSettings()
+// }, 1000);
+// }, 400);
+// }
+// },
+// {
+// caption: "Later",
+// cls: "js-dialog-close",
+// onclick: function() {
+// console.log("Do nothing")
+// refreshGrblSettings();
+// }
+// }
+// ]
+// });
+// $('#grblSettingsBadge').hide();
+// }
+
+function refreshGrblSettings() {
+ $('#saveBtn').attr('disabled', true).addClass('disabled');
+ $('#saveBtnIcon').removeClass('fg-grayBlue').addClass('fg-gray');
+ grblParams = {};
+ $('#grblconfig').empty();
+ $('#grblconfig').append("Resetting the Grbl Settings will restore all the settings to factory defaults, but will keep other EEPROM settings intact. Would you like to continue?
",
+ clsDialog: 'dark',
+ actions: [{
+ caption: "Yes",
+ cls: "js-dialog-close success",
+ onclick: function() {
+ sendGcode('$RST=$');
+ refreshGrblSettings()
+ }
+ },
+ {
+ caption: "Cancel",
+ cls: "js-dialog-close",
+ onclick: function() {
+ refreshGrblSettings();
+ }
+ }
+ ]
+ });
+}
+
+function clearWCO() {
+ Metro.dialog.create({
+ title: "Are you sure?",
+ content: "Resetting the Work Coordinate Systems will erase all the coordinate system offsets currently stored in the EEPROM on the controller. Would you like to continue?
",
+ clsDialog: 'dark',
+ actions: [{
+ caption: "Yes",
+ cls: "js-dialog-close success",
+ onclick: function() {
+ sendGcode('$RST=#');
+ refreshGrblSettings()
+ }
+ },
+ {
+ caption: "Cancel",
+ cls: "js-dialog-close",
+ onclick: function() {
+ refreshGrblSettings();
+ }
+ }
+ ]
+ });
+}
+
+function clearEEPROM() {
+ Metro.dialog.create({
+ title: "Are you sure?",
+ content: "Resetting the EEPROM will erase all the Grbl Firmware settings from your controller, effectively resetting it back to factory defaults. Would you like to continue?
",
+ clsDialog: 'dark',
+ actions: [{
+ caption: "Yes",
+ cls: "js-dialog-close success",
+ onclick: function() {
+ sendGcode('$RST=*');
+ refreshGrblSettings()
+ }
+ },
+ {
+ caption: "Cancel",
+ cls: "js-dialog-close",
+ onclick: function() {
+ refreshGrblSettings();
+ }
+ }
+ ]
+ });
+}
+
+function updateToolOnSValues() {
+ $(".ToolOnS1").html((parseInt(grblParams.$30) * 0.01).toFixed(0))
+ $(".ToolOnS5").html((parseInt(grblParams.$30) * 0.05).toFixed(0))
+ $(".ToolOnS10").html((parseInt(grblParams.$30) * 0.1).toFixed(0))
+ $(".ToolOnS25").html((parseInt(grblParams.$30) * 0.25).toFixed(0))
+ $(".ToolOnS50").html((parseInt(grblParams.$30) * 0.5).toFixed(0))
+ $(".ToolOnS75").html((parseInt(grblParams.$30) * 0.75).toFixed(0))
+ $(".ToolOnS100").html(parseInt(grblParams.$30).toFixed(0))
+}
\ No newline at end of file
diff --git a/app/wizards/flashingtool2/flashingtool.js b/app/wizards/flashingtool2/flashingtool.js
new file mode 100644
index 0000000..f9d6ded
--- /dev/null
+++ b/app/wizards/flashingtool2/flashingtool.js
@@ -0,0 +1,309 @@
+var selectedControllerType = 'blackbox4x'
+
+function flashToolBoard(device) {
+ selectedControllerType = device
+ if (device == "blackbox4x") {
+ $("#grblAxesCount").data("select").val("3axes-grbl")
+ $("#flash-tool-grbl-row").show();
+ $("#flash-tool-grblhal-row").hide();
+ $("#flash-tool-interface-fw-row").hide();
+ $("#flash-tool-custom-row").hide();
+ $("#customFirmwareSet").html("Please select the Grbl Firmware hex file you want to flash");
+ } else if (device == "blackboxx32") {
+ $("#grblHalAxesCount").data("select").val("3axes-grblhal")
+ $("#flash-tool-grbl-row").hide();
+ $("#flash-tool-grblhal-row").show();
+ $("#flash-tool-interface-fw-row").hide();
+ $("#flash-tool-custom-row").hide();
+ $("#customFirmwareSet").html("Please select the GrblHAL Firmware binary file you want to flash");
+ } else if (device == "interfacev1") {
+ $("#interfaceFirmwareVer").data("select").val("online")
+ $("#flash-tool-grbl-row").hide();
+ $("#flash-tool-grblhal-row").hide();
+ $("#flash-tool-interface-fw-row").show();
+ $("#customFirmwareSet").html("Please select the Interface Firmware binary file you want to flash");
+ }
+
+}
+
+function openFlashingTool() {
+ var template = `
+
+
+ You can use this wizard to flash Firmware onto compatible controllers. Only use with care, or when instructed by Support
+-
+
BlackBox 4X
+ 
BlackBox X32
+ 
Interface
+
+
+
+
+
+ Port
+
+
+
+
+
+ Machine Style
+
+
+
+