mirror
/
OpenBuilds-CONTROL
kopia lustrzana https://github.com/OpenBuilds/OpenBuilds-CONTROL
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix #328

pull/348/head
unknown 2024-04-07 12:23:14 +02:00
rodzic 8e4d605c3b
commit 20dfc43235
2 zmienionych plików z 14 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
CHANGELOG.txt
Wyświetl plik

@ -1,4 +1,4 @@
v1.0.371: (Unreleased): Disable CSC signing as a test, Updated Build environment, Switched to new Notarizing workflow for MacOS, Merged fixes for #323 Macro Sorting issue, #345 Update Grbl Settings for if settings are changed from macro/terminal/etc and #332 Center Probing Offset calculation bug, Added Reset prompt to end of Calibration routine (#344), Fixed #343 SiLabs USB descriptor, Removed BlackBox X32 advertisement
v1.0.371: (Unreleased): Disable CSC signing as a test, Updated Build environment, Switched to new Notarizing workflow for MacOS, Merged fixes for #323 Macro Sorting issue, #345 Update Grbl Settings for if settings are changed from macro/terminal/etc and #332 Center Probing Offset calculation bug, Added Reset prompt to end of Calibration routine (#344), Fixed #343 SiLabs USB descriptor, Removed BlackBox X32 advertisement, #328 Improved Flashing Wizard and added warning to backup
v1.0.370: Fixed typo in an error message, Updated SSL Certificates
v1.0.369: Fixed bug in firmware flashing tool
v1.0.368: Updated grblHAL firmware images to 20230501, updated grblHAL Settings templates, added 3-Axes with Door firmware, Fixed bug in Firmware flashing tool for Interface > Firmware Version when offline, Updated included Interface firmware version

15
app/wizards/flashingtool2/flashingtool.js
Wyświetl plik

@ -9,6 +9,7 @@ function flashToolBoard(device) {
$("#flash-tool-erase-row").hide();
$("#flash-tool-interface-fw-row").hide();
$("#flash-tool-custom-row").hide();
$("#flash-tool-backup-row").show();
$("#customFirmwareSet").html("Please select the Grbl Firmware hex file you want to flash");
} else if (device == "blackboxx32") {
$("#grblHalAxesCount").data("select").val("3axes-grblhal")
@ -17,6 +18,7 @@ function flashToolBoard(device) {
$("#flash-tool-erase-row").show();
$("#flash-tool-interface-fw-row").hide();
$("#flash-tool-custom-row").hide();
$("#flash-tool-backup-row").show();
$("#customFirmwareSet").html("Please select the GrblHAL Firmware binary file you want to flash");
} else if (device == "interfacev1") {
$("#interfaceFirmwareVer").data("select").val("online")
@ -24,6 +26,7 @@ function flashToolBoard(device) {
$("#flash-tool-grblhal-row").hide();
$("#flash-tool-erase-row").hide();
$("#flash-tool-interface-fw-row").show();
$("#flash-tool-backup-row").hide();
$("#customFirmwareSet").html("Please select the Interface Firmware binary file you want to flash");
}
@ -85,11 +88,11 @@ function openFlashingTool() {
</div>
</div>
<div class="row" id="flash-tool-erase-row" style="display: none;">
<div class="row" id="flash-tool-erase-row">
<div class="cell-md-3 mb-1">Erase Settings</div>
<div class="cell-md-9 mb-1">
<select data-prepend="&nbsp;<i class='fas fa-eraser'></i>" data-role="select" data-filter="false" id="flashErase" data-editable="true">
<option value="flashonly">Flash firmware, do not erase settings </option>
<option value="flashonly">Flash firmware, do not erase settings (only applies to updates)</option>
<option value="flasherase">Flash firmware and erase settings</option>
</select>
</div>
@ -107,6 +110,14 @@ function openFlashingTool() {
</div>
</div>
<div class="row mt-2" id="flash-tool-backup-row">
<div class="cell-md-3 mb-1">Warning</div>
<div class="cell-md-9 mb-1">
<p class="remark alert">
Before upgrading a controller that has already been configured, make sure you have a Grbl Settings Backup before proceeding! If you don't have a backup you may stand to lose your configuration and have to redo it manually
</p>
</div>
</div>
`