Skip to content

Commit

Permalink
v1.0.342
Browse files Browse the repository at this point in the history
  • Loading branch information
@petervanderwalt
petervanderwalt committed Dec 20, 2022
1 parent 5e3c66a commit ef77035
Show file tree
Hide file tree
Showing 12 changed files with 339 additions and 65 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
v1.0.342: Beta test of Electron 19 based native File Open dialog for issue #270, Basic FluidNC connectivity support, Updated SSL Certificates, Added GPU Information menu entry under Troubleshooting
v1.0.341: Updated grblHAL firmware images to fix Probe and Y2 Bugs, updated Machine Profiles
v1.0.340: Fixed bug in X32>4Axes flashing tool
v1.0.339: Updated grblHAL Binaries to fix Probe bug, Windows Taskbar jog Progress indicator, Updated Pi Install script with Node19x, Added coolant/vacuum to Surfacing Wizard
Expand Down
11 changes: 10 additions & 1 deletion app/css/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ body {
}

/* Implemented as default https://thayneco.com/expand-usb-port-selector-in-openbuilds-control/ */
#section-two div:nth-child(2) label {
#section-jog div:nth-child(2) label {
width: 350px;
}

Expand Down Expand Up @@ -62,6 +62,15 @@ body {
box-shadow: 0 0 2px 2px #ddd;
}

#fluidnceditor {
/* Note only uses height attribs from here, before we connect to websocket. After that, it gets set by websocket.js */
height: calc(100vh - 235px);
width: 100%;
border-top: 1px solid #ccc;
/* margin-top: 5px; */
box-shadow: 0 0 2px 2px #ddd;
}

#console>p {
margin-top: 5px;
}
Expand Down
155 changes: 153 additions & 2 deletions app/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,15 @@ <h3 style="cursor:pointer">Check out the all NEW OpenBuilds<sup>&reg;</sup>&nbsp
<div class="window-content" style="height: 100%; overflow: hidden !important;">
<nav data-role="ribbonmenu" class="mt-1">
<ul class="tabs-holder">
<li><a id="controlTab" href="#section-two" onclick="manualcontrolPanel();"><i class="fas fa-fw fa-play"></i> Machine Control</a></li>
<li><a id="controlTab" href="#section-jog" onclick="manualcontrolPanel();"><i class="fas fa-fw fa-play"></i> Machine Control</a></li>
<li id="grblSettings" style="display: none;"><a id="grblTab" href="#section-grbl" onclick="grblPanel();"><i class="fas fa-fw fa-sliders-h"></i> Grbl Settings</a></li>
<li id="fluidncSettings" style="display: none;"><a id="fluidncTab" href="#section-fluidnc" onclick="fluidncPanel();"><i class="fas fa-fw fa-sliders-h"></i> FluidNC Settings</a></li>
<li><a href="#section-troubleshooting" id="troubleshootingTab" onclick="troubleshootingPanel();"><i class="fas fa-fw fa-file-medical-alt"></i> Troubleshooting</a></li>
</ul>
<div class="content-holder">

<!-- Start Grbl Settings -->

<div class="section" id="section-grbl">
<div class="group">
<button class="ribbon-button disabled" onclick="grblSaveSettings();" id="saveBtn" disabled>
Expand Down Expand Up @@ -162,7 +166,114 @@ <h3 style="cursor:pointer">Check out the all NEW OpenBuilds<sup>&reg;</sup>&nbsp
<span class="title">E-Stop</span>
</div>
</div>
<div class="section" id="section-two">

<!-- End Grbl Settings -->

<!-- Start FluidNC -->

<div class="section" id="section-fluidnc">
<!-- <div class="group"> -->
<!-- <button class="ribbon-button disabled" onclick="grblSaveSettings();" id="saveBtn" disabled>
<span class="icon">
<span class="fa-layers fa-fw">
<i id="saveBtnIcon" class="fas fa-save fg-gray" data-fa-transform="grow-8"></i>
<i id="grblSettingsBadge" class="fas fa-exclamation-circle fg-red" data-fa-transform="shrink-4 right-10 up-10" style="display: none;"></i>
</span>
</span>
<span class="caption">Save<br> to Firmware</span>
</button> -->

