Skip to content

Commit

Permalink
V1.0.379
Browse files Browse the repository at this point in the history
  • Loading branch information
petervanderwalt committed Jul 18, 2024
1 parent 788bd7c commit 5404220
Show file tree
Hide file tree
Showing 6 changed files with 534 additions and 459 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
v1.0.379:
- Major improvements to USB connection steps,
- set up parser before checking for firmware
- Added more grblHAL errors/settings descriptions
v1.0.378:
- Test fix for 4X hanging on DTR connect
v1.0.377:
Expand Down
15 changes: 15 additions & 0 deletions app/js/grbl-settings-templates.js
Original file line number Diff line number Diff line change
Expand Up @@ -885,5 +885,20 @@ var grblSettingsTemplate2 = {
description: `Auto mount SD card on startup. 0 - Auto mount SD card (1) / 1 - Hide LittleFS (2)`,
template: `<input id="val-650-input" data-role="input" data-clear-button="false" data-append="bitfield" type="number" >`,
utils: ``
},
328: {
key: `$328`,
title: `FTP port, range: 1 - 65535, reboot required`,
description: `FTP port number listening for incoming connections. NOTE: A hard reset of the controller is required after changing this setting.`,
template: `<input id="val-328-input" data-role="input" data-clear-button="false" data-append="port" type="number" >`,
utils: ``
},
372: {
key: `$372`,
title: `Invert I/O Port outputs as bitfield`,
description: ` Invert I/O Port outputs as bitfield`,
template: `<input id="val-372-input" data-role="input" data-clear-button="false" data-append="bitfield" type="number" >`,
utils: ``
}

}
6 changes: 3 additions & 3 deletions app/js/websocket.js
Original file line number Diff line number Diff line change
Expand Up @@ -1224,7 +1224,7 @@ function friendlyPort(i) {
if (laststatus.comms.interfaces.ports[i].productId == '6015' && laststatus.comms.interfaces.ports[i].vendorId == '1D50') {
// found Smoothieboard
img = 'smoothieboard.png';
note = 'Smoothieware USB Port';
note = 'Smoothieware USB Port (Not Supported)';
}
if (laststatus.comms.interfaces.ports[i].productId == '6001' && laststatus.comms.interfaces.ports[i].vendorId == '0403') {
// found FTDI FT232
Expand Down Expand Up @@ -1259,7 +1259,7 @@ function friendlyPort(i) {
if (laststatus.comms.interfaces.ports[i].productId == '7523' && laststatus.comms.interfaces.ports[i].vendorId == '1A86') {
// found CH340
img = 'uno.png';
note = 'CH340 Arduino Fake';
note = 'WCH.cn CH340 USB to UART';
}
if (laststatus.comms.interfaces.ports[i].productId == 'EA60' && laststatus.comms.interfaces.ports[i].vendorId == '10C4') {
// found CP2102
Expand All @@ -1269,7 +1269,7 @@ function friendlyPort(i) {
if (laststatus.comms.interfaces.ports[i].productId == '000A' && laststatus.comms.interfaces.ports[i].vendorId == '2E8A') {
// found CP2102
img = 'pipico.png';
note = 'Raspberry Pi Pico CDC AURT';
note = 'Raspberry Pi Pico CDC UART (Not Supported)';
}
if (laststatus.comms.interfaces.ports[i].productId == '2303' && laststatus.comms.interfaces.ports[i].vendorId == '067B') {
// found CP2102
Expand Down
98 changes: 65 additions & 33 deletions grblStrings.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 5404220

Please sign in to comment.