Internal Test

OpenBuilds · Feb 19, 2025 · feaf67a · feaf67a
1 parent cdc3bf0
commit feaf67a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,5 +1,6 @@
 v1.0.389
 - Add pseudo filename entry for surfacing wizard jobs (cosmetic) #383
+- Add Mpos Gotozero menu item to Mobile Jog
 v1.0.387/388
 - Improved Feature request #375 handling of localstorage
 v1.0.386

diff --git a/app/jog/index.html b/app/jog/index.html
@@ -211,6 +211,7 @@
                     <ul class="d-menu context drop-shadow" data-role="dropdown">
                       <li id="gotozeroWPos"><a href="#"><span class="fas fa-chart-line fg-openbuilds icon"></span>GOTO X0Y0Z0 (Work Coord) (G0 Z5, G0 X0 Y0, G0 Z0) (Retract Z to Work Coord Z5)</a></li>
                       <li id="gotozeroMPos"><a href="#"><span class="fas fa-chart-line fg-openbuilds icon"></span>GOTO X0Y0Z0 (Machine Coord) (G53 G0 Z0, G0 X0 Y0, G0 Z0) (Retract Z to Machine Coord Z0)</a></li>
+                      <li id="gotozeroZmPosXYwPos"><a href="#"><span class="fas fa-chart-line fg-openbuilds icon"></span>GOTOZERO (Z Machine Coord, XY Work Coord) (G53 G0 Z<span class="PullOffMPos">0</span>, G0 X0 Y0, G0 Z0) (Retract Z to  Machine Coord)</a></li>
                     </ul>
                   </div>
                 </td>
@@ -435,4 +436,4 @@
   <script type="text/javascript" src="../js/jog.js"></script>
   <script type="text/javascript" src="../js/mobilejog.js"></script>
 
-</html>
+</html>
diff --git a/app/wizards/flashingtool2/flashingtool.js b/app/wizards/flashingtool2/flashingtool.js
@@ -53,7 +53,7 @@ function openFlashingTool() {
       <li><a href="#" onclick="flashToolBoard('blackboxx32');"><img src="/wizards/flashingtool2/img/bbx32-icon.png" height="32"> <b>BlackBox X32</b></a></li>
       <!-- li><a href="#" onclick="flashToolBoard('blackbox4x');"><img src="/wizards/flashingtool2/img/bb4x-icon.png" height="32"> <b>BlackBox 4X</b></a></li -->
       <li><a href="#" onclick="flashToolBoard('interfacev1');"><img src="/wizards/flashingtool2/img/interfacev1-icon.png" height="32"> <b>Interface</b></a></li>
-      <!-- li><a href="#" onclick="flashToolBoard('bloxv1');"><img src="/wizards/flashingtool2/img/blox-icon.png" height="32"> <b>BLOX</b></a></li -->
+      <li><a href="#" onclick="flashToolBoard('bloxv1');"><img src="/wizards/flashingtool2/img/blox-icon.png" height="32"> <b>BLOX</b></a></li>
     </ul>`
 
   template += `
@@ -81,7 +81,7 @@ function openFlashingTool() {
       </div>
     </div>
 
-    <!-- div class="row" id="flash-tool-blox-row"   style="display: none;">
+    <div class="row" id="flash-tool-blox-row"   style="display: none;">
       <div class="cell-md-3 mb-1">Machine Style</div>
         <div class="cell-md-9 mb-1">
           <select data-prepend="&nbsp;<i class='fas fa-cube'></i>" data-role="select" data-filter="false" id="bloxFirmwareType" data-editable="true">
@@ -91,7 +91,7 @@ function openFlashingTool() {
           </select>
         </div>
       </div>
-    </div -->
+    </div>
 
     <div class="row" id="flash-tool-interface-fw-row" style="display: none;">
       <div class="cell-md-3 mb-1">Firmware Version</div>
@@ -427,4 +427,4 @@ function flashFirmwarefromWizard() {
   } else {
     console.log("no controller selected")
   }
-}
+}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "OpenBuildsCONTROL",
-  "version": "1.0.389",
+  "version": "1.0.390",
   "license": "AGPL-3.0",
   "description": "OpenBuildsCONTROL CNC Machine Host Software",
   "author": "github.com/openbuilds <support@openbuilds.com>",