diff --git a/esp8266/data - for 64K SPIFFS/config_ap.tpl b/esp8266/data - for 64K SPIFFS/config_ap.tpl deleted file mode 100644 index f94722a8..00000000 --- a/esp8266/data - for 64K SPIFFS/config_ap.tpl +++ /dev/null @@ -1,62 +0,0 @@ -$INCLUDE[header.inc]$ -
-
Access Point
-
-
-
-
-
-

-
-
-

-
-

-
-

-
- -
-
-

-
-

-
-

-
-
- -
-
- -
-
- -$SERVICE_PAGE$ - - - - diff --git a/esp8266/data - for 64K SPIFFS/config_sta.tpl b/esp8266/data - for 64K SPIFFS/config_sta.tpl deleted file mode 100644 index 9e21d504..00000000 --- a/esp8266/data - for 64K SPIFFS/config_sta.tpl +++ /dev/null @@ -1,56 +0,0 @@ -$INCLUDE[header.inc]$ -
-
Station
-
-
-
- - - -$AVAILABLE_AP[]$ -
$AVAILABLE_AP_NB_ITEMS$ AP(s) available
#SSIDSignalProtected
#$ROW_NUMBER$$AP_SSID$$AP_SIGNAL$$IS_PROTECTED$
-
-

-
-

-
-

-
-

-
- -
-
-

-
-

-
-

-
-
- -
-
-
- -$SERVICE_PAGE$ - - - diff --git a/esp8266/data - for 64K SPIFFS/favicon.ico b/esp8266/data - for 64K SPIFFS/favicon.ico deleted file mode 100644 index b2b24df7..00000000 Binary files a/esp8266/data - for 64K SPIFFS/favicon.ico and /dev/null differ diff --git a/esp8266/data - for 64K SPIFFS/header.inc b/esp8266/data - for 64K SPIFFS/header.inc deleted file mode 100644 index 24750c3a..00000000 --- a/esp8266/data - for 64K SPIFFS/header.inc +++ /dev/null @@ -1,34 +0,0 @@ - - - - - -$PAGE_TITLE$
- - - - - -
HomeSystem ConfigurationAP ConfigurationStation ConfigurationPrinter StatusExtra Settings FW: V$FW_VER$Github
diff --git a/esp8266/data - for 64K SPIFFS/home.tpl b/esp8266/data - for 64K SPIFFS/home.tpl deleted file mode 100644 index 6001fc8b..00000000 --- a/esp8266/data - for 64K SPIFFS/home.tpl +++ /dev/null @@ -1,57 +0,0 @@ -$INCLUDE[header.inc]$ -
-
System
-

-
-
-
-

-

-

-

-
-
-
-
-
-
-
-
Access Point ($AP_STATUS_ENABLED$)
-

-
-
-
-
-
-
-
-
-
-
- - - -$CONNECTED_STATIONS[]$ -
$CONNECTED_STATIONS_NB_ITEMS$ connected station(s)
#MacIP
#$ROW_NUMBER$$MAC_CONNECTED$$IP_CONNECTED$
-
-
-
-
-
Station ($STA_STATUS_ENABLED$)
-

-
-
-
-
-
-
-
-
-
-
-
-$SERVICE_PAGE$ - - - - diff --git a/esp8266/data - for 64K SPIFFS/printer.tpl b/esp8266/data - for 64K SPIFFS/printer.tpl deleted file mode 100644 index 106f4f6f..00000000 --- a/esp8266/data - for 64K SPIFFS/printer.tpl +++ /dev/null @@ -1,263 +0,0 @@ -$INCLUDE[header.inc]$ - - - - - - - - - - - - - - - - +
- - - -
Speed:% -  Status:◯  Emergency
- - -
Flow:% -  X:  Y:  Z:
- -
Command:
Info:
Error:
Status:
- - - - - -
Continue  Pause  Stop  Get SD Content  
- - - - -
Home X  Home Y  Home Z  Home All
-
- - - - -
Axis:
-
-
- - - -
Steps:
-
- - - - - - -
Direction:  -    +  
- -$SERVICE_PAGE$ - - - diff --git a/esp8266/data - for 64K SPIFFS/settings.tpl b/esp8266/data - for 64K SPIFFS/settings.tpl deleted file mode 100644 index 1dc90c58..00000000 --- a/esp8266/data - for 64K SPIFFS/settings.tpl +++ /dev/null @@ -1,86 +0,0 @@ -$INCLUDE[header.inc]$ -
-
Extra Settings
-
-
-

-
-

-
-

-
-

-
- - -
-
- -
-
-
-
Filesystem
-
- -

