Merge branch 'master' into work

.gitignore

@@ -12,6 +12,7 @@ html_compressed/
 ldscript_memspecific.ld
 eagle.app.sym
 node_modules
+esphttpdconfig.mk
 
 # Garbage added by CLion
 .idea/

.gitmodules

@@ -1,6 +1,7 @@
 [submodule "libesphttpd"]
 	path = libesphttpd
 	url = git@github.com:MightyPork/libesphttpd.git
+	branch = master
 [submodule "front-end"]
 	path = front-end
 	url = git@github.com:espterm/espterm-front-end.git

LICENSE.txt

@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.

README.md

@@ -68,6 +68,16 @@ It **does not work with**:
   - Static IP, DHCP, channel selection, power
   - SSID search utility for finding your existing network
   
+## Bugs? Ideas?
+
+To ask any questions or discuss new features you'd like to see added, it's best to use 
+the **[ESPTerm Dev mailing list](https://groups.google.com/forum/#!forum/espterm-dev)**
+
+Subscribe to the mailing list to also receive new release announcements.
+
+If you found a bug (that happens alot!), please submit it to our [bug tracker](https://github.com/espterm/espterm-firmware/issues).
+We also use it to track planned ideas. If you don't want to create a GitHub account for that, just send it to the mailing list.
+
 ## Running ESPTerm
 
 To run ESPTerm on your ESP8266, either build it yourself from source using `xtensa-lx106-elf-gcc` 

esphttpdconfig.mk

@@ -43,12 +43,12 @@ GLOBAL_CFLAGS = \
     -DDEBUG_CAPTDNS=0 \
     -DDEBUG_HTTP=0 \
     -DDEBUG_ESPFS=0 \
-    -DDEBUG_PERSIST=0 \
+    -DDEBUG_PERSIST=1 \
     -DDEBUG_UTFCACHE=0 \
     -DDEBUG_CGI=0 \
     -DDEBUG_WIFI=0 \
     -DDEBUG_WS=0 \
-    -DDEBUG_ANSI=0 \
+    -DDEBUG_ANSI=1 \
     -DDEBUG_ANSI_NOIMPL=1 \
     -DDEBUG_INPUT=0 \
     -DDEBUG_HEAP=1 \

esphttpdconfig.mk.example

@@ -0,0 +1,61 @@
+# --------------- esphttpd config options ---------------
+
+# If GZIP_COMPRESSION is set to "yes" then the static css, js, and html files will be compressed with gzip before added to the espfs image
+# and will be served with gzip Content-Encoding header.
+# This could speed up the downloading of these files, but might break compatibility with older web browsers not supporting gzip encoding
+# because Accept-Encoding is simply ignored. Enable this option if you have large static files to serve (for e.g. JQuery, Twitter bootstrap)
+# By default only js, css and html files are compressed.
+# If you have text based static files with different extensions what you want to serve compressed then you will need to add the extension to the following places:
+# - Add the extension to this Makefile at the webpages.espfs target to the find command
+# - Add the extension to the gzippedFileTypes array in the user/httpd.c file
+#
+# Adding JPG or PNG files (and any other compressed formats) is not recommended, because GZIP compression does not works effectively on compressed files.
+
+#Static gzipping is disabled by default.
+GZIP_COMPRESSION = yes
+
+# If COMPRESS_W_YUI is set to "yes" then the static css and js files will be compressed with yui-compressor
+# This option works only when GZIP_COMPRESSION is set to "yes"
+# http://yui.github.io/yuicompressor/
+#Disabled by default.
+COMPRESS_W_YUI = no
+
+YUI-COMPRESSOR = /usr/bin/yui-compressor
+
+#If USE_HEATSHRINK is set to "yes" then the espfs files will be compressed with Heatshrink and decompressed
+#on the fly while reading the file. Because the decompression is done in the esp8266, it does not require
+#any support in the browser.
+USE_HEATSHRINK = yes
+
+USE_OPENSDK = yes
+
+# this ugly trick is needed to allow a relative path
+SDK_BASE=$(dir $(lastword $(MAKEFILE_LIST)))/esp_iot_sdk_v1.5.2/
+
+# combined / separate / ota
+OUTPUT_TYPE = combined
+
+# SPI flash size, in K
+ESP_SPI_FLASH_SIZE_K = 1024
+
+GLOBAL_CFLAGS = \
+    -DDEBUG_ROUTER=0 \
+    -DDEBUG_CAPTDNS=0 \
+    -DDEBUG_HTTP=0 \
+    -DDEBUG_ESPFS=0 \
+    -DDEBUG_PERSIST=1 \
+    -DDEBUG_UTFCACHE=0 \
+    -DDEBUG_CGI=0 \
+    -DDEBUG_WIFI=0 \
+    -DDEBUG_WS=0 \
+    -DDEBUG_ANSI=1 \
+    -DDEBUG_ANSI_NOIMPL=1 \
+    -DDEBUG_INPUT=0 \
+    -DDEBUG_HEAP=1 \
+    -DDEBUG_MALLOC=0 \
+    -DHTTPD_MAX_BACKLOG_SIZE=8192 \
+    -DHTTPD_MAX_HEAD_LEN=1024 \
+    -DHTTPD_MAX_POST_LEN=512 \
+    -DDEBUG_LOGBUF_SIZE=1024 \
+    -mforce-l32 \
+    -DUSE_OPTIMIZE_PRINTF=1

front-end

@@ -1 +1 @@
-Subproject commit b18a0f389005913a214f4a86efb27e23206fa52e
+Subproject commit f5dd70a6f32ac36f0820badc170832f27242a09d

libesphttpd

@@ -1 +1 @@
-Subproject commit 24f9a371eb5c0804dcc6657f99449ef07788140c
+Subproject commit 3479ab3efcb4581669370cde6a607f936ff5515a

user/cgi_main.c

@@ -68,7 +68,8 @@ tplAbout(HttpdConnData *connData, char *token, void **arg)
 		tplSend(connData, httpdGetVersion(), -1);
 	}
 	else if (streq(token, "vers_sdk")) {
-		tplSend(connData, STR(ESP_SDK_VERSION), -1);
+		//tplSend(connData, STR(ESP_SDK_VERSION), -1);
+		tplSend(connData, system_get_sdk_version(), -1);
 	}
 	else if (streq(token, "hash_backend")) {
 		tplSend(connData, GIT_HASH_BACKEND, -1);

user/cgi_network.c

@@ -181,6 +181,8 @@ httpd_cgi_state ICACHE_FLASH_ATTR cgiNetworkSetParams(HttpdConnData *connData)
 		}
 	}
 
