-
- esp-link
+
+
+
+
+
+
-
-
+
-
+
diff --git a/html/mqtt.html b/html/mqtt.html
index 37b8179..993e034 100644
--- a/html/mqtt.html
+++ b/html/mqtt.html
@@ -1,3 +1,12 @@
+
+
+ esp-link
+
+
+
+
+
+
-
+
-
diff --git a/html/mqtt.js b/html/mqtt.js
index 19c6930..fb6e7ce 100644
--- a/html/mqtt.js
+++ b/html/mqtt.js
@@ -1,3 +1,9 @@
+onLoad(function() {
+ fetchMqtt();
+ bnd($("#mqtt-form"), "submit", changeMqtt);
+ bnd($("#mqtt-status-form"), "submit", changeMqttStatus);
+});
+
//===== MQTT cards
function changeMqtt(e) {
diff --git a/html/pure.css b/html/pure.css
index b895c0e..de3beb1 100644
--- a/html/pure.css
+++ b/html/pure.css
@@ -693,8 +693,8 @@ this the same font stack that Normalize.css sets for the `body`.
font-family: inherit;
font-size: 100%;
padding: 0.5em 1em;
- color: #444; /* rgba not supported (IE 8) */
- color: rgba(0, 0, 0, 0.80); /* rgba supported */
+ color: #fff; /* rgba not supported (IE 8) */
+ color: rgba(f, f, f, 0.80); /* rgba supported */
border: 1px solid #999; /*IE 6/7/8*/
border: none rgba(0, 0, 0, 0); /*IE9 + everything else*/
background-color: #E6E6E6;
diff --git a/html/services.html b/html/services.html
index 53f4fcc..69cce40 100644
--- a/html/services.html
+++ b/html/services.html
@@ -1,120 +1,121 @@
+
+
+ esp-link
+
+
+
+
+
+
+
+
-
diff --git a/html/wifi/wifiAp.js b/html/wifi/wifiAp.js
index 59dd6ce..1f74b98 100644
--- a/html/wifi/wifiAp.js
+++ b/html/wifi/wifiAp.js
@@ -7,7 +7,7 @@ specials["ap_beacon"] = "Beacon Interval";
function changeWifiMode(m) {
blockScan = 1;
hideWarning();
- ajaxSpin("POST", "setmode?mode=" + m, function(resp) {
+ ajaxSpin("POST", "/wifi/setmode?mode=" + m, function(resp) {
showNotification("Mode changed");
window.setTimeout(getWifiInfo, 100);
blockScan = 0;
@@ -83,3 +83,28 @@ function fetchApSettings() {
window.setTimeout(fetchApSettings, 1000);
});
}
+
+function doApAdvanced() {
+ $('#AP_Settings-on').removeAttribute('hidden');
+ $("#AP_Settings-off").setAttribute("hidden", "");
+ $("#AP_Settings-roff").removeAttribute("checked");
+}
+
+function undoApAdvanced(){
+ $("#AP_Settings-on").setAttribute("hidden", "");
+ $("#AP_Settings-off").removeAttribute("hidden");
+ $("#AP_Settings-roff").setAttribute("checked", "");
+}
+
+onLoad(function() {
+ // Show info about AP
+ getWifiInfo();
+ // Fetch actual settings
+ fetchApSettings();
+ // Hide advanced settings
+ undoApAdvanced();
+ document.ap_form.ap.value='off';
+ bnd($("#AP_Settings-ron"), "click", doApAdvanced);
+ bnd($("#AP_Settings-roff"), "click", undoApAdvanced);
+ bnd($("#AP_Settings-form"), "submit", changeApSettings);
+});
diff --git a/html/wifi/wifiSta.html b/html/wifi/wifiSta.html
index bdc6dca..14ffde7 100644
--- a/html/wifi/wifiSta.html
+++ b/html/wifi/wifiSta.html
@@ -1,47 +1,37 @@
+
+
+ esp-link
+
+
+
+
+
+
-
-
-
+
+
diff --git a/html/log.html b/html/log.html
index 884cf20..74c1e72 100644
--- a/html/log.html
+++ b/html/log.html
@@ -1,11 +1,19 @@
+
+
+
-
-
-
- System overview
- -| Hostname |
-
-
-
-
- Click to edit!
- Hostname displayed in menu bar - and used by DHCP and mDNS |
| Network SSID | |
| WiFi status | |
| WiFi address | |
| SLIP status | |
| MQTT status | |
| Serial baud |
-
Info
-The JeeLabs esp-link firmware bridges the ESP8266 - serial port to WiFi and can - program microcontrollers over the serial port, in particular Arduinos, AVRs, and - NXP's LPC800 and other ARM processors. Typical avrdude command line to - program an Arduino:
-
- /home/arduino/hardware/tools/avrdude \
- -DV -patmega328p \
- -Pnet:esp-link.local:23 \
- -carduino -b115200 \
- -U flash:w:my_sketch.hex:i\
- -C /home/arduino/hardware/tools/avrdude.conf -
- - -DV -patmega328p \
- -Pnet:esp-link.local:23 \
- -carduino -b115200 \
- -U flash:w:my_sketch.hex:i\
- -C /home/arduino/hardware/tools/avrdude.conf -
where -Pnet:esp-link.local:23 tells avrdude to connect to port 23 of esp-link. - You can substitute the IP address of your esp-link for esp-link.local if necessary. - Please refer to - the online README - for up-to-date help.
+
+
+
+
+
+ System overview
+ +| Hostname |
+
+
+
+
+ Click to edit!
+ Hostname displayed in menu bar + and used by DHCP and mDNS |
| Network SSID | |
| WiFi status | |
| WiFi address | |
| SLIP status | |
| MQTT status | |
| Serial baud |
+
-
- Info
+The JeeLabs esp-link firmware bridges the ESP8266 + serial port to WiFi and can + program microcontrollers over the serial port, in particular Arduinos, AVRs, and + NXP's LPC800 and other ARM processors. Typical avrdude command line to + program an Arduino:
+
+ /home/arduino/hardware/tools/avrdude \
+ -DV -patmega328p \
+ -Pnet:esp-link.local:23 \
+ -carduino -b115200 \
+ -U flash:w:my_sketch.hex:i\
+ -C /home/arduino/hardware/tools/avrdude.conf
+ + -DV -patmega328p \
+ -Pnet:esp-link.local:23 \
+ -carduino -b115200 \
+ -U flash:w:my_sketch.hex:i\
+ -C /home/arduino/hardware/tools/avrdude.conf
where -Pnet:esp-link.local:23 tells avrdude to connect to port 23 of esp-link. + You can substitute the IP address of your esp-link for esp-link.local if necessary. + Please refer to + the online README + for up-to-date help.
-
-
-
Pin assignment
- -
-
+
+
+
+
+
+
+ System details
+ +| WiFi mode | |||||||||||||||
| WiFi channel | |||||||||||||||
| Flash chip ID |
+
+
+
-
- Common IDs: 4016=4MB, 4014=1MB, 4013=512KB
-
+
+ System details- -
+
+ Pin assignment+ +
+ | ||||||||||||||
| Current partition | |||||||||||||||
| Description: -
-
-
- Click to edit!
+ A short description or memo for this esp-link - module, 128 chars max +
+
+
+
+ Connect to µC reset pin for programming and reset-µC function
+
+
+
+
+ Second signal to program µC.
+ AVR:not used, esp8266:gpio2, ARM:ISP
+
+
+
+
+ LED to show WiFi connectivity
+
+
+
+
+ LED to show serial activity
+
+
+
+ Swap UART0 pins to avoid ROM boot message.
- Normal is + TX on gpio1/TX0 and RX on gpio3/RX0, swapped is TX on gpio15 and RX on gpio13. | |||||||||||||||
+
+
+
+
+
Enable internal 40K pull-up on RX
+
-
Debug Log
-
The debug log shows the most recent characters printed by the esp-link software itself to - its own debug log.
+The debug log shows the most recent characters printed by the ESP-LINK software itself to its own debug log.
@@ -23,38 +34,7 @@REST & MQTT
@@ -92,13 +101,6 @@Services
-
+
- esp-link
+
+
+
+
+
+
-
+
+
+
+
+
-
-
+
-
diff --git a/html/services.js b/html/services.js
index 56d799f..1aff66b 100644
--- a/html/services.js
+++ b/html/services.js
@@ -1,3 +1,10 @@
+onLoad(function() {
+ fetchServices();
+ bnd($("#Syslog-form"), "submit", changeServices);
+ bnd($("#SNTP-form"), "submit", changeServices);
+ bnd($("#mDNS-form"), "submit", changeServices);
+});
+
function changeServices(e) {
e.preventDefault();
var url = "services/update?1=1";
diff --git a/html/style.css b/html/style.css
index 1bb11cd..6a2ae40 100644
--- a/html/style.css
+++ b/html/style.css
@@ -26,6 +26,8 @@ a:hover {
background-color: #eee;
padding: 1em;
margin: 0.5em;
+ -moz-border-radius: 0.5em;
+ -webkit-border-radius: 0.5em;
border-radius: 0.5em;
border: 0px solid #000000;
}
@@ -39,7 +41,7 @@ a:hover {
}
.click-to-edit input, .click-to-edit textarea {
color: black;
- background-color: #eee;
+ background-color: #F0CAA6;
width: 100%;
}
.click-to-edit span, .click-to-edit div {
@@ -49,9 +51,9 @@ a:hover {
width: 100%;
color: #444; /* rgba not supported (IE 8) */
color: rgba(0, 0, 0, 0.80); /* rgba supported */
- border: 1px solid #999; /*IE 6/7/8*/
+ border: 1px solid #111; /*IE 6/7/8*/
border: none rgba(0, 0, 0, 0); /*IE9 + everything else*/
- background-color: #E6E6E6;
+ background-color: #CCCCCC;
text-decoration: none;
border-radius: 2px;
}
@@ -155,6 +157,9 @@ fieldset fields {
/* Add transition to containers so they can push in and out */
#layout, #menu, .menu-link {
-webkit-transition: all 0.2s ease-out;
+ -moz-transition: all 0.2s ease-out;
+ -ms-transition: all 0.2s ease-out;
+ -o-transition: all 0.2s ease-out;
transition: all 0.2s ease-out;
}
@@ -186,10 +191,10 @@ div.tt {
.content {
margin: 0 auto;
padding: 0 2em;
- max-width: 800px;
+ /*max-width: 800px;*/
margin-bottom: 20px;
line-height: 1.6em;
- width: 100%;
+ /*width: 100%;*/
box-sizing: border-box;
overflow: auto;
}
@@ -198,12 +203,12 @@ div.tt {
margin: 0;
color: #333;
text-align: center;
- padding: 2.5em 2em 0;
+ padding: 0.5em;
border-bottom: 1px solid #eee;
background-color: #fc0;
}
.header h1 {
- margin: 0.2em 0;
+ margin: 0;
font-size: 3em;
font-weight: 300;
}
@@ -251,6 +256,8 @@ input.inline {
/* Text console */
pre.console {
background-color: #663300;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
border-radius: 5px;
border: 0px solid #000000;
color: #66ff66;
@@ -495,6 +502,8 @@ pre.console a {
height: 50px;
width: 50px;
-webkit-animation: rotation 1s infinite linear;
+ -moz-animation: rotation 1s infinite linear;
+ -o-animation: rotation 1s infinite linear;
animation: rotation 1s infinite linear;
border-left: 10px solid rgba(204, 51, 0, 0.15);
border-right: 10px solid rgba(204, 51, 0, 0.15);
@@ -518,6 +527,23 @@ pre.console a {
}
}
+@-moz-keyframes rotation {
+ from {
+ -moz-transform: rotate(0deg);
+ }
+ to {
+ -moz-transform: rotate(359deg);
+ }
+}
+@-o-keyframes rotation {
+ from {
+ -o-transform: rotate(0deg);
+ }
+ to {
+ -o-transform: rotate(359deg);
+ }
+}
+
@keyframes rotation {
from {
-webkit-transform: rotate(0deg);
@@ -528,3 +554,36 @@ pre.console a {
transform: rotate(359deg);
}
}
+
+a
+{
+ color: #5873DD;
+ font-family: Arial;
+ font-size: 10pt;
+ font-weight: bold;
+ text-decoration: none;
+}
+
+a.btn
+{
+ white-space: nowrap;
+ text-align: center;
+ vertical-align: middle;
+ display: inline-block;
+ border-radius: 6px;
+ font-size: 16pt;
+ line-height: 1.33;
+ padding: 10px 10px;
+}
+
+a.btn-yes
+{
+ background-color: #5CB85C;
+ color: white;
+}
+
+a.btn-no
+{
+ background-color: #D9534F;
+ color: white;
+}
diff --git a/html/ui.js b/html/ui.js
index aa66f69..4b4c582 100644
--- a/html/ui.js
+++ b/html/ui.js
@@ -330,6 +330,15 @@ function makeAjaxInput(klass, field) {
eoff.setAttribute('hidden','');
domForEach(eon, function(el){ el.removeAttribute('hidden'); });
eon[0].select();
+ old_hostname = eon[0].value;
+ return false;
+ }
+
+ var just_close = function()
+ {
+ domForEach(eon, function(el){ el.setAttribute('hidden',''); });
+ eoff.removeAttribute('hidden');
+ setEditToClick(klass+"-"+field, old_hostname);
return false;
}
@@ -347,9 +356,10 @@ function makeAjaxInput(klass, field) {
}
bnd(eoff, "click", function(){return enableEditToClick();});
- bnd(eon[0], "blur", function(){return submitEditToClick(eon[0].value);});
+ bnd(eon[0], "blur", function(){return just_close();});
bnd(eon[0], "keyup", function(ev){
if ((ev||window.event).keyCode==13) return submitEditToClick(eon[0].value);
+ else if ((ev||window.event).keyCode==27) return just_close();
});
});
}
@@ -369,11 +379,17 @@ function setEditToClick(klass, value) {
//===== Notifications
+var notifTimeout = null;
function showWarning(text) {
var el = $("#warning");
el.innerHTML = text;
el.removeAttribute('hidden');
window.scrollTo(0, 0);
+ if (notifTimeout != null) clearTimeout(notifTimeout);
+ notifTimout = setTimeout(function() {
+ el.setAttribute('hidden', '');
+ notifTimout = null;
+ }, 6000);
}
function hideWarning() {
el = $("#warning").setAttribute('hidden', '');
diff --git a/html/wifi/wifiAp.html b/html/wifi/wifiAp.html
index 41b3697..9a93f60 100644
--- a/html/wifi/wifiAp.html
+++ b/html/wifi/wifiAp.html
@@ -1,50 +1,74 @@
+
+
+
-
+ - Syslog - -
-
+
+
- + mDNS + +
+
-
-
- SNTP - -
-WiFi Soft-AP Configuration
-
-
-
+
-
-
-
-
-
+
+
+
-
-
-
- Soft-AP State
-
-
+
| WiFi mode | |
| Soft-AP SSID | |
| Soft-AP Password | |
| Soft-AP Channel | |
| Soft-AP Max Conn | |
| Soft-AP Hidden | |
| Soft-AP Beacon Int | |
| Soft-AP Auth Mode | |
| Soft-AP MAC | |
| WiFi mode | |
| Soft-AP SSID | |
| Soft-AP Password | |
| Soft-AP Channel | |
| Soft-AP Max Conn | |
| Soft-AP Hidden | |
| Soft-AP Beacon Interval | |
| Soft-AP Auth Mode | |
| Soft-AP MAC | |
-
+
+
-
- Soft-AP Settings
- - -WiFi Station Configuration
-
-
-
+
-
diff --git a/html/wifi/wifiSta.js b/html/wifi/wifiSta.js
index 0ab167a..0257571 100644
--- a/html/wifi/wifiSta.js
+++ b/html/wifi/wifiSta.js
@@ -201,3 +201,12 @@ function doStatic() {
$('#dhcp-off').removeAttribute('hidden');
$('#dhcp-on').setAttribute('hidden', '');
}
+
+onLoad(function() {
+ getWifiInfo();
+ bnd($("#wifiform"), "submit", changeWifiAp);
+ bnd($("#specform"), "submit", changeSpecial);
+ bnd($("#dhcp-ron"), "click", doDhcp);
+ bnd($("#dhcp-roff"), "click", doStatic);
+ scanTimeout = window.setTimeout(scanAPs, 500);
+});
diff --git a/httpd/auth.c b/httpd/auth.c
index df14175..3cf6fd2 100644
--- a/httpd/auth.c
+++ b/httpd/auth.c
@@ -31,10 +31,10 @@ int ICACHE_FLASH_ATTR authBasic(HttpdConnData *connData) {
r=httpdGetHeader(connData, "Authorization", hdr, sizeof(hdr));
if (r && strncmp(hdr, "Basic", 5)==0) {
- r=base64_decode(strlen(hdr)-6, hdr+6, sizeof(userpass), (unsigned char *)userpass);
+ r=ubase64_decode(strlen(hdr)-6, hdr+6, sizeof(userpass), (unsigned char *)userpass);
if (r<0) r=0; //just clean out string on decode error
userpass[r]=0; //zero-terminate user:pass string
-// os_printf("Auth: %s\n", userpass);
+// DBG("Auth: %s\n", userpass);
while (((AuthGetUserPw)(connData->cgiArg))(connData, no,
user, AUTH_MAX_USER_LEN, pass, AUTH_MAX_PASS_LEN)) {
//Check user/pass against auth header
diff --git a/httpd/base64.c b/httpd/base64.c
index 9d97a26..bba2730 100644
--- a/httpd/base64.c
+++ b/httpd/base64.c
@@ -39,7 +39,7 @@ static int ICACHE_FLASH_ATTR base64decode(const char in[4], char out[3]) {
#endif
/* decode a base64 string in one shot */
-int ICACHE_FLASH_ATTR base64_decode(size_t in_len, const char *in, size_t out_len, unsigned char *out) {
+int ICACHE_FLASH_ATTR ubase64_decode(size_t in_len, const char *in, size_t out_len, unsigned char *out) {
unsigned int ii, io;
uint32_t v;
unsigned int rem;
diff --git a/httpd/base64.h b/httpd/base64.h
index 4dc8621..d26b316 100644
--- a/httpd/base64.h
+++ b/httpd/base64.h
@@ -1,6 +1,6 @@
#ifndef BASE64_H
#define BASE64_H
-int base64_decode(size_t in_len, const char *in, size_t out_len, unsigned char *out);
+int ubase64_decode(size_t in_len, const char *in, size_t out_len, unsigned char *out);
#endif
\ No newline at end of file
diff --git a/httpd/httpd.c b/httpd/httpd.c
index f3c5594..f3e8657 100644
--- a/httpd/httpd.c
+++ b/httpd/httpd.c
@@ -396,7 +396,7 @@ static void ICACHE_FLASH_ATTR httpdProcessRequest(HttpdConnData *conn) {
return;
}
else {
- if (!(r == HTTPD_CGI_NOTFOUND || r == HTTPD_CGI_AUTHENTICATED)) {
+ if (r == HTTPD_CGI_NOTFOUND) {
os_printf("%shandler for %s returned invalid result %d\n", connStr, conn->url, r);
}
//URL doesn't want to handle the request: either the data isn't found or there's no
diff --git a/include/user_config.h b/include/user_config.h
index 131e1b9..3c8bee2 100644
--- a/include/user_config.h
+++ b/include/user_config.h
@@ -37,7 +37,10 @@
// If defined, the default hostname for DHCP will include the chip ID to make it unique
#undef CHIP_IN_HOSTNAME
-extern char* esp_link_version;
+extern char esp_link_version[];
+extern char esp_link_date[];
+extern char esp_link_time[];
+extern char esp_link_build[];
extern uint8_t UTILS_StrToIP(const char* str, void *ip);
#endif
-
+
-
+
-
-
-
- WiFi State
| WiFi mode | |
| WiFi channel | |
| Configured network | |
| WiFi status | |
| WiFi address | |
| WiFi rssi | |
| WiFi phy | |
| WiFi MAC | |
| WiFi mode | |
| WiFi channel | |
| Configured network | |
| WiFi status | |
| WiFi address | |
| WiFi rssi | |
| WiFi phy | |
| WiFi MAC | |
-
WiFi Association
- - -
-
+
+
+
+
+
-
Special Settings
+
+