-
Namesize
- -
-
- -$INCLUDE[footer.inc]$ - - diff --git a/esp8266/data - for 64K SPIFFS/system.tpl b/esp8266/data - for 64K SPIFFS/system.tpl deleted file mode 100644 index a5fe1420..00000000 --- a/esp8266/data - for 64K SPIFFS/system.tpl +++ /dev/null @@ -1,33 +0,0 @@ -$INCLUDE[header.inc]$ -
-
System
-
-
-
-
-
-
-
-
-

-
-

-
- -
-
- -
-
-$SERVICE_PAGE$ - - - diff --git a/esp8266/data - for more than 64K SPIFFS/config_ap.tpl b/esp8266/data - for more than 64K SPIFFS/config_ap.tpl deleted file mode 100644 index 5eab053c..00000000 --- a/esp8266/data - for more than 64K SPIFFS/config_ap.tpl +++ /dev/null @@ -1,64 +0,0 @@ -$INCLUDE[header.inc]$ -
-
Access Point
-
-
-
-
-
-

-
-
-

-
-

-
-

-
- -
-
-

-
-

-
-

-
-
- -
-
- -
-
- -$INCLUDE[footer.inc]$ - diff --git a/esp8266/data - for more than 64K SPIFFS/config_sta.tpl b/esp8266/data - for more than 64K SPIFFS/config_sta.tpl deleted file mode 100644 index d830f1f5..00000000 --- a/esp8266/data - for more than 64K SPIFFS/config_sta.tpl +++ /dev/null @@ -1,65 +0,0 @@ -$INCLUDE[header.inc]$ -
-
Station
-
-
-
- - - -$AVAILABLE_AP[]$ -
$AVAILABLE_AP_NB_ITEMS$ AP(s) available
#SSIDSignalProtected
#$ROW_NUMBER$$AP_SSID$$AP_SIGNAL$$IS_PROTECTED$
-
-

-
-

-
-

-
-

-
- -
-
-
-

-
-

-
-

-
-
- -
-
- -
-
- -$INCLUDE[footer.inc]$ diff --git a/esp8266/data - for more than 64K SPIFFS/favicon.ico b/esp8266/data - for more than 64K SPIFFS/favicon.ico deleted file mode 100644 index b2b24df7..00000000 Binary files a/esp8266/data - for more than 64K SPIFFS/favicon.ico and /dev/null differ diff --git a/esp8266/data - for more than 64K SPIFFS/header.inc b/esp8266/data - for more than 64K SPIFFS/header.inc deleted file mode 100644 index 1fbdee0c..00000000 --- a/esp8266/data - for more than 64K SPIFFS/header.inc +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - -$PAGE_TITLE$ - -
- - - - - - - - - - - -
HomeSystem ConfigurationAP ConfigurationStation ConfigurationPrinter StatusExtra Settings FW: V$FW_VER$Github
diff --git a/esp8266/data - for more than 64K SPIFFS/home.tpl b/esp8266/data - for more than 64K SPIFFS/home.tpl deleted file mode 100644 index 5959b314..00000000 --- a/esp8266/data - for more than 64K SPIFFS/home.tpl +++ /dev/null @@ -1,54 +0,0 @@ -$INCLUDE[header.inc]$ -
-
System
-

-
-
-
-

-

-

-

-
-
-
-
-
-
-
-
Access Point ($AP_STATUS_ENABLED$)
-

-
-
-
-
-
-
-
-
-
-
- - - -$CONNECTED_STATIONS[]$ -
$CONNECTED_STATIONS_NB_ITEMS$ connected station(s)
#MacIP
#$ROW_NUMBER$$MAC_CONNECTED$$IP_CONNECTED$
-
-
-
-
-
Station ($STA_STATUS_ENABLED$)
-

-
-
-
-
-
-
-
-
-
-
-
-$INCLUDE[footer.inc]$ - diff --git a/esp8266/data - for more than 64K SPIFFS/printer.tpl b/esp8266/data - for more than 64K SPIFFS/printer.tpl deleted file mode 100644 index ba319486..00000000 --- a/esp8266/data - for more than 64K SPIFFS/printer.tpl +++ /dev/null @@ -1,355 +0,0 @@ -$INCLUDE[header.inc]$ - - - - - - - - - - -
- - - - -
0300% -  Status: -   - - -
- - - -
0300% -      
- -
- - - - -
- - - -SD  
- - - - - - - - - - - - -
- - -X - - -
--10
--1
--0.1
 - -Y - -
--10
--1
--0.1
- - -
-10 -1 -0.1
 -
--0.1 --1 - --10
Z
- - - -
-0.1
-1
-10
 -Z - -