<!-- <button class="ribbon-button" onclick="backupGrblSettings();">
<span class="icon">
<i class="fas fa-download fg-lightOrange"></i>
</span>
<span class="caption">Backup<br>Settings</span>
</button> -->

<!-- <button class="ribbon-button btn-file">
<input class="btn-file" id="grblBackupFile" type="file" accept=".txt, .settings, .grbl" />
<span class="icon">
<i class="fas fa-upload"></i>
</span>
<span class="caption">Restore<br>Backup</span>
</button> -->
<!-- <span class="title">Grbl Settings</span>
</div> -->
<div class="group">
<div class="ribbon-group" style="width: 90px;">
<button class="ribbon-icon-button" onclick="sendGcode(String.fromCharCode(0x18))">
<span class="icon">
<span class="mif-loop"></span>
</span>
<span class="caption">Restart</span>
</button>
<button class="ribbon-icon-button" onclick="sendGcode('$X')">
<span class="icon">
<span class="mif-unlock"></span>
</span>
<span class="caption">Unlock</span>
</button>
<!-- <button class="ribbon-icon-button" onclick="refreshGrblSettings();">
<span class="icon">
<i class="fas fa-sync-alt"></i>
</span>
<span class="caption">Refresh</span>
</button> -->

</div>
<span class="title">Grbl</span>
</div>
<div class="group">
<div class="ribbon-group">
<button class="ribbon-icon-button" onclick="clearSettings();">
<span class="icon">
<i class="fas fa-sliders-h"></i>
</span>
<span class="caption">Reset&nbsp;Settings</span>
</button><br>
<button class="ribbon-icon-button" onclick="clearWCO();">
<span class="icon">
<i class="fas fa-layer-group"></i>
</span>
<span class="caption">Reset&nbsp;WCOs</span>
</button><br>
<button class="ribbon-icon-button" onclick="clearEEPROM();">
<span class="icon">
<i class="fas fa-microchip"></i>
</span>
<span class="caption">Reset&nbsp;EEPROM</span>
</button>
</div>
<span class="title">Firmware Reset Defaults</span>
</div>
<div class="group estop">
<button class="ribbon-button" onclick="socket.emit('clearAlarm', 2)">
<span class="icon">
<span class="fa-layers" data-toggle="tooltip" data-placement="bottom" title="Flashes red when machine has entered ALARM state, click Clear Alarm button">
<i id="navbellBtn3" class="fas fa-bell fg-red" style="display: none;"></i>
<i class="far fa-bell"></i>
</span>
</span>
<span class="caption">Unlock<br>Alarm</span>
</button>
<button class="ribbon-button" onclick="socket.emit('stop', { stop: false, jog: false, abort: true});">
<span class="icon">
<span class="fa-layers fa-fw">
<i class="fas fa-circle fg-red" data-fa-transform="grow-8"></i>
<i class="fa-inverse far fa-hand-paper" data-fa-transform="grow-1 left-0.5"></i>
</span>
</span>
<span class="caption">Abort</span>
</button>
<span class="title">E-Stop</span>
</div>
</div>

<!-- End FluidNC -->

<!-- Start Jog/Main -->

<div class="section" id="section-jog">
<div class="group">
<button class="ribbon-button" onclick="socket.emit('openbuilds', true);">
<span class="icon">
Expand Down Expand Up @@ -222,6 +333,27 @@ <h3 style="cursor:pointer">Check out the all NEW OpenBuilds<sup>&reg;</sup>&nbsp

</ul>
</div>

<div>
<button id="openGcodeBtnElectron19" class="ribbon-button dropdown-toggle" title="Open a GCODE file">
<span class="icon">
<span class="far fa-folder-open fg-amber"></span>
</span>
<span class="caption">Open<br>G-CODE</span>
</button>
<ul class="ribbon-dropdown" data-role="dropdown" data-duration="100">
<li class="btn-file" onclick="socket.emit('openFile')"><a href="#"><i class="far fa-folder-open fa-fw"></i> <b>Open GCODE</b> from File (*.gcode, *.gc, *.tap, *.nc, *.cnc)</a> </li>
<li class="divider fg-gray"></li>

