Skip to content

Commit feaf67a

Browse files
Internal Test
1 parent cdc3bf0 commit feaf67a

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

CHANGELOG.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
v1.0.389
22
- Add pseudo filename entry for surfacing wizard jobs (cosmetic) #383
3+
- Add Mpos Gotozero menu item to Mobile Jog
34
v1.0.387/388
45
- Improved Feature request #375 handling of localstorage
56
v1.0.386

app/jog/index.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@
211211
<ul class="d-menu context drop-shadow" data-role="dropdown">
212212
<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>
213213
<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>
214+
<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>
214215
</ul>
215216
</div>
216217
</td>
@@ -435,4 +436,4 @@
435436
<script type="text/javascript" src="../js/jog.js"></script>
436437
<script type="text/javascript" src="../js/mobilejog.js"></script>
437438

438-
</html>
439+
</html>

app/wizards/flashingtool2/flashingtool.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ function openFlashingTool() {
5353
<li><a href="#" onclick="flashToolBoard('blackboxx32');"><img src="/wizards/flashingtool2/img/bbx32-icon.png" height="32"> <b>BlackBox X32</b></a></li>
5454
<!-- li><a href="#" onclick="flashToolBoard('blackbox4x');"><img src="/wizards/flashingtool2/img/bb4x-icon.png" height="32"> <b>BlackBox 4X</b></a></li -->
5555
<li><a href="#" onclick="flashToolBoard('interfacev1');"><img src="/wizards/flashingtool2/img/interfacev1-icon.png" height="32"> <b>Interface</b></a></li>
56-
<!-- li><a href="#" onclick="flashToolBoard('bloxv1');"><img src="/wizards/flashingtool2/img/blox-icon.png" height="32"> <b>BLOX</b></a></li -->
56+
<li><a href="#" onclick="flashToolBoard('bloxv1');"><img src="/wizards/flashingtool2/img/blox-icon.png" height="32"> <b>BLOX</b></a></li>
5757
</ul>`
5858

5959
template += `
@@ -81,7 +81,7 @@ function openFlashingTool() {
8181
</div>
8282
</div>
8383
84-
<!-- div class="row" id="flash-tool-blox-row" style="display: none;">
84+
<div class="row" id="flash-tool-blox-row" style="display: none;">
8585
<div class="cell-md-3 mb-1">Machine Style</div>
8686
<div class="cell-md-9 mb-1">
8787
<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() {
9191
</select>
9292
</div>
9393
</div>
94-
</div -->
94+
</div>
9595
9696
<div class="row" id="flash-tool-interface-fw-row" style="display: none;">
9797
<div class="cell-md-3 mb-1">Firmware Version</div>
@@ -427,4 +427,4 @@ function flashFirmwarefromWizard() {
427427
} else {
428428
console.log("no controller selected")
429429
}
430-
}
430+
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "OpenBuildsCONTROL",
3-
"version": "1.0.389",
3+
"version": "1.0.390",
44
"license": "AGPL-3.0",
55
"description": "OpenBuildsCONTROL CNC Machine Host Software",
66
"author": "github.com/openbuilds <[email protected]>",

0 commit comments

Comments
 (0)