-0.1
-1
-10
- -$INCLUDE[footer.inc]$ diff --git a/esp8266/data - for more than 64K SPIFFS/settings.tpl b/esp8266/data - for more than 64K SPIFFS/settings.tpl deleted file mode 100644 index 6a469c86..00000000 --- a/esp8266/data - for more than 64K SPIFFS/settings.tpl +++ /dev/null @@ -1,91 +0,0 @@ -$INCLUDE[header.inc]$ -
-
Extra Settings
-
-
-

-
-

-
-

-
-

-
- - -
-
- -
-
-
-
Filesystem
-
- -

-
Namesize
- -
-
- -$INCLUDE[footer.inc]$ - - diff --git a/esp8266/data - for more than 64K SPIFFS/system.tpl b/esp8266/data - for more than 64K SPIFFS/system.tpl deleted file mode 100644 index 8fe99276..00000000 --- a/esp8266/data - for more than 64K SPIFFS/system.tpl +++ /dev/null @@ -1,30 +0,0 @@ -$INCLUDE[header.inc]$ -
-
System
-
-
-
-
-
-
-
-
-

-
-

-
- -
-
- -
-
-$INCLUDE[footer.inc]$ diff --git a/esp8266/data - for more than 64K SPIFFS/404.tpl b/esp8266/data/404.tpl similarity index 100% rename from esp8266/data - for more than 64K SPIFFS/404.tpl rename to esp8266/data/404.tpl diff --git a/esp8266/data/config_ap.tpl b/esp8266/data/config_ap.tpl index f94722a8..5eab053c 100644 --- a/esp8266/data/config_ap.tpl +++ b/esp8266/data/config_ap.tpl @@ -22,15 +22,20 @@ $CHANNEL_OPTION_LIST$ $AUTH_OPTION_LIST$
@@ -55,8 +60,5 @@ $SUCCESS_MSG$ -$SERVICE_PAGE$ - - - +$INCLUDE[footer.inc]$ diff --git a/esp8266/data/config_sta.tpl b/esp8266/data/config_sta.tpl index 9e21d504..d830f1f5 100644 --- a/esp8266/data/config_sta.tpl +++ b/esp8266/data/config_sta.tpl @@ -21,20 +21,26 @@ $INCLUDE[header.inc]$ $NETWORK_OPTION_LIST$
+ +

@@ -44,13 +50,16 @@ document.getElementById("IP_SET").style.height="0px";}
+$ERROR_MSG$ +
- -$SERVICE_PAGE$ - - - +$SUCCESS_MSG$ + + + + +$INCLUDE[footer.inc]$ diff --git a/esp8266/data - for more than 64K SPIFFS/css.inc b/esp8266/data/css.inc similarity index 100% rename from esp8266/data - for more than 64K SPIFFS/css.inc rename to esp8266/data/css.inc diff --git a/esp8266/data - for more than 64K SPIFFS/footer.inc b/esp8266/data/footer.inc similarity index 100% rename from esp8266/data - for more than 64K SPIFFS/footer.inc rename to esp8266/data/footer.inc diff --git a/esp8266/data/header.inc b/esp8266/data/header.inc index 24750c3a..1fbdee0c 100644 --- a/esp8266/data/header.inc +++ b/esp8266/data/header.inc @@ -4,31 +4,20 @@ $PAGE_TITLE$
- - - - +$INCLUDE[css.inc]$ + +$PAGE_TITLE$ + +
HomeSystem ConfigurationAP ConfigurationStation ConfigurationPrinter StatusExtra Settings FW: V$FW_VER$Github
+ + + + + + + + + +
HomeSystem ConfigurationAP ConfigurationStation ConfigurationPrinter StatusExtra Settings FW: V$FW_VER$Github
diff --git a/esp8266/data/home.tpl b/esp8266/data/home.tpl index 6001fc8b..5959b314 100644 --- a/esp8266/data/home.tpl +++ b/esp8266/data/home.tpl @@ -50,8 +50,5 @@ $INCLUDE[header.inc]$
-$SERVICE_PAGE$ - - - +$INCLUDE[footer.inc]$ diff --git a/esp8266/data/printer.tpl b/esp8266/data/printer.tpl index 106f4f6f..ba319486 100644 --- a/esp8266/data/printer.tpl +++ b/esp8266/data/printer.tpl @@ -1,80 +1,135 @@ $INCLUDE[header.inc]$ +
+ +
0270 °C +
+ +
0270°C + +
+ + +
0130°C + +
- - + + - -
Speed:% +0300%   Status:◯  Emergency
- - +
Flow:% +  Status: +   + + +
+ + + - -
0300%   X:  Y:  Z:
- + +
Command:    
+
-
Info:
-
Error:
-
Status:
-
- - - - - - -
Continue  Pause  Stop  Get SD Content  
- - - - - -
Home X  Home Y  Home Z  Home All
- -
- - - - -
Axis:
- - -
- - - -
Steps:
- - - - - - - - -
Direction:  -    +  
+
+
+
+
+ + + + +
+ + + +SD  
+ + + + + + + + + + + + +
+ + +X + + +
+-10
+-1
+-0.1
 + +Y + +