+	(void) redir_url;
+
 	if (redir_url_buf[strlen(SET_REDIR_ERR)] == 0) {
 		// All was OK
 		cgi_info("Set network params - success, applying in 1000 ms");
@@ -194,7 +196,7 @@ httpd_cgi_state ICACHE_FLASH_ATTR cgiNetworkSetParams(HttpdConnData *connData)
 		os_timer_setfn(&timer, applyNetSettingsLaterCb, NULL);
 		os_timer_arm(&timer, 1000, false);
 
-		httpdRedirect(connData, SET_REDIR_SUC);
+		httpdRedirect(connData, SET_REDIR_SUC "?msg=Settings%20saved%20and%20applied.");
 	} else {
 		cgi_warn("Some WiFi settings did not validate, asking for correction");
 

user/cgi_persist.c

@@ -8,7 +8,7 @@ Cgi/template routines for configuring non-wifi settings
 #include "helpers.h"
 #include "cgi_logging.h"
 
-#define SET_REDIR_SUC "/cfg/admin"
+#define SET_REDIR_SUC "/cfg/system"
 
 static bool ICACHE_FLASH_ATTR
 verify_admin_pw(const char *pw)
@@ -34,7 +34,7 @@ cgiPersistWriteDefaults(HttpdConnData *connData)
 
 			persist_set_as_default();
 
-			httpdRedirect(connData, SET_REDIR_SUC);
+			httpdRedirect(connData, SET_REDIR_SUC "?msg=Default%20settings%20updated.");
 			return HTTPD_CGI_DONE;
 		}
 		// if pw failed, show the same error as if it's wrong
