Skip to content

Commit d9ad884

Browse files
committed
Merge 3.0 refactoring
## What's Changed * Complete refactoring using spectre.css and correct Preact API per @alexblog suggestion * Smaller footprint * Add support for extensions/pluggins * Add theme support by using external css * Remove banner as unnecessary * Remove information bar and put information to separate page and respective panel * Add audio and haptic feedback * Add Repetier / ESP3DLib V2 / Smoothieware / GRBL support * Split code for 3DPrinter / CNC / Sand Table ## Limitations * CNC / Sand Table specific UI is still not defined * Wizard is not implemented yet * Works with ESP3D 3.0- alpha-2 - no backward compatibility * Language packs are not ready to be translated yet as UI is not finished ## Discussion / status [Discussion](#94) ## New Contributors @alexblog made several contributions like #236
1 parent c55bd56 commit d9ad884

File tree

515 files changed

+68739
-32945
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

515 files changed

+68739
-32945
lines changed

.babelrc

Lines changed: 0 additions & 6 deletions
This file was deleted.

.gitignore

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1+
12
node_modules
2-
dist/images/jogdial.svg
3-
dist/images/jogdial1.svg
4-
dist/images/jogdial2.svg
5-
dist/images/printer.tpl.htm
6-
dist/images/repetier.htm
7-
dist/index.html
3+
.vscode
4+
build

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
14.16.1

.prettierrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
{"files": "*.scss",
1313
"options": {
14-
"parser": "scss"
14+
"parser": "css"
1515
}
1616
}
1717
]

.travis.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

ESP3D-WebUI-features.xls

0 Bytes
Binary file not shown.

Features.md

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
# V3 Features
2+
3+
## Global Features
4+
* Firmware update
5+
* WebUI update
6+
* List of enabled features /capabilities
7+
* Wifi configuration
8+
* Features configuration
9+
* WebUI features configuration
10+
* Haptic feedback
11+
* Audio feedback
12+
* Terminal commands
13+
* Emmergency stop
14+
* Pluggins support
15+
* Themes support (CSS)
16+
* Language packs support
17+
* Macro commands
18+
* Local FS listing / content management
19+
* External pages/panel support
20+
* PC / Tablet / phone UI
21+
* IP Camera & ESP32 Camera display support
22+
* Import / Export settings
23+
* Restart board support
24+
* Monolitic small footprint
25+
* Single user management support (auto close if not latest connected)
26+
* Authentication support (admin / user)
27+
* Configuration wizard (TBD)
28+
* Firmware supported (3DPrinter / CNC / SandTable):
29+
* ESP3D:
30+
* Marlin (1.x / 2.x)
31+
* Smoothieware (1.x / 2.x)
32+
* Repetier (1.x / 2.x)
33+
* GRBL (TBD)
34+
* ESP3DLib
35+
* Marlin (2.x)
36+
* GRBL_ESP32 (TBD)
37+
* FluidNC (TBD)
38+
* Makerbase TFT (ESP3D)
39+
* Bigtreetech TFT (ESP3D)
40+
* Firmware NOT yet supported:
41+
* Reprap
42+
43+
## 3D Printer Features
44+
* Target firmware configuration
45+
* Jog control / monitoring
46+
* Temperatures control / monitoring
47+
* Additionnal sensors support
48+
* Chart support for temperatures / sensors
49+
* Multiple extruder support
50+
* Target Firmware SD listing / content management (if supported)
51+
* TFT SD/USB listing / content management (if supported)
52+
* Fan control / monitoring (if supported)
53+
* Flow rate control / monitoring (if supported)
54+
* Feed rate control / monitoring (if supported)
55+
* Print control / monitoring
56+
57+
## CNC Features
58+
* Target firmware configuration
59+
* Jog control / monitoring
60+
* Job control / monitoring
61+
* Status monitoring
62+
* TBD...
63+
64+
## Sand Table Features
65+
* Target firmware configuration
66+
* Jog control / monitoring
67+
* Job control / monitoring
68+
* Status monitoring
69+
* TBD...
70+
71+
72+
73+