<li class=""><a href="#" onclick="socket.emit('opencam', true);"><img width="16" src="img/openbuilds.svg"> OpenBuilds CAM</a></li>
<li class=""><a href="#" onclick="socket.emit('fabber', true);"><img width="16" src="affiliates/fabber/fabber.svg"> Fabber</a></li>
<li class=""><a href="#" onclick="socket.emit('carveco', true);"><img width="16" src="affiliates/carveco/carveco.svg"> Carveco</a></li>
<li class=""><a href="#" onclick="socket.emit('lightburn', true);"><img width="16" src="affiliates/lightburn/lightburn.png"> Lightburn</a></li>
<li class=""><a href="#" onclick="socket.emit('vectric', true);"><img width="16" src="affiliates/vectric/vectric.svg"> Vectric</a></li>

</ul>
</div>

<span class="title">File</span>
</div>

Expand Down Expand Up @@ -431,6 +563,10 @@ <h3 style="cursor:pointer">Check out the all NEW OpenBuilds<sup>&reg;</sup>&nbsp

</div>

<!-- End Jog/Main -->

<!-- Start Troubleshooting -->

<div class="section" id="section-troubleshooting">
<div class="group">
<div>
Expand All @@ -444,6 +580,7 @@ <h3 style="cursor:pointer">Check out the all NEW OpenBuilds<sup>&reg;</sup>&nbsp
</button>
<ul class="ribbon-dropdown grblmode" data-role="dropdown" data-duration="100">
<li onclick="disable3Dviewer = !disable3Dviewer; saveDiagnostics(); location.reload();" id="disable3DviewerTick"><a href="#"><i class="mif-3d-rotation fa-fw"></i> Disable 3D Viewer System (For slower computers)</a></li>
<li onclick="socket.emit('gpuinfo')"><a href="#"><i class="fa fa-microchip fa-fw"></i> Show GPU Information</a></li>
<li class="divider"></li>
<li onclick="disable3Dcontrols = !disable3Dcontrols; saveDiagnostics(); location.reload();" id="disable3DcontrolsTick"><a href="#"><i class="mif-3d-rotation fa-fw"></i> Disable 3D Viewer Interactions</a></li>
<li onclick="disable3Dskybox = !disable3Dskybox; saveDiagnostics(); location.reload();" id="disable3DskyboxTick"><a href="#"><i class="mif-3d-rotation fa-fw"></i> Disable 3D Viewer Skybox/Fog</a></li>
Expand All @@ -453,6 +590,11 @@ <h3 style="cursor:pointer">Check out the all NEW OpenBuilds<sup>&reg;</sup>&nbsp
<li class="divider"></li>
<li onclick="disableSerialLog =! disableSerialLog; saveDiagnostics(); location.reload();" id="disableSerialLogTick"><a href="#"><i class="fas fa-fw fa-terminal"></i> Disable Serial Log</a></li>
<li onclick="disableDROupdates = !disableDROupdates; saveDiagnostics(); location.reload();" id="disableDROupdatesTick"><a href="#"><i class="fas fa-fw fa-list-ol"></i> Disable DRO/Status Updates</a></li>
<li class="divider"></li>
<li onclick="disableElectron19FileOpen = !disableElectron19FileOpen; saveDiagnostics(); location.reload();" id="disableElectron19FileOpenTick"><a href="#"><i class="far fa-folder-open fa-fw"></i> Disable Native File Open
Dialog</a>
</li>

</div>
<span class="title">Settings</span>
</div>
Expand Down Expand Up @@ -500,6 +642,8 @@ <h3 style="cursor:pointer">Check out the all NEW OpenBuilds<sup>&reg;</sup>&nbsp

</div>

<!-- End Troubleshooting -->

</div>
</nav>

Expand Down Expand Up @@ -1029,6 +1173,11 @@ <h3 style="cursor:pointer">Check out the all NEW OpenBuilds<sup>&reg;</sup>&nbsp
<div id="grblPanel" style="display: none;">
<div id="grblconfig"></div>
</div>

<div id="fluidncPanel" style="display: none;">
<div id="fluidnceditor"></div>
</div>

<div id="updatePanel" style="display: none;">
<div id="updateconsole">Click "Download Updates" above</div>
</div>
Expand Down Expand Up @@ -1854,6 +2003,8 @@ <h3 style="cursor:pointer">Check out the all NEW OpenBuilds<sup>&reg;</sup>&nbsp