@@ -55,7 +55,7 @@ cgiPersistRestoreDefaults(HttpdConnData *connData)
 
 	persist_restore_default();
 
-	httpdRedirect(connData, SET_REDIR_SUC);
+	httpdRedirect(connData, SET_REDIR_SUC "?msg=All%20settings%20restored%20to%20saved%20defaults.");
 	return HTTPD_CGI_DONE;
 }
 
@@ -71,6 +71,6 @@ cgiPersistRestoreHard(HttpdConnData *connData)
 	// Defaults are not changed.
 	persist_load_hard_default();
 
-	httpdRedirect(connData, SET_REDIR_SUC);
+	httpdRedirect(connData, SET_REDIR_SUC "?msg=All%20settings%20restored%20to%20factory%20defaults.");
 	return HTTPD_CGI_DONE;
 }

user/cgi_sockets.c

@@ -247,7 +247,7 @@ static void ICACHE_FLASH_ATTR sendMouseAction(char evt, int y, int x, int button
 		sprintf(buf, "\x1b[<%d;%d;%d%c", eventcode, x, y, (evt == 'p'||(evt=='m'&&button>0)) ? 'M' : 'm');
 	}
 	else if (mte == MTE_URXVT) {
-		sprintf(buf, "\x1b[%d;%d;%dM", (u8)(32+eventcode), (u8)(32+x), (u8)(32+y));
+		sprintf(buf, "\x1b[%d;%d;%dM", (u8)(32+eventcode), (u8)(x), (u8)(y));
 	}
 
 	UART_SendAsync(buf, -1);

user/cgi_system.c

@@ -6,7 +6,6 @@
 #include "cgi_system.h"
 #include "persist.h"
 #include "syscfg.h"
-#include "uart_driver.h"
 #include "ansi_parser.h"
 #include "cgi_logging.h"
 
@@ -98,9 +97,7 @@ cgiSystemCfgSetParams(HttpdConnData *connData)
 
 	do {
 		if (!GET_ARG("pw")) {
-			warn("Missing admin pw!");
+			break; // if no PW in GET, not trying to configure anything protected
-			redir_url += sprintf(redir_url, "pw,");
-			break;
 		}
 
 		if (!streq(buff, persist.admin.pw)) {
@@ -191,6 +188,14 @@ cgiSystemCfgSetParams(HttpdConnData *connData)
 		}
 	} while (0);
 
