kopia lustrzana https://github.com/OpenBuilds/OpenBuilds-CONTROL
Porównaj commity
35 Commity
24cedb48bc
...
2c14907c7e
Autor | SHA1 | Data |
---|---|---|
unknown | 2c14907c7e | |
unknown | 6ea08ab922 | |
unknown | c3e3860d5a | |
unknown | 6711cdbbe1 | |
unknown | 0b7e5b8821 | |
unknown | 45b07e2190 | |
unknown | ae565e42bb | |
unknown | fd849f0c1b | |
unknown | 8441736cc6 | |
unknown | 499ecc0086 | |
unknown | 61fdba2730 | |
unknown | ab64a2b138 | |
unknown | 0fddf2e638 | |
unknown | 2fb8abe2a2 | |
unknown | 09eb353758 | |
unknown | 1459fd6de7 | |
unknown | bdba80a499 | |
unknown | d9d2edd249 | |
unknown | 296992ae72 | |
unknown | d7ad21522b | |
unknown | a1bd00028f | |
unknown | 7872bcbf42 | |
unknown | 6f1eab1e7d | |
unknown | 32f02b1cac | |
unknown | 6452a26bf7 | |
unknown | 14dfab6154 | |
unknown | 31d78f4068 | |
unknown | 68e8b3f7d6 | |
Peter van der Walt | c52e659774 | |
unknown | bf90e9f91d | |
sharmstr | 7aec4106c1 | |
unknown | 1a5d10c4e4 | |
unknown | 14ec019b61 | |
unknown | d495d43e31 | |
Shawn | 678fe8883b |
|
@ -8,7 +8,6 @@ jobs:
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
# os: [macos-latest, windows-latest, ubuntu-20.04]
|
|
||||||
os: [macos-latest, windows-latest, ubuntu-latest]
|
os: [macos-latest, windows-latest, ubuntu-latest]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
@ -33,7 +32,7 @@ jobs:
|
||||||
if: startsWith(matrix.os, 'windows')
|
if: startsWith(matrix.os, 'windows')
|
||||||
id: variables
|
id: variables
|
||||||
run: |
|
run: |
|
||||||
echo "::set-output name=version::${GITHUB_REF#refs/tags/v}"
|
echo "version=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
|
||||||
echo "SM_CODE_SIGNING_CERT_SHA1_HASH=${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }}" >> "$GITHUB_ENV"
|
echo "SM_CODE_SIGNING_CERT_SHA1_HASH=${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }}" >> "$GITHUB_ENV"
|
||||||
echo "SM_HOST=${{ secrets.SM_HOST }}" >> "$GITHUB_ENV"
|
echo "SM_HOST=${{ secrets.SM_HOST }}" >> "$GITHUB_ENV"
|
||||||
echo "SM_API_KEY=${{ secrets.SM_API_KEY }}" >> "$GITHUB_ENV"
|
echo "SM_API_KEY=${{ secrets.SM_API_KEY }}" >> "$GITHUB_ENV"
|
||||||
|
@ -81,25 +80,17 @@ jobs:
|
||||||
github_token: ${{ secrets.github_token }}
|
github_token: ${{ secrets.github_token }}
|
||||||
release: true
|
release: true
|
||||||
debugElectron: true
|
debugElectron: true
|
||||||
|
# Used to Sign before notarizing with Notarize.js
|
||||||
|
mac_certs: ${{ secrets.mac_certs }}
|
||||||
|
mac_certs_password: ${{ secrets.mac_certs_password }}
|
||||||
env:
|
env:
|
||||||
# new MacOS notarize secrets (2024)
|
#npm_config_verbose: true
|
||||||
npm_config_verbose: true
|
#npm_config_loglevel: verbose
|
||||||
npm_config_loglevel: verbose
|
# new MacOS notarize.js secrets (2024)
|
||||||
DEBUG: electron-builder # To debug electron-builder
|
DEBUG: electron-builder # To debug electron-builder
|
||||||
APPLE_ID: ${{ secrets.APPLE_ID }}
|
APPLE_ID: ${{ secrets.APPLE_ID }}
|
||||||
APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
|
APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
|
||||||
APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
|
APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
|
||||||
|
# Required to authenticate Signing certs
|
||||||
# # new Windows Signing (2024)
|
API_KEY_ID: ${{ secrets.api_key_id }}
|
||||||
# - name: Signing using Signtool
|
API_KEY_ISSUER_ID: ${{ secrets.api_key_issuer_id }}
|
||||||
# if: startsWith(matrix.os, 'windows')
|
|
||||||
# run: |
|
|
||||||
# signtool.exe sign /sha1 ${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }} /tr http://timestamp.digicert.com /td SHA256 /fd SHA256 "D:\a\OpenBuilds-CONTROL\OpenBuilds-CONTROL\dist\*.exe"
|
|
||||||
# signtool.exe verify /v /pa "D:\a\OpenBuilds-CONTROL\OpenBuilds-CONTROL\dist\*.exe"
|
|
||||||
#
|
|
||||||
# - name: Upload artifacts
|
|
||||||
# uses: actions/upload-artifact@v2
|
|
||||||
# with:
|
|
||||||
# name: ${{ matrix.os }}
|
|
||||||
# path: |
|
|
||||||
# dist/*.exe
|
|
||||||
|
|
|
@ -1,12 +1,17 @@
|
||||||
v1.0.372: (Upcoming release, not available yet)
|
v1.0.373:
|
||||||
|
- Fixed issue #356 Merged fix for Select all text in droInput on click
|
||||||
|
- Experimental fix for MacOS / Silicon Labs USB driver (Forced RTS / CTS handshake)
|
||||||
|
- Re-enabled MacOS Code Signing and Notarization
|
||||||
|
v1.0.372:
|
||||||
- Updated Max Rate for LEAD1010 Plasma Add On profile
|
- Updated Max Rate for LEAD1010 Plasma Add On profile
|
||||||
- Added electron's app.setAppUserModelId(id) to clean up Windows notications (to be tested)
|
- Added electron's app.setAppUserModelId(id) to clean up Windows notications (to be tested)
|
||||||
- Fixed Issue #126 Support Inch measurements in Probe > Endmill Diameter
|
- Fixed Issue #126 Support Inch measurements in Probe > Endmill Diameter
|
||||||
- Fixed Issue #306 In grblHAL 4th axes build, let fixGrblHALSettings force $376=1 to designate A axis as Rotary
|
- Fixed Issue #306 In grblHAL 4th axes build, let fixGrblHALSettings force $376=1 to designate A axis as Rotary
|
||||||
- Fixed Issue #335 Keyboard shortcuts - handle Metro naming of keys in Macro's Keyboard Shortcuts
|
- Fixed Issue #335 Keyboard shortcuts - handle Metro naming of keys in Macro's Keyboard Shortcuts
|
||||||
- Fixed Issue #347 Added Interface's Wifi Config to Interface USB Prep Wizard (Pending Interface Firmware update work)
|
|
||||||
- Fixed Issue #353 Jog buttons no longer accidentally change override sliders if sliders was in focus
|
- Fixed Issue #353 Jog buttons no longer accidentally change override sliders if sliders was in focus
|
||||||
- Fixed Issue #354 Updated LEAD1010 Plasma Profiles for Interface (Pending Interface Firmware update work)
|
- (Interface) Fixed Issue #347 Added Interface's Wifi Config to Interface USB Prep Wizard (Requires Interface Firmware update to V1.58 to work)
|
||||||
|
- (Interface) Fixed Issue #354 Updated LEAD1010 Plasma Profiles for Interface (Requires Interface Firmware update to V1.58 to work)
|
||||||
|
- (Interface) Updated include Interface firmware binary to V1.58 (please flash your Interface from Wizards and Tools > Firmware flashing tool)
|
||||||
v1.0.371:
|
v1.0.371:
|
||||||
- Fixed Issue #257 Changed Arc drawing behavior for G2 full circles in 3D viewer
|
- Fixed Issue #257 Changed Arc drawing behavior for G2 full circles in 3D viewer
|
||||||
- Fixed Issue #285 Updated ACRO with Pen servo default Grbl profile PWM parameters
|
- Fixed Issue #285 Updated ACRO with Pen servo default Grbl profile PWM parameters
|
||||||
|
|
|
@ -175,6 +175,7 @@ $(document).ready(function() {
|
||||||
} else if (unit == "in") {
|
} else if (unit == "in") {
|
||||||
$("#xPosInput").show().focus().val((laststatus.machine.position.work.x / 25.4).toFixed(3))
|
$("#xPosInput").show().focus().val((laststatus.machine.position.work.x / 25.4).toFixed(3))
|
||||||
}
|
}
|
||||||
|
document.getElementById("xPosInput").select();
|
||||||
});
|
});
|
||||||
|
|
||||||
$("#xPosInput").blur(function() {
|
$("#xPosInput").blur(function() {
|
||||||
|
@ -217,6 +218,7 @@ $(document).ready(function() {
|
||||||
} else if (unit == "in") {
|
} else if (unit == "in") {
|
||||||
$("#yPosInput").show().focus().val((laststatus.machine.position.work.y / 25.4).toFixed(3))
|
$("#yPosInput").show().focus().val((laststatus.machine.position.work.y / 25.4).toFixed(3))
|
||||||
}
|
}
|
||||||
|
document.getElementById("yPosInput").select();
|
||||||
});
|
});
|
||||||
|
|
||||||
$("#yPosInput").blur(function() {
|
$("#yPosInput").blur(function() {
|
||||||
|
@ -257,6 +259,7 @@ $(document).ready(function() {
|
||||||
} else if (unit == "in") {
|
} else if (unit == "in") {
|
||||||
$("#zPosInput").show().focus().val((laststatus.machine.position.work.z / 25.4).toFixed(3))
|
$("#zPosInput").show().focus().val((laststatus.machine.position.work.z / 25.4).toFixed(3))
|
||||||
}
|
}
|
||||||
|
document.getElementById("zPosInput").select();
|
||||||
});
|
});
|
||||||
|
|
||||||
$("#zPosInput").blur(function() {
|
$("#zPosInput").blur(function() {
|
||||||
|
@ -401,7 +404,7 @@ $(document).ready(function() {
|
||||||
|
|
||||||
|
|
||||||
$('.xM').on('touchstart mousedown', function(ev) {
|
$('.xM').on('touchstart mousedown', function(ev) {
|
||||||
console.log(ev)
|
//console.log(ev)
|
||||||
if (ev.which > 1) {
|
if (ev.which > 1) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
BIN
firmware.bin
BIN
firmware.bin
Plik binarny nie jest wyświetlany.
22
index.js
22
index.js
|
@ -185,6 +185,9 @@ var lastsentuploadprogress = 0;
|
||||||
// Electron app
|
// Electron app
|
||||||
const electron = require('electron');
|
const electron = require('electron');
|
||||||
const electronApp = electron.app;
|
const electronApp = electron.app;
|
||||||
|
|
||||||
|
electronApp.setAppUserModelId("openbuilds.control")
|
||||||
|
|
||||||
const {
|
const {
|
||||||
dialog
|
dialog
|
||||||
} = require('electron')
|
} = require('electron')
|
||||||
|
@ -1128,12 +1131,24 @@ io.on("connection", function(socket) {
|
||||||
|
|
||||||
if (status.comms.connectionStatus < 1) {
|
if (status.comms.connectionStatus < 1) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (data.type == "usb") {
|
if (data.type == "usb") {
|
||||||
console.log("connect", "Connecting to " + data.port + " via " + data.type);
|
console.log("connect", "Connecting to " + data.port + " via " + data.type);
|
||||||
|
|
||||||
|
// Fix for autoreset getting stuck on MacOS with Silabs Chip
|
||||||
|
var allowRtsCts = false
|
||||||
|
var allowHupcl = false
|
||||||
|
if (process.platform == 'darwin') {
|
||||||
|
allowRtsCts = true
|
||||||
|
allowHupcl = true
|
||||||
|
}
|
||||||
|
|
||||||
port = new SerialPort({
|
port = new SerialPort({
|
||||||
path: data.port,
|
path: data.port,
|
||||||
baudRate: parseInt(data.baud),
|
baudRate: parseInt(data.baud),
|
||||||
hupcl: false // Don't set DTR - useful for X32 Reset
|
rtscts: allowRtsCts,
|
||||||
|
hupcl: allowHupcl // Don't set DTR - useful for X32 Reset
|
||||||
});
|
});
|
||||||
} else if (data.type == "telnet") {
|
} else if (data.type == "telnet") {
|
||||||
console.log("connect", "Connecting to " + data.ip + " via " + data.type);
|
console.log("connect", "Connecting to " + data.ip + " via " + data.type);
|
||||||
|
@ -1240,6 +1255,7 @@ io.on("connection", function(socket) {
|
||||||
}, config.grblWaitTime * 2000);
|
}, config.grblWaitTime * 2000);
|
||||||
|
|
||||||
setTimeout(function() {
|
setTimeout(function() {
|
||||||
|
|
||||||
if (status.machine.firmware.type.length > 1) {
|
if (status.machine.firmware.type.length > 1) {
|
||||||
if (status.machine.firmware.type === "grbl") {
|
if (status.machine.firmware.type === "grbl") {
|
||||||
debug_log("GRBL detected");
|
debug_log("GRBL detected");
|
||||||
|
@ -1248,6 +1264,7 @@ io.on("connection", function(socket) {
|
||||||
'response': "Detecting Firmware: Detected Grbl Succesfully",
|
'response': "Detecting Firmware: Detected Grbl Succesfully",
|
||||||
'type': 'info'
|
'type': 'info'
|
||||||
}
|
}
|
||||||
|
|
||||||
setTimeout(function() {
|
setTimeout(function() {
|
||||||
io.sockets.emit('grbl', status.machine.firmware)
|
io.sockets.emit('grbl', status.machine.firmware)
|
||||||
//v1.0.318 - commented out as a test - too many normal alarms clear prematurely
|
//v1.0.318 - commented out as a test - too many normal alarms clear prematurely
|
||||||
|
@ -3088,7 +3105,6 @@ if (isElectron()) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function createJogWindow() {
|
function createJogWindow() {
|
||||||
electronApp.setAppUserModelId("com.openbuilds.control")
|
|
||||||
// Create the browser window.
|
// Create the browser window.
|
||||||
jogWindow = new BrowserWindow({
|
jogWindow = new BrowserWindow({
|
||||||
// 1366 * 768 == minimum to cater for
|
// 1366 * 768 == minimum to cater for
|
||||||
|
@ -3357,6 +3373,7 @@ https.get("https://raw.githubusercontent.com/OpenBuilds/firmware/main/interface/
|
||||||
'type': 'info'
|
'type': 'info'
|
||||||
}
|
}
|
||||||
io.sockets.emit('data', output);
|
io.sockets.emit('data', output);
|
||||||
|
debug_log(JSON.stringify(output));
|
||||||
|
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
@ -3675,4 +3692,5 @@ function scanForTelnetDevices(range) {
|
||||||
}
|
}
|
||||||
// end LAN Scanner
|
// end LAN Scanner
|
||||||
|
|
||||||
|
|
||||||
process.on('exit', () => debug_log('exit'))
|
process.on('exit', () => debug_log('exit'))
|
14
package.json
14
package.json
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "OpenBuildsCONTROL",
|
"name": "OpenBuildsCONTROL",
|
||||||
"version": "1.0.372",
|
"version": "1.0.374",
|
||||||
"license": "AGPL-3.0",
|
"license": "AGPL-3.0",
|
||||||
"description": "OpenBuildsCONTROL CNC Machine Host Software",
|
"description": "OpenBuildsCONTROL CNC Machine Host Software",
|
||||||
"author": "github.com/openbuilds <support@openbuilds.com>",
|
"author": "github.com/openbuilds <support@openbuilds.com>",
|
||||||
|
@ -55,7 +55,16 @@
|
||||||
"category": "public.app-category.graphics-design",
|
"category": "public.app-category.graphics-design",
|
||||||
"entitlements": "build/entitlements.mac.plist",
|
"entitlements": "build/entitlements.mac.plist",
|
||||||
"entitlementsInherit": "build/entitlements.mac.plist",
|
"entitlementsInherit": "build/entitlements.mac.plist",
|
||||||
"notarize": false
|
"hardenedRuntime":true,
|
||||||
|
"gatekeeperAssess": false,
|
||||||
|
"notarize": false,
|
||||||
|
"target": {
|
||||||
|
"target": "default",
|
||||||
|
"arch": [
|
||||||
|
"x64",
|
||||||
|
"arm64"
|
||||||
|
]
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"icon": "build/icon.icns",
|
"icon": "build/icon.icns",
|
||||||
"appId": "openbuilds.control",
|
"appId": "openbuilds.control",
|
||||||
|
@ -145,6 +154,7 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"dmg": {
|
"dmg": {
|
||||||
|
"sign": false,
|
||||||
"icon": "build/icon.icns",
|
"icon": "build/icon.icns",
|
||||||
"contents": [
|
"contents": [
|
||||||
{
|
{
|
||||||
|
|
Ładowanie…
Reference in New Issue