Skip to content

Commit 3c153fd

Browse files
committed
Change to hard code WebSocket sub protocol
Use ISO_8601 date time format for ESP800 Update docs Bump version Build index.html.gz
1 parent 46d9e6f commit 3c153fd

File tree

20 files changed

+234
-241
lines changed

20 files changed

+234
-241
lines changed

Memo/Commands.md

Lines changed: 225 additions & 223 deletions
Large diffs are not rendered by default.

Memo/ESP3D [ESP800] format.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ can be in JSON or plain text
44

55
## Input
66

7-
`[ESP800]json=yes time=2022-08-02-12-02-18 version=3.0.0-a11 setup=0`
7+
`[ESP800]<time=YYYY-MM-DDTHH:mm:ss> <version=3.0.0-a11> <setup=0/1> json=<no> pwd=<admin password>`
88

99
* json=yes
1010
the output format
1111
* time=
12-
to set ESP3D time using format : `YYYY`-`MM`-`DD`-`HH24`-`minutes`-`seconds`
12+
to set ESP3D time using ISO 8601 format : `YYYY`-`MM`-`DD`T`HH`-`minutes`-`seconds`
1313
* version
1414
version of webUI
1515
* setup flag
@@ -34,7 +34,6 @@ can be in JSON or plain text
3434
"WebCommunication":"Synchronous",
3535
"WebSocketIP":"192.168.2.117",
3636
"WebSocketPort":"81",
37-
"WebSocketSubProtocol":"webui-v3",
3837
"Hostname":"esp3d",
3938
"WiFiMode":"STA",
4039
"WebUpdate":"Enabled",
@@ -86,8 +85,6 @@ can be in JSON or plain text
8685
Ip address for the websocket terminal `192.168.2.117`
8786
* `WebSocketPort`
8887
Port for the web socket terminal `81`
89-
* `WebSocketSubProtocol` (not yet implemented)
90-
Sub protocol to be used (e.g: `webui-v3`)
9188
* `Hostname`
9289
Hostname of ESP3D or main Baord `esp3d`
9390
* `WiFiMode`
@@ -96,7 +93,7 @@ can be in JSON or plain text
9693
Inform webUI the feature is available or not, can be `Enabled` or `Disabled`
9794
* `FlashFileSystem` (currently `FileSystem`, to be updated soon )
9895
The file system used by ESP board can be `LittleFS`, `SPIFFS`, `Fat`, `none`
99-
* `HostPath` (not yet implemented)
96+
* `HostPath`
10097
Path where the preferences.json and index.html.gz are stored and can be updated (e.g: `www`)
10198
* `Time`
10299
Type of time support

Memo/websocket.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ there are 2
1010

1111
## Terminal websocket
1212

13-
use subprotocol `webui-v3` (to be implemented)
13+
use subprotocol `webui-v3`
1414

1515
### <u>text mode</u>
1616

config/targets/CNC/GRBL/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ const commandsQuery = (req, res, SendWS) => {
9595
Authentication: "Disabled",
9696
WebCommunication: "Synchronous",
9797
WebSocketIP: "localhost",
98-
WebSocketSubProtocol: "webui-V3",
9998
WebSocketPort: "81",
10099
Hostname: "esp3d",
101100
WiFiMode: "STA",

config/targets/CNC/GRBLHal/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ const commandsQuery = (req, res, SendWS) => {
9696
Authentication: "Disabled",
9797
WebCommunication: "Synchronous",
9898
WebSocketIP: "localhost",
99-
WebSocketSubProtocol: "webui-V3",
10099
WebSocketPort: "81",
101100
Hostname: "esp3d",
102101
WiFiMode: "STA",

config/targets/Printer3D/Marlin-embedded/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,6 @@ const commandsQuery = (req, res, SendWS) => {
407407
Authentication: "Disabled",
408408
WebCommunication: "Synchronous",
409409
WebSocketIP: "localhost",
410-
WebSocketSubProtocol: "webui-V3",
411410
WebSocketPort: "81",
412411
Hostname: "esp3d",
413412
WiFiMode: "STA",

config/targets/Printer3D/Marlin/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,6 @@ const commandsQuery = (req, res, SendWS) => {
420420
Authentication: "Disabled",
421421
WebCommunication: "Synchronous",
422422
WebSocketIP: "localhost",
423-
WebSocketSubProtocol: "webui-V3",
424423
WebSocketPort: "81",
425424
Hostname: "esp3d",
426425
WiFiMode: "STA",

config/targets/Printer3D/Repetier/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,6 @@ const commandsQuery = (req, res, SendWS) => {
438438
Authentication: enableAuthentication ? "Enabled" : "Disabled",
439439
WebCommunication: "Synchronous",
440440
WebSocketIP: "localhost",
441-
WebSocketSubProtocol: "webui-V3",
442441
WebSocketPort: "81",
443442
Hostname: "esp3d",
444443
WiFiMode: "STA",

config/targets/Printer3D/Smoothieware/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,6 @@ const commandsQuery = (req, res, SendWS) => {
699699
Authentication: enableAuthentication ? "Enabled" : "Disabled",
700700
WebCommunication: "Synchronous",
701701
WebSocketIP: "localhost",
702-
WebSocketSubProtocol: "webui-V3",
703702
WebSocketPort: "81",
704703
Hostname: "smoothesp3d",
705704
WiFiMode: "STA",

config/targets/SandTable/GRBL/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ const commandsQuery = (req, res, SendWS) => {
8686
Authentication: "Disabled",
8787
WebCommunication: "Synchronous",
8888
WebSocketIP: "localhost",
89-
WebSocketSubProtocol: "webui-V3",
9089
WebSocketPort: "81",
9190
Hostname: "esp3d",
9291
WiFiMode: "STA",

0 commit comments

Comments
 (0)