+	if (GET_ARG("overclock")) {
+		cgi_dbg("overclock = %s", buff);
+		int enable = atoi(buff);
+		if (sysconf->overclock != enable) {
+			sysconf->overclock = (bool)enable;
+		}
+	}
+
 	(void)redir_url;
 
 	if (redir_url_buf[strlen(SET_REDIR_ERR)] == 0) {
@@ -200,7 +205,7 @@ cgiSystemCfgSetParams(HttpdConnData *connData)
 		sysconf_apply_settings();
 		persist_store();
 
-		httpdRedirect(connData, SET_REDIR_SUC);
+		httpdRedirect(connData, SET_REDIR_SUC "?msg=Settings%20saved%20and%20applied.");
 	} else {
 		cgi_warn("Some settings did not validate, asking for correction");
 
@@ -234,10 +239,21 @@ tplSystemCfg(HttpdConnData *connData, char *token, void **arg)
 	if (streq(token, "pwlock")) {
 		sprintf(buff, "%d", sysconf->pwlock);
 	}
-
+	else if (streq(token, "access_name")) {
-	if (streq(token, "access_name")) {
 		sprintf(buff, "%s", sysconf->access_name);
 	}
+	else if (streq(token, "def_access_name")) {
+		sprintf(buff, "%s", DEF_ACCESS_NAME);
+	}
+	else if (streq(token, "def_access_pw")) {
+		sprintf(buff, "%s", DEF_ACCESS_PW);
+	}
+	else if (streq(token, "def_admin_pw")) {
+		sprintf(buff, "%s", DEFAULT_ADMIN_PW);
+	}
+	else if (streq(token, "overclock")) {
+		sprintf(buff, "%d", sysconf->overclock);
+	}
 
 	tplSend(connData, buff, -1);
 	return HTTPD_CGI_DONE;

user/cgi_term_cfg.c

@@ -10,6 +10,7 @@ Cgi/template routines for configuring non-wifi settings
 #include "helpers.h"
 #include "cgi_logging.h"
 #include "uart_driver.h"
+#include "serial.h"
 
 #define SET_REDIR_SUC "/cfg/term"
 #define SET_REDIR_ERR SET_REDIR_SUC"?err="
@@ -42,6 +43,7 @@ cgiTermCfgSetParams(HttpdConnData *connData)
 	bool notify_screen_content = 0, notify_screen_labels = 0;
 
 	bool shall_clear_screen = false;
+	bool shall_init_uart = false;
 
 	char *redir_url = redir_url_buf;
 	redir_url += sprintf(redir_url, SET_REDIR_ERR);
@@ -317,6 +319,7 @@ cgiTermCfgSetParams(HttpdConnData *connData)
 			baud == BIT_RATE_1843200 ||
 			baud == BIT_RATE_3686400) {
 			sysconf->uart_baudrate = (u32) baud;
+			shall_init_uart = true;
 		} else {
 			cgi_warn("Bad baud rate %s", buff);
 			redir_url += sprintf(redir_url, "uart_baud,");
@@ -328,6 +331,7 @@ cgiTermCfgSetParams(HttpdConnData *connData)
 		int parity = atoi(buff);
 		if (parity >= 0 && parity <= 2) {
 			sysconf->uart_parity = (UartParityMode) parity;
+			shall_init_uart = true;
 		} else {
 			cgi_warn("Bad parity %s", buff);
 			redir_url += sprintf(redir_url, "uart_parity,");
@@ -339,6 +343,7 @@ cgiTermCfgSetParams(HttpdConnData *connData)
 		int stopbits = atoi(buff);
 		if (stopbits >= 1 && stopbits <= 3) {
 			sysconf->uart_stopbits = (UartStopBitsNum) stopbits;
+			shall_init_uart = true;
 		} else {
 			cgi_warn("Bad stopbits %s", buff);
 			redir_url += sprintf(redir_url, "uart_stopbits,");
@@ -359,6 +364,10 @@ cgiTermCfgSetParams(HttpdConnData *connData)
 			terminal_apply_settings_noclear();
 		}
 
+		if (shall_init_uart) {
+			serialInit();
+		}
+
 		if (notify_screen_content) {
 			screen_notifyChange(CHANGE_CONTENT);
 		}
@@ -367,7 +376,7 @@ cgiTermCfgSetParams(HttpdConnData *connData)
 			screen_notifyChange(CHANGE_LABELS);
 		}
 
-		httpdRedirect(connData, SET_REDIR_SUC);
+		httpdRedirect(connData, SET_REDIR_SUC "?msg=Settings%20saved%20and%20applied.");
 	} else {
 		cgi_warn("Some settings did not validate, asking for correction");
 

user/cgi_wifi.c

@@ -535,7 +535,7 @@ httpd_cgi_state ICACHE_FLASH_ATTR cgiWiFiSetParams(HttpdConnData *connData)
 			httpdRedirect(connData, "/cfg/wifi/connecting");
 		}
 		else {
-			httpdRedirect(connData, SET_REDIR_SUC);
+			httpdRedirect(connData, SET_REDIR_SUC "?msg=Settings%20saved%20and%20applied.");
 		}
 	} else {
 		cgi_warn("Some WiFi settings did not validate, asking for correction");

user/persist.h

@@ -18,7 +18,7 @@
 
 // Changing this could be used to force-erase the config area
 // after a firmware upgrade
-#define CHECKSUM_SALT 5
+#define CHECKSUM_SALT 6
 
 #define APPCONF_SIZE 1900
 
@@ -52,7 +52,7 @@ typedef struct { // the entire block should be 1024 bytes long (for compatibilit
 	uint32_t checksum; // computed before write and tested on load. If it doesn't match, values are reset to hard defaults.
 } AppConfigBundle;
 
-#define ADMINCONF_VERSION 0
+#define ADMINCONF_VERSION 1
 #define ADMINCONF_SIZE 256
 
 typedef struct {

user/screen.c

@@ -339,6 +339,20 @@ screen_reset_do(bool size, bool labels)
 		scr.tab_stops[i] = 0x80808080;
 	}
 
+	if (labels) {
+		strcpy(termconf_live.title, termconf->title);
+
+		for (int i = 1; i <= TERM_BTN_COUNT; i++) {
+			strcpy(termconf_live.btn[i], termconf->btn[i]);
+			strcpy(termconf_live.btn_msg[i], termconf->btn_msg[i]);
+		}
+
+		termconf_live.show_buttons = termconf->show_buttons;
+		termconf_live.show_config_links = termconf->show_config_links;
+
+		screen_notifyChange(CHANGE_LABELS);
+	}
+
 	// initial values in the save buffer in case of receiving restore without storing first
 	opt_backup.cursors_alt_mode = scr.cursors_alt_mode;
 	opt_backup.reverse_video = scr.reverse_video;
@@ -355,17 +369,6 @@ screen_reset_do(bool size, bool labels)
 	opt_backup.show_config_links = termconf_live.show_config_links;
 
 	NOTIFY_DONE();
-
-	if (labels) {
-		strcpy(termconf_live.title, termconf->title);
-
-		for (int i = 1; i <= TERM_BTN_COUNT; i++) {
-			strcpy(termconf_live.btn[i], termconf->btn[i]);
-			strcpy(termconf_live.btn_msg[i], termconf->btn_msg[i]);
-		}
-
-		screen_notifyChange(CHANGE_LABELS);
-	}
 }
 
 /**

user/syscfg.c

@@ -13,10 +13,11 @@ void ICACHE_FLASH_ATTR
 sysconf_apply_settings(void)
 {
 	bool changed = false;
-//	if (sysconf->config_version < 1) {
+	if (sysconf->config_version < 1) {
-//		dbg("Upgrading syscfg to v 1");
+		dbg("Upgrading syscfg to v 1");
-//		changed = true;
+		sysconf->overclock = false;
-//	}
+		changed = true;
+	}
 
 	sysconf->config_version = SYSCONF_VERSION;
 
@@ -24,7 +25,10 @@ sysconf_apply_settings(void)
 		persist_store();
 	}
 
+	// uart settings live here, but the CGI handler + form has been moved to the Terminal config page
 	serialInit();
+
+	system_update_cpu_freq((uint8) (sysconf->overclock ? 160 : 80));
 }
 
 void ICACHE_FLASH_ATTR
@@ -38,4 +42,5 @@ sysconf_restore_defaults(void)
 	sysconf->pwlock = PWLOCK_NONE;
 	strcpy(sysconf->access_pw, DEF_ACCESS_PW);
 	strcpy(sysconf->access_name, DEF_ACCESS_NAME);
+	sysconf->overclock = false;
 }

user/syscfg.h

@@ -10,7 +10,7 @@
 // Size designed for the wifi config structure
 // Must be constant to avoid corrupting user config after upgrade
 #define SYSCONF_SIZE 300
-#define SYSCONF_VERSION 0
+#define SYSCONF_VERSION 1
 
 #define DEF_ACCESS_PW "1234"
 #define DEF_ACCESS_NAME "espterm"
@@ -32,6 +32,7 @@ typedef struct {
 	enum pwlock pwlock : 8; // page access lock
 	char access_pw[64]; // access password
 	char access_name[32]; // access name
+	bool overclock;
 } SystemConfigBundle;
 
 extern SystemConfigBundle * const sysconf;

user/uart_buffer.c

@@ -9,7 +9,7 @@
 #include <uart_register.h>
 
 #define UART_TX_BUFFER_SIZE 512  //Ring buffer length of tx buffer
-#define UART_RX_BUFFER_SIZE 512 //Ring buffer length of rx buffer
+#define UART_RX_BUFFER_SIZE 600 //Ring buffer length of rx buffer
 
 struct UartBuffer {
 	uint32 UartBuffSize;
@@ -158,9 +158,19 @@ void UART_RxFifoCollect(void)
 	uint8 fifo_data;
 	fifo_len = (uint8) ((READ_PERI_REG(UART_STATUS(UART0)) >> UART_RXFIFO_CNT_S) & UART_RXFIFO_CNT);
 	if (fifo_len >= pRxBuffer->Space) {
-		UART_WriteChar(UART1, '%', 100);
+		// try to read at least the bit we can
+		fifo_len = (uint8) (pRxBuffer->Space - 1);
+		UART_WriteChar(UART1, '%', 1);
+		// discard contents of the FIFO - would loop forever
+		buf_idx = 0;
+		while (buf_idx < fifo_len) {
+			buf_idx++;
+			fifo_data = (uint8) (READ_PERI_REG(UART_FIFO(UART0)) & 0xFF);
+			(void)fifo_data; // pretend we use it
 		}
-	else {
+		return;
+	}
+
 	buf_idx = 0;
 	while (buf_idx < fifo_len) {
 		buf_idx++;
@@ -171,11 +181,11 @@ void UART_RxFifoCollect(void)
 		}
 	}
 	pRxBuffer->Space -= fifo_len;
-
+//
-		if (pRxBuffer->Space >= UART_FIFO_LEN) {
+	// this is called by the processing routine, no need here
-			uart_rx_intr_enable(UART0);
+//		if (pRxBuffer->Space >= UART_FIFO_LEN) {
-		}
+//			uart_rx_intr_enable(UART0);
-	}
+//		}
 }
 
 u16 ICACHE_FLASH_ATTR UART_AsyncTxGetEmptySpace(void)
@@ -209,7 +219,7 @@ UART_SendAsync(const char *pdata, int16_t data_len)
 			UART_WriteToAsyncBuffer(pTxBuffer, pdata, real_len);
 		}
 		else {
-			UART_WriteChar(UART1, '^', 100);
+			UART_WriteChar(UART1, '^', 1);
 		}
 //	}
 

user/uart_handler.c

@@ -25,7 +25,7 @@ static void uart_processTask(os_event_t *events);
 
 // Those heavily affect the byte loss ratio
 #define PROCESS_CHUNK_LEN 1
-#define FIFO_FULL_THRES 4
+#define FIFO_FULL_THRES 32
 
 #define uart_recvTaskPrio        1
 #define uart_recvTaskQueueLen    25

user/version.h

@@ -5,8 +5,8 @@
 #ifndef ESP_VT100_FIRMWARE_VERSION_H
 #define ESP_VT100_FIRMWARE_VERSION_H
 
-#define FW_V_MAJOR 1
+#define FW_V_MAJOR 2
-#define FW_V_MINOR 1
+#define FW_V_MINOR 0
 #define FW_V_PATCH 0
 
 #define FIRMWARE_VERSION STR(FW_V_MAJOR) "." STR(FW_V_MINOR) "." STR(FW_V_PATCH)

user/wifimgr.c

@@ -187,6 +187,10 @@ wifimgr_apply_settings(void)
 		configure_ap();
 	}
 
+	// tpw seems to be common - but info is scarce
+	// at any rate seems to do no harm to have it here
+	system_phy_set_max_tpw(wificonf->tpw);
+
 	wifi_change_flags.ap = false;
 	wifi_change_flags.sta = false;