<script type="text/javascript" src="lib/qrcode/qrcode.min.js"></script>

<script type="text/javascript" src="lib/yamljs/yaml.min.js"></script>

<script type="text/javascript" src="lib/ace/src-noconflict/ace.js"></script>
<script>
METRO_HOTKEYS_FILTER_CONTENT_EDITABLE = false;
Expand Down
2 changes: 1 addition & 1 deletion app/jog/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@
<script type="text/javascript" src="../js/main.js"></script>
<script type="text/javascript" src="../js/ui.js"></script>
<script type="text/javascript" src="../js/websocket.js"></script>
<script type="text/javascript" src="../js/grblsettings.js"></script>
<script type="text/javascript" src="../js/grbl-settings.js"></script>
<script type="text/javascript" src="../js/metroactions.js"></script>
<script type="text/javascript" src="../js/jog.js"></script>
<script type="text/javascript" src="../js/mobilejog.js"></script>
Expand Down
11 changes: 11 additions & 0 deletions app/js/diagnostics.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ var disable3Drealtimepos = false;
var disable3Dgcodepreview = false;
var disableSerialLog = false; // todo also hide tab when set to true
var disableDROupdates = false;
var disableElectron19FileOpen = false;

function saveDiagnostics() {
localStorage.setItem('disable3Dviewer', disable3Dviewer);
Expand All @@ -14,6 +15,7 @@ function saveDiagnostics() {
localStorage.setItem('disable3Dgcodepreview', disable3Dgcodepreview);
localStorage.setItem('disableSerialLog', disableSerialLog);
localStorage.setItem('disableDROupdates', disableDROupdates);
localStorage.setItem('disableElectron19FileOpen', disableElectron19FileOpen);

}

Expand Down Expand Up @@ -83,6 +85,15 @@ function initDiagnostics() {
disableDROupdates = false;
}

if (localStorage.getItem('disableElectron19FileOpen')) {
if (JSON.parse(localStorage.getItem('disableElectron19FileOpen')) == true) {
disableElectron19FileOpen = true;
$('#disableElectron19FileOpenTick').addClass("checked");
}
} else {
disableElectron19FileOpen = false;
}

};

initDiagnostics();
15 changes: 15 additions & 0 deletions app/js/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,21 @@ $(document).ready(function() {
init3D();
}

// File Open Button compatible with Node 19+ dialogs
if (!disableElectron19FileOpen) {
if (navigator.userAgent.indexOf('Electron') >= 0) {
$("#openGcodeBtn").hide()
$("#openGcodeBtnElectron19").show()
} else {
$("#openGcodeBtn").show()
$("#openGcodeBtnElectron19").hide()
}
} else {
$("#openGcodeBtn").show()
$("#openGcodeBtnElectron19").hide()
}


if (typeof ace !== 'undefined') {
editor = ace.edit("editor");
editor.$blockScrolling = Infinity;
Expand Down
13 changes: 13 additions & 0 deletions app/js/metroactions.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
function manualcontrolPanel() {
$('#manualControlPanel').show()
$('#grblPanel').hide()
$('#fluidncPanel').hide()
$('#updatePanel').hide()
$('#troubleshootingPanel').hide()
}
Expand All @@ -9,20 +10,32 @@ function grblPanel() {
grblPopulate();
$('#manualControlPanel').hide()
$('#grblPanel').show()
$('#fluidncPanel').hide()
$('#updatePanel').hide()
$('#troubleshootingPanel').hide()
}

function fluidncPanel() {
//grblPopulate();
$('#manualControlPanel').hide()
$('#grblPanel').hide()
$('#fluidncPanel').show()
$('#updatePanel').hide()
$('#troubleshootingPanel').hide()
}

function updatePanel() {
$('#manualControlPanel').hide()
$('#grblPanel').hide()
$('#fluidncPanel').hide()
$('#updatePanel').show()
$('#troubleshootingPanel').hide()
}

function troubleshootingPanel() {
$('#manualControlPanel').hide()
$('#grblPanel').hide()
$('#fluidncPanel').hide()
$('#updatePanel').hide()
$('#troubleshootingPanel').show()
}
Loading

0 comments on commit ef77035

Please sign in to comment.