](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=Y8FFE7NA4LJWQ)
Especially if need to buy new modules for testing.
@@ -31,7 +34,7 @@ Especially if need to buy new modules for testing.
##Features
* Serial/Wifi bridge using configurable port 8888, here to enable/disable [TCP_IP_DATA_FEATURE](https://github.com/luc-github/ESP3D/blob/master/esp3d/config.h)
* Use GPIO2 to ground to reset all settings in hard way - 2-6 sec after boot / not before!! Set GPIO2 to ground before boot change boot mode and go to special boot that do not reach FW. Currently boot take 10 sec - giving 8 seconds to connect GPIO2 to GND and do an hard recovery for settings, here to enable/disable [RECOVERY_FEATURE](https://github.com/luc-github/ESP8266/blob/master/esp8266/config.h)
-* Wifi configuration by web browser (Station or Access point)
+* Complete configuration by web browser (Station or Access point) or by Serial commands
* Authentication for sensitive pages, here to enable/disable [AUTHENTICATION_FEATURE](https://github.com/luc-github/ESP3D/blob/master/esp3d/config.h)
* Update firmware by web browser, here to enable/disable [WEB_UPDATE_FEATURE](https://github.com/luc-github/ESP3D/blob/master/esp3d/config.h)
* Control ESP module using commands on serial or data port, here to enable/disable [SERIAL_COMMAND_FEATURE](https://github.com/luc-github/ESP3D/blob/master/esp3d/config.h)
@@ -41,6 +44,8 @@ Especially if need to buy new modules for testing.
* SSDP, this feature is a discovery protocol, supported on Windows out of the box, here to enable/disable [SSDP_FEATURE](https://github.com/luc-github/ESP3D/blob/master/esp3d/config.h)
* Printer monitoring / control (temperatures/speed/jog/list SDCard content/launch,pause or stop a print/etc...), here to enable/disable [MONITORING_FEATURE/INFO_MSG_FEATURE/ERROR_MSG_FEATURE/STATUS_MSG_FEATURE](https://github.com/luc-github/ESP3D/blob/master/esp3d/config.h)
* Fail safe mode (Access point)is enabled if cannot connect to defined station at boot.
+* The web ui add even more feature : https://github.com/luc-github/ESP3D-WEBUI/blob/master/README.md#features
+
##Web configuration
*Wifi Mode : Access point / Client station
@@ -63,7 +68,7 @@ IP Mode: Static IP
IP: 192.168.0.1
Mask: 255.255.255.0
GW:192.168.0.1
-Baud rate: 9600
+Baud rate: 115200
Web port:80
Data port: 8888
Web Page refresh: 3 secondes
@@ -72,168 +77,163 @@ Password: admin
User:user
Password: user
-These are the pages defined using template:
-Home page :
-
-* For development: -Please use [Arduino IDE 1.6.8](http://arduino.cc/en/Main/Software) and [git version of esp8266 module](http://esp8266.github.io/Arduino/versions/2.2.0/doc/installing.html#using-git-version) +##Update +* Generate a binary using the export binary menu from Arduino IDE and upload it using ESP-WEBUI or embedded interface -* To flash the module : -You must define the targeted FW, can be REPETIER (Original Repetier)/ REPETIER4DV (Repetier for Davinci) / MARLIN (Marlin)/ SMOOTHIEWARE (Smoothieware) in config.h and enable/disable any others features -``` -//MDNS_FEATURE: this feature allow type the name defined -//in web browser by default: http:\\esp8266.local and connect -//#define MDNS_FEATURE - -//SSDD_FEATURE: this feature is a discovery protocol, supported on Windows out of the box -#define SSDP_FEATURE - -//CAPTIVE_PORTAL_FEATURE: In SoftAP redirect all unknow call to main page -#define CAPTIVE_PORTAL_FEATURE - -//AUTHENTICATION_FEATURE: protect pages by login password -#define AUTHENTICATION_FEATURE - -//WEB_UPDATE_FEATURE: allow to flash fw using web UI -#define WEB_UPDATE_FEATURE - -//SERIAL_COMMAND_FEATURE: allow to send command by serial -#define SERIAL_COMMAND_FEATURE - -//TCP_IP_DATA_FEATURE: allow to connect serial from TCP/IP -#define TCP_IP_DATA_FEATURE - -//RECOVERY_FEATURE: allow to use GPIO2 pin as hardware reset for EEPROM, add 8s to boot time to let user to jump GPIO2 to GND -#define RECOVERY_FEATURE - -//FIRMWARE_TARGET: the targeted FW, can be REPETIER (Original Repetier)/ REPETIER4DV (Repetier for Davinci) / MARLIN (Marlin)/ SMOOTHIEWARE (Smoothieware) -#define FIRMWARE_TARGET REPETIER4DV - -//DEBUG Flag -//#define DEBUG_ESP3D -``` - -For better performance select CPU Frequency to be 160MHz instead of default 80MHz -Use IDE to upload directly (latest version of board manager module generate one binary) -* To flash the html files present in data directory you need to use another tool, installation and usage is explained [here](https://github.com/esp8266/Arduino/blob/master/doc/filesystem.md#uploading-files-to-file-system) -Once flashed you also can use the web updater to flash new FW in System Configuration Page or go to settings to change html files - -
:warning:Do not flash Printer fw with ESP connected - it bring troubles, at least on DaVinci
+:warning:Do not flash your Printer fw with ESP connected - it bring troubles, at least on DaVinci
##Contribution/customization -To modifying and Testing tpl files a local tool has been created by [j0hnlittle](https://github.com/j0hnlittle) to avoid to upload every time your tpl files just to see the results of your modifications. It is a python script (2.7+) located in tools directory, launch it: python server.py, then open browser: http://localhost:8080 -It will display the web ui and allow some navigation +* To style the code before pushing PR please use [astyle --style=otbs *.h *.cpp *.ino](http://astyle.sourceforge.net/) +* The embedded page is created using nodejs then gulp to generate a compressed html page (tool.html.gz), all necessary modules can be installed using the install.bat file content, then it is included using bin2c (https://sourceforge.net/projects/bin2c/) to generate the h file used to create the file nofile.h, update the array and size according new out.h. +* The current UI is located [here](https://github.com/luc-github/ESP3D-WEBUI) +* An optional UI is under development using old repetier UI - check [UI\repetier\testui.htm] (https://github.com/luc-github/ESP3D/blob/master/UI/repetier/testui.htm) file -To style the code before pushing PR please use [astyle --style=otbs *.h *.cpp *.ino](http://astyle.sourceforge.net/) - -Feedback/suggestion/discussions are always welcome +Feedback/suggestion/discussions are always welcome -##Need more information about board or wiring ? +##Need more information about supported boards or wiring ? [Check the wiki](https://github.com/luc-github/ESP3D/wiki) + +##:question:Any question ? +Check [Wiki](https://github.com/luc-github/ESP3D/wiki/Install-Instructions) or [](https://gitter.im/luc-github/ESP3D?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + +##:exclamation:Any issue/feedback ? +Check [Wiki](https://github.com/luc-github/ESP3D/wiki/Install-Instructions) and [FAQ](https://github.com/luc-github/ESP3D/issues?utf8=%E2%9C%93&q=label%3AFAQ+) or [submit ticket](https://github.com/luc-github/ESP3D/issues) + ##TODO -- Close open topics -- Do testing (a lot) -- UI Improvement +-- ESP3D V2 diff --git a/UI/mousediv.html b/UI/mousediv.html deleted file mode 100644 index b73843b4..00000000 --- a/UI/mousediv.html +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - -| - - | |
| - - |
-
-Extra Settings
-
-
-
-
-$SUCCESS_MSG$
-
-
-
-
-$INCLUDE[footer.inc]$
-
+function RequestLogin(){
+ document.getElementById('loader').style.visibility="hidden";
+ document.getElementById('loginpage').style.display='block';
+}
+function SubmitRequest (){
+ document.getElementById('loginpage').style.display='none';
+ var user = document.getElementById('login_user_text').value.trim();
+ var password = document.getElementById('login_password_text').value.trim();
+ var url = "/login?USER="+encodeURIComponent(user) + "&PASSWORD=" + encodeURIComponent(password) + "&SUBMIT=yes" ;
+ var xmlhttp = new XMLHttpRequest();
+ xmlhttp.onreadystatechange = function() {
+ if (xmlhttp.readyState == 4 && xmlhttp.status != 200) {
+ RequestLogin();
+ }
+ };
+xmlhttp.open("GET", url, true);
+xmlhttp.send();
+}
diff --git a/embedded/www/tool.html b/embedded/www/tool.html
new file mode 100644
index 00000000..33c5cecd
--- /dev/null
+++ b/embedded/www/tool.html
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+ Flash Filesystem
-
-
-
-
-
-
-
-
-
-
-
-|
-
-
- |
| Type | Name | Size |
|---|
+ V1.1
+
+
+ It seems you do not have any index.html neither index.html.gz, please upload it or update your firmware if necessary.
+
+
+ Flash Filesystem
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+ | + + | +
+
+
+ |
+ + + | +
+ |
+
| Type | +Name | +Size | ++ | + |
|---|
+
+ Firmware Update
+
+
+
+
+ | + | + | + | Restarting, please wait.... | +
+
+
+
+
+
+
+
+
+
diff --git a/esp3d/bridge.cpp b/esp3d/bridge.cpp
index 3925d9a8..58d6d34d 100644
--- a/esp3d/bridge.cpp
+++ b/esp3d/bridge.cpp
@@ -18,6 +18,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
#include "bridge.h"
#include "command.h"
#include "webinterface.h"
@@ -29,92 +30,91 @@ WiFiClient serverClients[MAX_SRV_CLIENTS];
bool BRIDGE::header_sent = false;
String BRIDGE::buffer_web = "";
-void BRIDGE::print (const __FlashStringHelper *data, tpipe output){
+void BRIDGE::print (const __FlashStringHelper *data, tpipe output)
+{
String tmp = data;
BRIDGE::print(tmp.c_str(), output);
}
-void BRIDGE::print (String & data, tpipe output){
+void BRIDGE::print (String & data, tpipe output)
+{
BRIDGE::print(data.c_str(), output);
}
-void BRIDGE::print (const char * data, tpipe output){
- switch(output){
- case SERIAL_PIPE:
- header_sent = false;
- Serial.print(data);
- break;
- case SERIAL1_PIPE:
- header_sent = false;
- Serial1.print(data);
+void BRIDGE::print (const char * data, tpipe output)
+{
+ switch(output) {
+ case SERIAL_PIPE:
+ header_sent = false;
+ ESP_SERIAL_OUT.print(data);
break;
#ifdef TCP_IP_DATA_FEATURE
- case TCP_PIPE:
- header_sent = false;
- BRIDGE::send2TCP(data);
+ case TCP_PIPE:
+ header_sent = false;
+ BRIDGE::send2TCP(data);
break;
#endif
- case WEB_PIPE:
- if (!header_sent){
- web_interface->WebServer.setContentLength(CONTENT_LENGTH_UNKNOWN);
- web_interface->WebServer.sendHeader("Content-Type","text/html");
- web_interface->WebServer.sendHeader("Cache-Control","no-cache");
- web_interface->WebServer.send(200);
- header_sent = true;
- }
- buffer_web+=data;
- if (buffer_web.length() > 1200)
- {
- //send data
- web_interface->WebServer.sendContent(buffer_web);
- //reset buffer
- buffer_web="";
- }
+ case WEB_PIPE:
+ if (!header_sent) {
+ web_interface->web_server.setContentLength(CONTENT_LENGTH_UNKNOWN);
+ web_interface->web_server.sendHeader("Content-Type","text/html");
+ web_interface->web_server.sendHeader("Cache-Control","no-cache");
+ web_interface->web_server.send(200);
+ header_sent = true;
+ }
+ buffer_web+=data;
+ if (buffer_web.length() > 1200) {
+ //send data
+ web_interface->web_server.sendContent(buffer_web);
+ //reset buffer
+ buffer_web="";
+ }
break;
- default:
+ default:
break;
}
}
-void BRIDGE::println (const __FlashStringHelper *data, tpipe output){
+void BRIDGE::println (const __FlashStringHelper *data, tpipe output)
+{
BRIDGE::print(data,output);
#ifdef TCP_IP_DATA_FEATURE
BRIDGE::print("\r",output);
#endif
BRIDGE::print("\n",output);
}
-void BRIDGE::println (String & data, tpipe output){
+void BRIDGE::println (String & data, tpipe output)
+{
BRIDGE::print(data,output);
#ifdef TCP_IP_DATA_FEATURE
BRIDGE::print("\r",output);
#endif
BRIDGE::print("\n",output);
}
-void BRIDGE::println (const char * data, tpipe output){
+void BRIDGE::println (const char * data, tpipe output)
+{
BRIDGE::print(data,output);
#ifdef TCP_IP_DATA_FEATURE
BRIDGE::print("\r",output);
#endif
BRIDGE::print("\n",output);
}
-void BRIDGE::flush (tpipe output){
- switch(output){
- case SERIAL_PIPE:
- Serial.flush();
- break;
- case SERIAL1_PIPE:
- Serial1.flush();
+void BRIDGE::flush (tpipe output)
+{
+ switch(output) {
+ case SERIAL_PIPE:
+ ESP_SERIAL_OUT.flush();
break;
#ifdef TCP_IP_DATA_FEATURE
- case TCP_PIPE:
+ case TCP_PIPE:
break;
#endif
- case WEB_PIPE:
- if(header_sent){
- //send data
- web_interface->WebServer.sendContent(buffer_web);
- //close line
- web_interface->WebServer.sendContent("");
- }
+ case WEB_PIPE:
+ if(header_sent) {
+ //send data
+ web_interface->web_server.sendContent(buffer_web);
+ //close line
+ web_interface->web_server.sendContent("");
+ }
break;
- default:
+ default:
break;
}
header_sent = false;
@@ -123,36 +123,42 @@ void BRIDGE::flush (tpipe output){
#ifdef TCP_IP_DATA_FEATURE
-void BRIDGE::send2TCP(const __FlashStringHelper *data){
+void BRIDGE::send2TCP(const __FlashStringHelper *data)
+{
String tmp = data;
BRIDGE::send2TCP(tmp.c_str());
}
-void BRIDGE::send2TCP(String data){
+void BRIDGE::send2TCP(String data)
+{
BRIDGE::send2TCP(data.c_str());
}
-void BRIDGE::send2TCP(const char * data){
+void BRIDGE::send2TCP(const char * data)
+{
for(uint8_t i = 0; i < MAX_SRV_CLIENTS; i++) {
- if (serverClients[i] && serverClients[i].connected()) {
- serverClients[i].write(data, strlen(data));
- delay(0);
- }
+ if (serverClients[i] && serverClients[i].connected()) {
+ serverClients[i].write(data, strlen(data));
+ delay(0);
}
+ }
}
#endif
+
bool BRIDGE::processFromSerial2TCP()
{
uint8_t i;
//check UART for data
- if(Serial.available()) {
- size_t len = Serial.available();
+ if(ESP_SERIAL_OUT.available()) {
+ size_t len = ESP_SERIAL_OUT.available();
uint8_t sbuf[len];
- Serial.readBytes(sbuf, len);
+ ESP_SERIAL_OUT.readBytes(sbuf, len);
#ifdef TCP_IP_DATA_FEATURE
- //push UART data to all connected tcp clients
- for(i = 0; i < MAX_SRV_CLIENTS; i++) {
- if (serverClients[i] && serverClients[i].connected()) {
- serverClients[i].write(sbuf, len);
- delay(0);
+ if (WiFi.getMode()!=WIFI_OFF ) {
+ //push UART data to all connected tcp clients
+ for(i = 0; i < MAX_SRV_CLIENTS; i++) {
+ if (serverClients[i] && serverClients[i].connected()) {
+ serverClients[i].write(sbuf, len);
+ delay(0);
+ }
}
}
#endif
@@ -192,7 +198,7 @@ void BRIDGE::processFromTCP2Serial()
//get data from the tcp client and push it to the UART
while(serverClients[i].available()) {
data = serverClients[i].read();
- Serial.write(data);
+ ESP_SERIAL_OUT.write(data);
COMMAND::read_buffer_tcp(data);
}
}
diff --git a/esp3d/command.cpp b/esp3d/command.cpp
index 066d5879..a40647a7 100644
--- a/esp3d/command.cpp
+++ b/esp3d/command.cpp
@@ -17,24 +17,26 @@
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-#include "command.h"
#include "config.h"
-#include "wifi.h"
+#include "command.h"
+#include "wificonf.h"
#include "webinterface.h"
-#ifdef SDCARD_FEATURE
#ifndef FS_NO_GLOBALS
#define FS_NO_GLOBALS
#endif
-#endif
#include + 404 Error, unknown page!
+What are you doing here ?
+You are not supposed to find this location... +-if not redirected, click here -
- - - -
-
-
-$INCLUDE[footer.inc]$
-
diff --git a/esp3d/data/config_sta.tpl b/esp3d/data/config_sta.tpl
deleted file mode 100644
index 19955f02..00000000
--- a/esp3d/data/config_sta.tpl
+++ /dev/null
@@ -1,66 +0,0 @@
-$INCLUDE[header.inc]$
-Access Point
-
-
-
-
-$SUCCESS_MSG$
-
-
-
-
-$INCLUDE[footer.inc]$
diff --git a/esp3d/data/css2.inc b/esp3d/data/css2.inc
deleted file mode 100644
index ae0d19b3..00000000
--- a/esp3d/data/css2.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-
diff --git a/esp3d/data/footer.inc b/esp3d/data/footer.inc
deleted file mode 100644
index 3bdf08d6..00000000
--- a/esp3d/data/footer.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-$SERVICE_PAGE$
-Station
-
-
-
-
-$SUCCESS_MSG$
-
--