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

v1.0.306

revert-223-feature/dark-mode
openbuilds-engineer 2021-12-01 17:05:38 +02:00
rodzic 6679a8a744
commit 55565617bb
9 zmienionych plików z 34 dodań i 33 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
CHANGELOG.txt
Wyświetl plik

@ -1,3 +1,4 @@
v1.0.306: Allow probing in other Coordinate systems as well
v1.0.305: Update SSL Certificates for OpenBuildsCAM integration
v1.0.304: Inch mode DRO edit use 3 Decimal places as per #216, Updated SSL Certificates
v1.0.303: Updated Interface Probe Macros

6
app/sample-macros/centercircle.js
Wyświetl plik

@ -18,7 +18,7 @@ function findCircleCenter(approxCircleDia, endmillDiameter, probeFeed) {
; Header
G21 ; mm mode
G10 P1 L20 X0 Y0 Z0 ; zero out current location
G10 P0 L20 X0 Y0 Z0 ; zero out current location
G38.2 X` + approxCircleDia / 2 + ` F` + probeFeed + ` ; Probe X` // find right side of circle
@ -63,7 +63,7 @@ function findCircleCenter(approxCircleDia, endmillDiameter, probeFeed) {
G91
G0 X` + centerdistance / 2 + `
G90
G10 P1 L20 X0
G10 P0 L20 X0
G38.2 Y` + approxCircleDia / 2 + ` F` + probeFeed + ` ; Probe Y` // find far side of circle
socket.emit('runJob', {
@ -102,7 +102,7 @@ function findCircleCenter(approxCircleDia, endmillDiameter, probeFeed) {
G91
G0 Y` + centerYdistance / 2 + `
G90
G10 P1 L20 Y0
G10 P0 L20 Y0
`
socket.emit('runJob', {

4
app/wizards/interface/PROBE/PROBEX.PRB
Wyświetl plik

@ -1,7 +1,7 @@
G21 ; mm mode
G10 P1 L20 X0 ; zero out current location
G10 P0 L20 X0 ; zero out current location
; Probe X
G38.2 X25 F100 ; Probe X
G4 P0.4
G10 P1 L20 X-<xoffset>
G10 P0 L20 X-<xoffset>
$J=G91G21X-2F1000 ; retract

8
app/wizards/interface/PROBE/PROBEXYZ.PRB
Wyświetl plik

@ -1,13 +1,13 @@
; Header
G21 ; mm mode
G10 P1 L20 X0 Y0 Z0 ; zero out current location
G10 P0 L20 X0 Y0 Z0 ; zero out current location
G1 F1000
; Probe Z
G1 X22.5 Y22.5 ; position to center of logo
G38.2 Z-25 F100 ; Probe Z
G4 P0.4
G10 P1 L20 Z<zoffset> ; Set Z6 where 6 is thickness of plate
G10 P0 L20 Z<zoffset> ; Set Z6 where 6 is thickness of plate
G91 G21 G1 Z5 F1000 ; retract
G90
@ -18,7 +18,7 @@ G1 Z-11 F1000 ; position next to plate by lowering
G90
G38.2 X25 F100 ; Probe X
G4 P0.4
G10 P1 L20 X-<xoffset> ; set X as offset and half endmill diameter
G10 P0 L20 X-<xoffset> ; set X as offset and half endmill diameter
G91
G1 X-2 F1000 ; retract
G1 Z11 F1000 ; position next to plate by lowering
@ -30,7 +30,7 @@ G91 G21 G1 Z-11 F1000 ; position next to plate by lowering
G38.2 Y25 F100 ; probe Y
G90
G4 P0.4
G10 P1 L20 Y-<yoffset> ; set Y as offset and half endmill diameter
G10 P0 L20 Y-<yoffset> ; set Y as offset and half endmill diameter
G91 G21 G1 Y-2 F1000 ; retract
G91 G21 G1 Z11 F1000 ; position next to plate by lowering
G90

4
app/wizards/interface/PROBE/PROBEY.PRB
Wyświetl plik

@ -1,7 +1,7 @@
G21 ; mm mode
G10 P1 L20 Y0 ; zero out current location
G10 P0 L20 Y0 ; zero out current location
; Probe X
G38.2 Y25 F100 ; Probe Y
G4 P0.4
G10 P1 L20 Y-<yoffset>
G10 P0 L20 Y-<yoffset>
$J=G91G21Y-2F1000 ; retract

4
app/wizards/interface/PROBE/PROBEZ.PRB
Wyświetl plik

@ -1,7 +1,7 @@
G21 ; mm mode
G10 P1 L20 Z0 ; zero out current location
G10 P0 L20 Z0 ; zero out current location
; Probe Z
G38.2 Z-25 F100 ; Probe Z
G4 P0.4
G10 P1 L20 Z<zoffset> ; Set Z` + zoffset + ` where ` + zoffset + ` is thickness of plate
G10 P0 L20 Z<zoffset> ; Set Z` + zoffset + ` where ` + zoffset + ` is thickness of plate
$J=G91G21Z5F1000 ; retract

10
app/wizards/probe/holefinder.js
Wyświetl plik

@ -16,14 +16,14 @@ function findCenter() {
; Header
G21 ; mm mode
G10 P1 L20 X0 Y0 Z0 ; zero out current location
G10 P0 L20 X0 Y0 Z0 ; zero out current location
; First we establish Zero
; Probe Z
G0 X22.5 Y22.5 ; position to center of logo
G38.2 Z-25 F100 ; Probe Z
G4 P0.3
G10 P1 L20 Z` + zoffset + ` ; Set Z6 where 6 is thickness of plate
G10 P0 L20 Z` + zoffset + ` ; Set Z6 where 6 is thickness of plate
G0 Z` + (zoffset + 5) + ` ; retract
; Probe X
@ -31,7 +31,7 @@ function findCenter() {
G0 Z` + (zoffset - 6) + ` ; drop down to be next to plate
G38.2 X25 F100 ; Probe X
G4 P0.3
G10 P1 L20 X` + xoffset + ` ; set X as offset and half endmill diameter
G10 P0 L20 X` + xoffset + ` ; set X as offset and half endmill diameter
G0 X` + (xoffset - 2).toFixed(3) + `
G0 Z` + (zoffset + 5) + ` ; retract
@ -40,7 +40,7 @@ function findCenter() {
G0 Z` + (zoffset - 6) + ` ; drop down to be next to plate
G38.2 Y25 F100 ; probe Y
G4 P0.3
G10 P1 L20 Y` + yoffset + ` ; set Y as offset and half endmill diameter
G10 P0 L20 Y` + yoffset + ` ; set Y as offset and half endmill diameter
G0 Y` + (yoffset - 2).toFixed(3) + `
G0 Z` + (zoffset + 5) + ` ; retract
G0 X0 Y0 ; return
@ -164,7 +164,7 @@ function findCenter() {
G91
G0 X-` + centerXdistance / 2 + `
G90
G10 P1 L20 X0 Y0
G10 P0 L20 X0 Y0
G0 Z` + (zoffset + 5) + ` ; retract`
socket.emit('runJob', {

28
app/wizards/probe/probev2.js
Wyświetl plik

@ -482,12 +482,12 @@ function runProbeNew() {
var xmacro = `
; Header
G21 ; mm mode
G10 P1 L20 X0 ; zero out current location
G10 P0 L20 X0 ; zero out current location
; Probe X
G38.2 X25 F100 ; Probe X
G4 P0.4
G10 P1 L20 X` + xoffset + ` ; set X as offset and half endmill diameter
G10 P0 L20 X` + xoffset + ` ; set X as offset and half endmill diameter
G0 X` + (xoffset - 2).toFixed(3) + `
`
@ -509,11 +509,11 @@ function runProbeNew() {
var ymacro = `
; Header
G21 ; mm mode
G10 P1 L20 Y0 ; zero out current location
G10 P0 L20 Y0 ; zero out current location
G38.2 Y25 F100 ; probe Y
G4 P0.4
G10 P1 L20 Y` + yoffset + ` ; set Y as offset and half endmill diameter
G10 P0 L20 Y` + yoffset + ` ; set Y as offset and half endmill diameter
G0 Y` + (yoffset - 2).toFixed(3) + `
`
socket.emit('runJob', {
@ -532,12 +532,12 @@ function runProbeNew() {
var zmacro = `
; Header
G21 ; mm mode
G10 P1 L20 Z0 ; zero out current location
G10 P0 L20 Z0 ; zero out current location
; Probe Z
G38.2 Z-25 F100 ; Probe Z
G4 P0.4
G10 P1 L20 Z` + zoffset + ` ; Set Z` + zoffset + ` where ` + zoffset + ` is thickness of plate
G10 P0 L20 Z` + zoffset + ` ; Set Z` + zoffset + ` where ` + zoffset + ` is thickness of plate
$J=G91G21Z5F1000 ; retract
`
@ -560,12 +560,12 @@ function runProbeNew() {
var zmacro = `
; Header
G21 ; mm mode
G10 P1 L20 Z0 ; zero out current location
G10 P0 L20 Z0 ; zero out current location
; Probe Z
G38.2 Z-25 F100 ; Probe Z
G4 P0.4
G10 P1 L20 Z` + zoffset + ` ; Set Z` + zoffset + ` where ` + zoffset + ` is thickness of plate
G10 P0 L20 Z` + zoffset + ` ; Set Z` + zoffset + ` where ` + zoffset + ` is thickness of plate
$J=G91G21Z5F1000 ; retract
`
@ -586,13 +586,13 @@ function runProbeNew() {
var xyzmacro = `
; Header
G21 ; mm mode
G10 P1 L20 X0 Y0 Z0 ; zero out current location
G10 P0 L20 X0 Y0 Z0 ; zero out current location
; Probe Z
G0 X22.5 Y22.5 ; position to center of logo
G38.2 Z-25 F100 ; Probe Z
G4 P0.4
G10 P1 L20 Z` + zoffset + ` ; Set Z6 where 6 is thickness of plate
G10 P0 L20 Z` + zoffset + ` ; Set Z6 where 6 is thickness of plate
G0 Z` + (zoffset + 5) + ` ; retract
; Probe X
@ -600,7 +600,7 @@ function runProbeNew() {
G0 Z` + (zoffset - 6) + ` ; drop down to be next to plate
G38.2 X25 F100 ; Probe X
G4 P0.4
G10 P1 L20 X` + xoffset + ` ; set X as offset and half endmill diameter
G10 P0 L20 X` + xoffset + ` ; set X as offset and half endmill diameter
G0 X` + (xoffset - 2).toFixed(3) + `
G0 Z` + (zoffset + 5) + ` ; retract
@ -609,7 +609,7 @@ function runProbeNew() {
G0 Z` + (zoffset - 6) + ` ; drop down to be next to plate
G38.2 Y25 F100 ; probe Y
G4 P0.4
G10 P1 L20 Y` + yoffset + ` ; set Y as offset and half endmill diameter
G10 P0 L20 Y` + yoffset + ` ; set Y as offset and half endmill diameter
G0 Y` + (yoffset - 2).toFixed(3) + `
G0 Z` + (zoffset + 5) + ` ; retract
G0 X0 Y0 ; return
@ -617,8 +617,8 @@ function runProbeNew() {
if (stockoffset.x != 0 || stockoffset.y != 0) {
xyzmacro += `
G10 P1 L20 X-` + stockoffset.x + ` ; set X stock offset
G10 P1 L20 Y-` + stockoffset.y + ` ; set Y stock offset
G10 P0 L20 X-` + stockoffset.x + ` ; set X stock offset
G10 P0 L20 Y-` + stockoffset.y + ` ; set Y stock offset
G0 X0 Y0 ; return
`
}

2
package.json
Wyświetl plik

@ -1,6 +1,6 @@
{
"name": "OpenBuildsCONTROL",
"version": "1.0.305",
"version": "1.0.306",
"license": "AGPL-3.0",
"description": "OpenBuildsCONTROL CNC Machine Interface Software",
"author": "github.com/openbuilds <support@openbuilds.com>",