Memo/ESP3D [ESP400] format.txt

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
ESP3D [ESP400] format:
2+
{"Settings":[
3+
{"F":"network/network","P":"130","T":"S","V":"esp3d","H":"hostname","S":"32","M":"1"},
4+
{"F":"network/network","P":"0","T":"B","V":"1","H":"radio mode","O":[{"none":"0"},
5+
{"sta":"1"},
6+
{"ap":"2"}]},
7+
{"F":"network/sta","P":"1","T":"S","V":"WIFI_OFFICE_B2G","S":"32","H":"SSID","M":"1"},
8+
{"F":"network/sta","P":"34","T":"S","N":"1","V":"********","S":"64","H":"pwd","M":"8"},
9+
{"F":"network/sta","P":"99","T":"B","V":"1","H":"ip mode","O":[{"dhcp":"1"},
10+
{"static":"0"}]},
11+
{"F":"network/sta","P":"100","T":"A","V":"192.168.0.1","H":"ip"},
12+
{"F":"network/sta","P":"108","T":"A","V":"192.168.0.1","H":"gw"},
13+
{"F":"network/sta","P":"104","T":"A","V":"255.255.255.0","H":"msk"},
14+
{"F":"network/ap","P":"218","T":"S","V":"ESP3D","S":"32","H":"SSID","M":"1"},
15+
{"F":"network/ap","P":"251","T":"S","N":"1","V":"********","S":"64","H":"pwd","M":"8"},
16+
{"F":"network/ap","P":"316","T":"A","V":"192.168.0.1","H":"ip"},
17+
{"F":"network/ap","P":"118","T":"B","V":"11","H":"channel","O":[{"1":"1"},
18+
{"2":"2"},
19+
{"3":"3"},
20+
{"4":"4"},
21+
{"5":"5"},
22+
{"6":"6"},
23+
{"7":"7"},
24+
{"8":"8"},
25+
{"9":"9"},
26+
{"10":"10"},
27+
{"11":"11"},
28+
{"12":"12"},
29+
{"13":"13"},
30+
{"14":"14"}]},
31+
{"F":"service/http","P":"328","T":"B","V":"1","H":"enable","O":[{"no":"0"},
32+
{"yes":"1"}]},
33+
{"F":"service/http","P":"121","T":"I","V":"80","H":"port","S":"65001","M":"1"},
34+
{"F":"service/telnetp","P":"329","T":"B","V":"1","H":"enable","O":[{"no":"0"},
35+
{"yes":"1"}]},
36+
{"F":"service/telnetp","P":"125","T":"I","V":"23","H":"port","S":"65001","M":"1"},
37+
{"F":"service/ftp","P":"1021","T":"B","V":"1","H":"enable","O":[{"no":"0"},
38+
{"yes":"1"}]},
39+
{"F":"service/ftp","P":"1009","T":"I","V":"21","H":"control port","S":"65001","M":"1"},
40+
{"F":"service/ftp","P":"1013","T":"I","V":"20","H":"active port","S":"65001","M":"1"},
41+
{"F":"service/ftp","P":"1017","T":"I","V":"55600","H":"passive port","S":"65001","M":"1"},
42+
{"F":"service/notification","P":"1004","T":"B","V":"1","H":"auto notif","O":[{"no":"0"},
43+
{"yes":"1"}]},
44+
{"F":"service/notification","P":"116","T":"B","V":"0","H":"notification","O":[{"none":"0"},
45+
{"pushover":"1"},
46+
{"email":"2"},
47+
{"line":"3"}]},
48+
{"F":"service/notification","P":"332","T":"S","V":"********","S":"63","H":"t1","M":"0"},
49+
{"F":"service/notification","P":"396","T":"S","V":"********","S":"63","H":"t2","M":"0"},
50+
{"F":"service/notification","P":"855","T":"S","V":" ","S":"127","H":"ts","M":"0"},
51+
{"F":"system/system","P":"461","T":"B","V":"40","H":"targetfw","O":[{"repetier":"50"},
52+
{"marlin":"20"},
53+
{"smoothieware":"40"},
54+
{"grbl":"10"},
55+
{"unknown":"0"}]},
56+
{"F":"system/system","P":"112","T":"I","V":"115200","H":"baud","O":[{"9600":"9600"},
57+
{"19200":"19200"},
58+
{"38400":"38400"},
59+
{"57600":"57600"},
60+
{"74880":"74880"},
61+
{"115200":"115200"},
62+
{"230400":"230400"},
63+
{"250000":"250000"},
64+
{"500000":"500000"},
65+
{"921600":"921600"}]},
66+
{"F":"system/system","P":"320","T":"I","V":"10000","H":"bootdelay","S":"40000","M":"0"},
67+
]}
68+
69+
1 - key : Settings
70+
2 - value: array of data formated like this
71+
{"F":"network/network","P":"130","T":"S","V":"esp3d","H":"hostname","S":"32","M":"1"}
72+
or
73+
{"F":"service/notification","P":"1004","T":"B","V":"1","H":"auto notif","O":[{"no":"0"},{"yes":"1"}]}
74+
75+
F: is filter formated as section/sub-section, if section is same as sub-section, it means no sub-section
76+
P: is id (also position reference so it is unique)
77+
T: is type of data which can be:
78+
S: for string
79+
I: for integer
80+
T: for Byte
81+
A: for IP address / Mask
82+
V: is current value, if type is string and value is ********, (8 stars)then it is a password
83+
H: is label of value
84+
S: is max size if type is string, and max possible value if value is number (byte, integer)
85+
M: is min size if type is string, and min possible value if value is number (byte, integer)
86+
MS: is additionnal min size if type is string (e.g for password can be 0 or 8, so need additional min size), M should be the more minimal value
87+
so MS value must be between M and S
88+
O: is an array of {label:value}
89+
R: need restart to be applied
90+
91+
Note: currently there is no float value so far, if needed a new type will be added in futur - TBD,
92+
Note2 : the 2.1 Flag type is no more used, several entries are used instead grouped by sub-section

Memo/TargetFW.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
fluidnc: 60
2+
repetier: 50
3+
smoothieware: 40
4+
marlin_embedded: 30
5+
marlin: 20
6+
grbl: 10
7+
unknown: 0

Memo/data structure.odt

17.9 KB
Binary file not shown.

0 commit comments

Comments
 (0)