+-10
+-1
+-0.1
+ + +
+10 +1 +0.1
 +
+-0.1 +-1 + +-10
Z
+ + + +
+0.1
+1
+10
 +Z + +
+0.1
+1
+10
-$SERVICE_PAGE$ - - - +$INCLUDE[footer.inc]$ diff --git a/esp8266/data - for more than 64K SPIFFS/restart.tpl b/esp8266/data/restart.tpl similarity index 100% rename from esp8266/data - for more than 64K SPIFFS/restart.tpl rename to esp8266/data/restart.tpl diff --git a/esp8266/data/settings.tpl b/esp8266/data/settings.tpl index 1dc90c58..6a469c86 100644 --- a/esp8266/data/settings.tpl +++ b/esp8266/data/settings.tpl @@ -35,13 +35,18 @@ $SUCCESS_MSG$ function dispatchstatus(jsonresponse) { var content =""; -document.getElementById('status').innerHTML=jsonresponse.status; +content ="Status: "+jsonresponse.status; +content +="  Total space: "+jsonresponse.total; +content +="  Used space: "+jsonresponse.used; +content +="  Occupation: "+jsonresponse.occupation; +document.getElementById('status').innerHTML=content; +content =""; for (var i=0;i "; content +=jsonresponse.files[i].name; content +=""; content +=jsonresponse.files[i].size; -content +="
 × "; +content +="
 × "; content +="
"; } document.getElementById('file_list').innerHTML=content;} diff --git a/esp8266/data/system.tpl b/esp8266/data/system.tpl index a5fe1420..8fe99276 100644 --- a/esp8266/data/system.tpl +++ b/esp8266/data/system.tpl @@ -27,7 +27,4 @@ $SUCCESS_MSG$
-$SERVICE_PAGE$ - - - +$INCLUDE[footer.inc]$ diff --git a/uitests/UI and commands.png b/uitests/UI and commands.png deleted file mode 100644 index a83d9cd3..00000000 Binary files a/uitests/UI and commands.png and /dev/null differ diff --git a/uitests/test.html b/uitests/test.html deleted file mode 100644 index a7541720..00000000 --- a/uitests/test.html +++ /dev/null @@ -1,669 +0,0 @@ - - - - - - -Printer Interface - -
- - - - - - - - - - -
HomeSystem ConfigurationAP ConfigurationStation ConfigurationPrinter Status FW: V0.3Github
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - -
- - - - - - - - - - - - - - - - Extruder : 0/off °C - - - 0270 - - -
-
- - - - - - -
- - - - - - - - - - - - - - - - Extruder : 0/off °C - - - 0270 - - -
-
- - - - - - -
- - - - - - - - - - - - - - - - Extruder : 0/off °C - - - 0130 - - -
-
- - - - - - - - - - -
- 0300 - % - - -   -   - - Status: - - - - - -   -   - - - - - - - -
-
- - - - - - - -
- 0300 - % - - -   -   - -      -
-
- - - - - - -
- - - -
-
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - SD - - -   -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - X - - - - - - - - - - - - -
- - - 10 - -
- - - 1 - -
- - - 0.1 - -
- 		- - - - - Y - - - - - - - - - - - - - -
- - - -10 - -
- - - -1 - -
- - - -0.1 - -
- 		- - - - - - - - - - - -
- - - -10 - -
- - - -1 - -
- - - -0.1 - -
- 		- - - - - - - - - - - -
- - - -10 - -
- - - -1 - -
- - - -0.1 - -
-
- - - - - - -
- - - -10 - - - - - -1 - - - - - -0.1 - -
- 		- - - - - - - -
- - - 0.1 - - - - - 1 - - - - - 10 - -
- 		- - - Z - - - - - 1 - - - - - 2 - -
- - - - - - - - - - - - - - - - -
- - - -0.1 - -
- - - -1 - -
- - - -10 - -
- 		- - - - - Z - - - - - - - - - - - - - -
- - - 0.1 - -
- - - 1 - -
- - - 10 - -
- 		- - - - - - - - - - - -
- - - 0.1 - -
- - - 1 - -
- - - 10 - -
- 		- - - - - - - - - - - -
- - - 0.1 - -
- - - 1 - -
- - - 10 - -
-
-
- - - - -$SERVICE_PAGE$ - -