added codepages 2 and 3

CMakeLists.txt

@@ -170,6 +170,7 @@ add_definitions(
         -DICACHE_FLASH_ATTR=
         -DICACHE_RODATA_ATTR=
         -DFLAG_GZIP=2
+        -DESP_LANG="en"
 
         -DGIT_HASH_BACKEND="asdf"
         -DGIT_HASH_FRONTEND="asdf"

Makefile

@@ -62,6 +62,10 @@ LIBS		= c gcc hal phy pp net80211 wpa main lwip crypto
 #Add in esphttpd lib
 LIBS += esphttpd
 
+ifndef ESP_LANG
+ESP_LANG = en
+endif
+
 # compiler flags using during compilation of source files -ggdb
 CFLAGS		= -Os -std=gnu99 -Werror -Wpointer-arith -Wundef -Wall -Wl,-EL -fno-inline-functions \
 		-nostdlib -mlongcalls -mtext-section-literals  -D__ets__ -DICACHE_FLASH \
@@ -69,7 +73,7 @@ CFLAGS		= -Os -std=gnu99 -Werror -Wpointer-arith -Wundef -Wall -Wl,-EL -fno-inli
 
 CFLAGS += -DGIT_HASH_BACKEND='"$(shell git rev-parse --short HEAD)"'
 CFLAGS += -DGIT_HASH_FRONTEND='"$(shell cd front-end && git rev-parse --short HEAD)"'
-CFLAGS += -D__TIMEZONE__='"$(shell date +%Z)"'
+CFLAGS += -D__TIMEZONE__='"$(shell date +%Z)"' -DESP_LANG='"$(ESP_LANG)"'
 
 ifdef GLOBAL_CFLAGS
 CFLAGS += $(GLOBAL_CFLAGS)
@@ -211,19 +215,7 @@ all: checkdirs
 	$(Q) make actual_all -j4 -B
 
 release:
-	ESP_LANG=cs make web
+	$(Q) ./release.sh
-	make actual_all -j4
-	cp firmware/0x00000.bin release/0x00000.bin
-	cp firmware/0x40000.bin release/0x40000-CS.bin
-
-	ESP_LANG=en make web
-	make actual_all -j4
-	cp firmware/0x40000.bin release/0x40000-EN.bin
-
-	ESP_LANG=de make web
-	make actual_all -j4
-	cp firmware/0x40000.bin release/0x40000-DE.bin
-
 
 actual_all: parser $(TARGET_OUT) $(FW_BASE)
 

get_version.c

@@ -0,0 +1,14 @@
+//
+// Created by MightyPork on 2017/10/03.
+//
+// helper for building release packages
+//
+// Run with `tcc -run`
+//
+
+#include "user/version.h"
+#include <stdio.h>
+
+void main() {
+	printf(FW_VERSION);
+}

include/user_config.h

@@ -1 +0,0 @@
-

rel-tpl/README.txt

@@ -0,0 +1,21 @@
+This is a release archive of ESPTerm,
+the VT100 terminal emulator for ESP8266.
+
+--------------------------------------------
+Version: %VERS%
+Locale : %LANG%
+Built  : %DATETIME%
+--------------------------------------------
+
+Source repository:
+  https://github.com/espterm/espterm-firmware
+
+Report any bugs to our bug-tracker at
+  https://github.com/espterm/espterm-firmware/issues
+or send them to out mailing list
+  espterm-dev@googlegroups.com
+
+On-line demo is available at
+  https://espterm.github.io/term.html
+
+[EOF]

rel-tpl/flash.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+# The parameters ESPTOOL, ESPPORT and ESPBAUD can be customized
+# - export your preferred values in .bashrc
+
+echo -e "\e[32;1mFlashing ESPTerm %VERS% (%LANG%)\e[0m"
+
+if [ -z ${ESPTOOL} ]; then
+	ESPTOOL='esptool'
+	which ${ESPTOOL} &>/dev/null
+	if [ $? -ne 0 ]; then
+		ESPTOOL='esptool.py'
+		which ${ESPTOOL} &>/dev/null
+		if [ $? -ne 0 ]; then
+			echo -e '\e[31;1mesptool not found!\e[0m'
+			exit 1
+		fi
+	fi
+fi
+
+[ -z ESPPORT ] && ESPPORT=/dev/ttyUSB0
+[ -z ESPBAUD ] && ESPBAUD=460800
+
+set -x
+${ESPTOOL} --port ${ESPPORT} --baud ${ESPBAUD} \
+	write_flash 0x00000 '%FILE0%' 0x40000 '%FILE4%'

release/.gitignore

@@ -1,2 +1,3 @@
 *
 !.gitignore
+!flash-tpl.sh

ship.sh

@@ -0,0 +1,69 @@
+#!/usr/bin/env bash
+
+if [ -z "$1" ]; then
+    vers=$(tcc -run get_version.c)
+else
+    vers=$1
+fi
+
+git pull
+
+echo -n -e "\e[1;36mBuilding packages for version $vers\e[0m"
+
+cd front-end
+git pull
+cd ..
+
+function buildlang() {
+    lang=$1
+
+    echo -e "\n\e[33;1m------ Building \"${lang}\" package ------\e[0m\n"
+
+    make clean
+    ESP_LANG=${lang} make web
+    ESP_LANG=${lang} make actual_all -B -j4
+
+    cd release
+
+    destdir="$vers-$lang"
+    file0=${vers}-0x00000-${lang}.bin
+    file4=${vers}-0x40000-${lang}.bin
+    [ -e ${destdir} ] && rm -r ${destdir}
+    mkdir ${destdir}
+    cp ../firmware/0x00000.bin ${destdir}/${file0}
+    cp ../firmware/0x40000.bin ${destdir}/${file4}
+
+    flashsh=${destdir}/flash.sh
+    cp ../rel-tpl/flash.sh ${flashsh}
+    sed -i s/%FILE0%/${file0}/ ${flashsh}
+    sed -i s/%FILE4%/${file4}/ ${flashsh}
+    sed -i s/%VERS%/${vers}/ ${flashsh}
+    sed -i s/%LANG%/${lang}/ ${flashsh}
+    chmod +x ${flashsh}
+
+    readmefil=${destdir}/README.txt
+    cp ../rel-tpl/README.txt ${readmefil}
+    sed -i s/%VERS%/${vers}/ ${readmefil}
+    sed -i s/%LANG%/${lang}/ ${readmefil}
+    dt=$(LC_TIME=en_US.UTF-8 date '+%c')
+    sed -i "s#%DATETIME%#${dt}#" ${readmefil}
+    unix2dos ${readmefil}
+
+    cd ${destdir}
+    sha256sum ${file0} ${file4} README.txt flash.sh > checksums.txt
+    cd ..
+
+    targetfile=espterm-${vers}-${lang}.zip
+    [[ -e ${targetfile}.zip ]] && rm ${targetfile}.zip
+    pwd
+    zip -9 ${targetfile} ${destdir}/*
+    cd ..
+}
+
+if [ -z "$ESP_LANG" ]; then
+    buildlang cs
+    buildlang en
+    buildlang de
+else
+    buildlang ${ESP_LANG}
+fi

user/ansi_parser_callbacks.c

@@ -11,7 +11,7 @@
 #include "version.h"
 #include "uart_buffer.h"
 #include "screen.h"
-#include "uart_driver.h"
+#include "wifimgr.h"
 
 volatile bool enquiry_suppressed = false;
 ETSTimer enqTimer;
@@ -27,8 +27,8 @@ void ICACHE_FLASH_ATTR enqTimerCb(void *unused)
 void ICACHE_FLASH_ATTR
 apars_respond(const char *str)
 {
-	UART_WriteString(UART0, str, UART_TIMEOUT_US);
+	// Using the Tx buffer causes issues with large data (eg. from http requests)
-	//UART_SendAsync(str, -1);
+	UART_SendAsync(str, -1);
 }
 
 /**
@@ -48,8 +48,24 @@ apars_handle_enq(void)
 {
 	if (enquiry_suppressed) return;
 
+	u8 mac[6];
+	wifi_get_macaddr(SOFTAP_IF, mac);
+
+	char buf100[100];
+	char *buf = buf100;
+	buf += sprintf(buf, "\x1bX");
+	buf += sprintf(buf, "ESPTerm "VERSION_STRING" ");
+	buf += sprintf(buf, "#"GIT_HASH_BACKEND"+"GIT_HASH_FRONTEND" ");
+	buf += sprintf(buf, "id=%02X%02X%02X ", mac[3], mac[4], mac[5]);
+	int x = getStaIpAsString(buf);
+	if (x) buf += x;
+	else buf--; // remove the trailing space
+	buf += sprintf(buf, "\x1b\\");
+
+	(void)buf;
+
 	// version encased in SOS and ST
-	apars_respond("\x1bXESPTerm " FIRMWARE_VERSION "\x1b\\");
+	apars_respond(buf100);
 
 	// Throttle enquiry - this is a single-character-invoked response,
 	// so it tends to happen randomly when throwing garbage at the ESP.

user/cgi_d2d.c

@@ -7,13 +7,14 @@
 #include "version.h"
 #include "ansi_parser_callbacks.h"
 #include "api.h"
+#include "uart_driver.h"
 #include <httpclient.h>
 #include <esp_utils.h>
 
 #define D2D_TIMEOUT_MS 2000
 
 #define D2D_HEADERS \
-	"User-Agent: ESPTerm "FIRMWARE_VERSION" like curl wget HTTPie\r\n" \
+	"User-Agent: ESPTerm "VERSION_STRING" like curl wget HTTPie\r\n" \
 	"Content-Type: text/plain; charset=utf-8\r\n" \
 	"Accept-Encoding: identity\r\n" \
 	"Accept-Charset: utf-8\r\n" \
@@ -29,6 +30,14 @@ struct d2d_request_opts {
 
 volatile bool request_pending = false;
 
+// NOTE! We bypass the async buffer here - used for user input and
+// responses to queries {apars_respond()}. In rare situations this could
+// lead to a race condition and mixing two different messages
+static inline void ICACHE_FLASH_ATTR sendResponseToUART(const char *str)
+{
+	UART_WriteString(UART0, str, UART_TIMEOUT_US);
+}
+
 static void ICACHE_FLASH_ATTR
 requestNoopCb(int http_status,
 			   char *response_headers,
@@ -54,8 +63,6 @@ requestCb(int http_status,
 
 	struct d2d_request_opts *opts = userArg;
 
-	d2d_dbg("Rx url response, code %d, nonce \"%s\"", http_status, opts->nonce?opts->nonce:"");
-
 	// ensure positive - would be hard to parse
 	if (http_status < 0) http_status = -http_status;
 
@@ -68,6 +75,8 @@ requestCb(int http_status,
 	if (opts->max_result_len > 0 && len > opts->max_result_len)
 		len = (int) opts->max_result_len;
 
+	d2d_info("Rx HTTP response, code %d, len %d, nonce \"%s\"", http_status, len, opts->nonce?opts->nonce:"");
+
 	char *bb = buff100;
 	bb += sprintf(bb, "\x1b^h;%d;", http_status);
 	const char *comma = "";
@@ -95,7 +104,7 @@ requestCb(int http_status,
 	// semicolon only if more data is to be sent
 	if (opts->want_head || opts->want_body)	sprintf(bb, ";");
 
-	apars_respond(buff100);
+	sendResponseToUART(buff100);
 
 	//d2d_dbg("Headers (part) %100s", response_headers);
 	//d2d_dbg("Body (part) %100s", response_body);
@@ -107,8 +116,8 @@ requestCb(int http_status,
 			response_headers[len] = 0;
 			opts->want_body = false; // soz, it wouldn't fit
 		}
-		apars_respond(response_headers);
+		sendResponseToUART(response_headers);
-		if(opts->want_body) apars_respond("\r\n");
+		if(opts->want_body) sendResponseToUART("\r\n");
 	}
 
 	if(opts->want_body) {
@@ -117,10 +126,10 @@ requestCb(int http_status,
 			response_body[len - (opts->want_head*(headers_size+2))] = 0;
 		}
 
-		apars_respond(response_body);
+		sendResponseToUART(response_body);
 	}
 
-	apars_respond("\a");
+	sendResponseToUART("\a");
 
 	free(opts->nonce);
 	free(opts);
@@ -151,7 +160,7 @@ d2d_parse_command(char *msg)
 		FIND_NEXT(ip, ';');
 		const char *payload = msg;
 
-		d2d_dbg("D2D Tx,dest=%s,msg=%s", ip, payload);
+		d2d_info("D2D Tx,dest=%s,msg=%s", ip, payload);
 		sprintf(buff40, "http://%s" API_D2D_MSG, ip);
 
 		httpclient_args args;
@@ -194,9 +203,8 @@ d2d_parse_command(char *msg)
 
 		FIND_NEXT(params, ';');
 
+		d2d_info("HTTP request");
 		d2d_dbg("Method %s", method);
-		d2d_dbg("Params %s", params);
-
 		size_t max_buf_len = HTTPCLIENT_DEF_MAX_LEN;
 		size_t max_result_len = 0; // 0 = no truncate
 		uint timeout = HTTPCLIENT_DEF_TIMEOUT_MS;
@@ -265,7 +273,7 @@ d2d_parse_command(char *msg)
 		request_pending = true;
 		http_request(&args, no_resp ? requestNoopCb : requestCb);
 
-		d2d_dbg("Done");
+		d2d_dbg("Request sent.");
 		return true;
 	}
 
@@ -290,16 +298,16 @@ httpd_cgi_state ICACHE_FLASH_ATTR cgiD2DMessage(HttpdConnData *connData)
 	u8 *ip = connData->remote_ip;
 	char buf[20];
 	sprintf(buf, "\x1b^m;"IPSTR";L=%d;", ip[0], ip[1], ip[2], ip[3], (int)len);
-	apars_respond(buf);
+	sendResponseToUART(buf);
 
 	if (connData->post && connData->post->buff)
-		apars_respond(connData->post->buff);
+		sendResponseToUART(connData->post->buff);
 	else if (connData->getArgs)
-		apars_respond(connData->getArgs);
+		sendResponseToUART(connData->getArgs);
 
-	apars_respond("\a");
+	sendResponseToUART("\a");
 
-	d2d_dbg("D2D Rx src="IPSTR",len=%d", ip[0], ip[1], ip[2], ip[3],len);
+	d2d_info("D2D Rx src="IPSTR",len=%d", ip[0], ip[1], ip[2], ip[3],len);
 
 	// Received a msg
 

user/cgi_main.c

@@ -44,7 +44,7 @@ tplAbout(HttpdConnData *connData, char *token, void **arg)
 	if (token == NULL) return HTTPD_CGI_DONE;
 
 	if (streq(token, "vers_fw")) {
-		tplSend(connData, FIRMWARE_VERSION, -1);
+		tplSend(connData, VERSION_STRING, -1);
 	}
 	else if (streq(token, "date")) {
 		tplSend(connData, __DATE__, -1);

user/cgi_wifi.c

@@ -617,22 +617,7 @@ httpd_cgi_state ICACHE_FLASH_ATTR tplWlan(HttpdConnData *connData, char *token,
 		}
 	}
 	else if (streq(token, "sta_active_ip")) {
-		x = wifi_get_opmode();
+		getStaIpAsString(buff);
-		connectStatus = wifi_station_get_connect_status();
-
-		if (x == SOFTAP_MODE || connectStatus != STATION_GOT_IP || wificonf->opmode == SOFTAP_MODE) {
-			strcpy(buff, "");
-		}
-		else {
-			struct ip_info info;
-			wifi_get_ip_info(STATION_IF, &info);
-			sprintf(buff, IPSTR, GOOD_IP2STR(info.ip.addr));
-
-//			sprintf(buff, "ip: "IPSTR", mask: "IPSTR", gw: "IPSTR,
-//					GOOD_IP2STR(info.ip.addr),
-//					GOOD_IP2STR(info.netmask.addr),
-//					GOOD_IP2STR(info.gw.addr));
-		}
 	}
 
 	tplSend(connData, buff, -1);

user/character_sets.h

@@ -19,143 +19,352 @@
  * Based on rxvt-unicode screen.C table.
  */
 static const u16 codepage_0[] ESP_CONST_DATA =
-	{//	Unicode    ASCII   SYM
+	{   //         Unicode  ASCII   SYM
 		// %%BEGIN:0%%
-		0x2666, // 96	`	♦
+		u'♦',	// 0x2666	96	`
-		0x2592, // 97	a	▒
+		u'▒',	// 0x2592	97	a
-		0x2409, // 98	b	HT
+		u'␉',	// 0x2409	98	b
-		0x240c, // 99	c	FF
+		u'␌',	// 0x240c	99	c	FF
-		0x240d, // 100	d	CR
+		u'␍',	// 0x240d	100	d	CR
-		0x240a, // 101	e	LF
+		u'␊',	// 0x240a	101	e	LF
-		0x00b0, // 102	f	°
+		u'°',	// 0x00b0	102	f
-		0x00b1, // 103	g	±
+		u'±',	// 0x00b1	103	g
-		0x2424, // 104	h	NL
+		u'␤',	// 0x2424	104	h	NL
-		0x240b, // 105	i	VT
+		u'␋',	// 0x240b	105	i	VT
-		0x2518, // 106	j	┘
+		u'┘',	// 0x2518	106	j
-		0x2510, // 107	k	┐
+		u'┐',	// 0x2510	107	k
-		0x250c, // 108	l	┌
+		u'┌',	// 0x250c	108	l
-		0x2514, // 109	m	└
+		u'└',	// 0x2514	109	m
-		0x253c, // 110	n	┼
+		u'┼',	// 0x253c	110	n
-		0x23ba, // 111	o	⎺
+		u'⎺',	// 0x23ba	111	o
-		0x23bb, // 112	p	⎻
+		u'⎻',	// 0x23bb	112	p
-		0x2500, // 113	q	─
+		u'─',	// 0x2500	113	q
-		0x23bc, // 114	r	⎼
+		u'⎼',	// 0x23bc	114	r
-		0x23bd, // 115	s	⎽
+		u'⎽',	// 0x23bd	115	s
-		0x251c, // 116	t	├
+		u'├',	// 0x251c	116	t
-		0x2524, // 117	u	┤
+		u'┤',	// 0x2524	117	u
-		0x2534, // 118	v	┴
+		u'┴',	// 0x2534	118	v
-		0x252c, // 119	w	┬
+		u'┬',	// 0x252c	119	w
-		0x2502, // 120	x	│
+		u'│',	// 0x2502	120	x
-		0x2264, // 121	y	≤
+		u'≤',	// 0x2264	121	y
-		0x2265, // 122	z	≥
+		u'≥',	// 0x2265	122	z
-		0x03c0, // 123	{	π
+		u'π',	// 0x03c0	123	{
-		0x2260, // 124	|	≠
+		u'≠',	// 0x2260	124	|
-		0x20a4, // 125	}	£
+		u'£',	// 0x20a4	125	}
-		0x00b7, // 126	~	·
+		u'·',	// 0x00b7	126	~
 		// %%END:0%%
 	};
 
 #define CODEPAGE_1_BEGIN 33
 #define CODEPAGE_1_END 126
 
+// DOS, thin and double lines, arrows, angles, diagonals, thick border
 static const u16 codepage_1[] ESP_CONST_DATA =
-	{//	Unicode    ASCII   SYM  DOS
+	{//            Unicode  ASCII  DOS
 		// %%BEGIN:1%%
-		0x263A,	// 33	!	☺	(1)  - low ASCII symbols from DOS, moved to +32
+		u'☺',	// 0x263A,	33	!	(1)  - low ASCII symbols from DOS, moved to +32
-		0x263B,	// 34	"	☻	(2)
+		u'☻',	// 0x263B,	34	"	(2)
-		0x2665,	// 35	#	♥	(3)
+		u'♥',	// 0x2665,	35	#	(3)
-		0x2666,	// 36	$	♦	(4)
+		u'♦',	// 0x2666,	36	$	(4)
-		0x2663,	// 37	%	♣	(5)
+		u'♣',	// 0x2663,	37	%	(5)
-		0x2660,	// 38	&	♠	(6)
+		u'♠',	// 0x2660,	38	&	(6)
-		0x2022,	// 39	'	•	(7)  - inverse dot and circle left out, can be done with SGR
+		u'•',	// 0x2022,	39	'	(7)  - inverse dot and circle left out, can be done with SGR
-		0x231B,	// 40	(	⌛        - hourglass (timer icon)
+		u'⌛',	// 0x231B,	40	(	- hourglass (timer icon)
-		0x25CB,	// 41	)	○	(9)
+		u'○',	// 0x25CB,	41	)	(9)
-		0x21AF,	// 42	*	↯        - electricity (lightning monitor...)
+		u'↯',	// 0x21AF,	42	*	- electricity (lightning monitor...)
-		0x266A,	// 43	+	♪	(13)
+		u'♪',	// 0x266A,	43	+	(13)
-		0x266B,	// 44	,	♫	(14)
+		u'♫',	// 0x266B,	44	,	(14)
-		0x263C,	// 45	-	☼	(15)
+		u'☼',	// 0x263C,	45	-	(15)
-		0x2302,	// 46	.	⌂	(127)
+		u'⌂',	// 0x2302,	46	.	(127)
-		0x2622,	// 47	/	☢         - radioactivity (geiger counter...)
+		u'☢',	// 0x2622,	47	/	- radioactivity (geiger counter...)
-		0x2591,	// 48	0	░	(176) - this block is kept aligned and ordered from DOS, moved -128
+		u'░',	// 0x2591,	48	0	(176) - this block is kept aligned and ordered from DOS, moved -128
-		0x2592,	// 49	1	▒	(177)
+		u'▒',	// 0x2592,	49	1	(177)
-		0x2593,	// 50	2	▓	(178)
+		u'▓',	// 0x2593,	50	2	(178)
-		0x2502,	// 51	3	│	(179)
+		u'│',	// 0x2502,	51	3	(179)
-		0x2524,	// 52	4	┤	(180)
+		u'┤',	// 0x2524,	52	4	(180)
-		0x2561,	// 53	5	╡	(181)
+		u'╡',	// 0x2561,	53	5	(181)
-		0x2562,	// 54	6	╢	(182)
+		u'╢',	// 0x2562,	54	6	(182)
-		0x2556,	// 55	7	╖	(183)
+		u'╖',	// 0x2556,	55	7	(183)
-		0x2555,	// 56	8	╕	(184)
+		u'╕',	// 0x2555,	56	8	(184)
-		0x2563,	// 57	9	╣	(185)
+		u'╣',	// 0x2563,	57	9	(185)
-		0x2551,	// 58	:	║	(186)
+		u'║',	// 0x2551,	58	:	(186)
-		0x2557,	// 59	;	╗	(187)
+		u'╗',	// 0x2557,	59	;	(187)
-		0x255D,	// 60	<	╝	(188)
+		u'╝',	// 0x255D,	60	<	(188)
-		0x255C,	// 61	=	╜	(189)
+		u'╜',	// 0x255C,	61	=	(189)
-		0x255B,	// 62	>	╛	(190)
+		u'╛',	// 0x255B,	62	>	(190)
-		0x2510,	// 63	?	┐	(191)
+		u'┐',	// 0x2510,	63	?	(191)
-		0x2514,	// 64	@	└	(192)
+		u'└',	// 0x2514,	64	@	(192)
-		0x2534,	// 65	A	┴	(193)
+		u'┴',	// 0x2534,	65	A	(193)
-		0x252C,	// 66	B	┬	(194)
+		u'┬',	// 0x252C,	66	B	(194)
-		0x251C,	// 67	C	├	(195)
+		u'├',	// 0x251C,	67	C	(195)
-		0x2500,	// 68	D	─	(196)
+		u'─',	// 0x2500,	68	D	(196)
-		0x253C,	// 69	E	┼	(197)
+		u'┼',	// 0x253C,	69	E	(197)
-		0x255E,	// 70	F	╞	(198)
+		u'╞',	// 0x255E,	70	F	(198)
-		0x255F,	// 71	G	╟	(199)
+		u'╟',	// 0x255F,	71	G	(199)
-		0x255A,	// 72	H	╚	(200)
+		u'╚',	// 0x255A,	72	H	(200)
-		0x2554,	// 73	I	╔	(201)
+		u'╔',	// 0x2554,	73	I	(201)
-		0x2569,	// 74	J	╩	(202)
+		u'╩',	// 0x2569,	74	J	(202)
-		0x2566,	// 75	K	╦	(203)
+		u'╦',	// 0x2566,	75	K	(203)
-		0x2560,	// 76	L	╠	(204)
+		u'╠',	// 0x2560,	76	L	(204)
-		0x2550,	// 77	M	═	(205)
+		u'═',	// 0x2550,	77	M	(205)
-		0x256C,	// 78	N	╬	(206)
+		u'╬',	// 0x256C,	78	N	(206)
-		0x2567,	// 79	O	╧	(207)
+		u'╧',	// 0x2567,	79	O	(207)
-		0x2568,	// 80	P	╨	(208)
+		u'╨',	// 0x2568,	80	P	(208)
-		0x2564,	// 81	Q	╤	(209)
+		u'╤',	// 0x2564,	81	Q	(209)
-		0x2565,	// 82	R	╥	(210)
+		u'╥',	// 0x2565,	82	R	(210)
-		0x2559,	// 83	S	╙	(211)
+		u'╙',	// 0x2559,	83	S	(211)
-		0x2558,	// 84	T	╘	(212)
+		u'╘',	// 0x2558,	84	T	(212)
-		0x2552,	// 85	U	╒	(213)
+		u'╒',	// 0x2552,	85	U	(213)
-		0x2553,	// 86	V	╓	(214)
+		u'╓',	// 0x2553,	86	V	(214)
-		0x256B,	// 87	W	╫	(215)
+		u'╫',	// 0x256B,	87	W	(215)
-		0x256A,	// 88	X	╪	(216)
+		u'╪',	// 0x256A,	88	X	(216)
-		0x2518,	// 89	Y	┘	(217)
+		u'┘',	// 0x2518,	89	Y	(217)
-		0x250C,	// 90	Z	┌	(218)
+		u'┌',	// 0x250C,	90	Z	(218)
-		0x2588,	// 91	[	█	(219)
+		u'█',	// 0x2588,	91	[	(219)
-		0x2584,	// 92	\	▄	(220)
+		u'▄',	// 0x2584,	92	\	(220)
-		0x258C,	// 93	]	▌	(221)
+		u'▌',	// 0x258C,	93	]	(221)
-		0x2590,	// 94	^	▐	(222)
+		u'▐',	// 0x2590,	94	^	(222)
-		0x2580,	// 95	_	▀	(223)
+		u'▀',	// 0x2580,	95	_	(223)
-		0x2195,	// 96	`	↕	(18)  - moved from low DOS ASCII
+		u'↕',	// 0x2195,	96	`	(18)  - moved from low DOS ASCII
-		0x2191,	// 97	a	↑	(24)
+		u'↑',	// 0x2191,	97	a	(24)
-		0x2193,	// 98	b	↓	(25)
+		u'↓',	// 0x2193,	98	b	(25)
-		0x2192,	// 99	c	→	(26)
+		u'→',	// 0x2192,	99	c	(26)
-		0x2190,	// 100	d	←	(27)
+		u'←',	// 0x2190,	100	d	(27)
-		0x2194,	// 101	e	↔	(29)
+		u'↔',	// 0x2194,	101	e	(29)
-		0x25B2,	// 102	f	▲	(30)
+		u'▲',	// 0x25B2,	102	f	(30)
-		0x25BC,	// 103	g	▼	(31)
+		u'▼',	// 0x25BC,	103	g	(31)
-		0x25BA,	// 104	h	►	(16)
+		u'►',	// 0x25BA,	104	h	(16)
-		0x25C4,	// 105	i	◄	(17)
+		u'◄',	// 0x25C4,	105	i	(17)
-		0x25E2,	// 106	j	◢         - added for slanted corners
+		u'◢',	// 0x25E2,	106	j	- added for slanted corners
-		0x25E3,	// 107	k	◣
+		u'◣',	// 0x25E3,	107	k
-		0x25E4,	// 108	l	◤
+		u'◤',	// 0x25E4,	108	l
-		0x25E5,	// 109	m	◥
+		u'◥',	// 0x25E5,	109	m
-		0x256D,	// 110	n	╭         - rounded corners
+		u'╭',	// 0x256D,	110	n	- rounded corners
-		0x256E,	// 111	o	╮
+		u'╮',	// 0x256E,	111	o
-		0x256F,	// 112	p	╯
+		u'╯',	// 0x256F,	112	p
-		0x2570,	// 113	q	╰
+		u'╰',	// 0x2570,	113	q
-		0x0,	// 114	r             - free positions for future expansion
+		u'╱',	// 0x0,	114	r - right up diagonal
-		0x0,	// 115	s
+		u'╲',	// 0x0,	115	s - right down diagonal
-		0x0,	// 116	t
+		u'╳',	// 0x0,	116	t
-		0x0,	// 117	u
+		0,	// 0x0,	117	u
-		0x0,	// 118	v
+		0,	// 0x0,	118	v
-		0x0,	// 119	w
+		0,	// 0x0,	119	w
-		0x0,	// 120	x
+		0,	// 0x0,	120	x
-		0x0,	// 121	y
+		0xE0B0,	// powerline right triangle (filled), 121 y
-		0x0,	// 122	z
+		0xE0B1,	// powerline right triangle (hollow), 122	z
-		0x0,	// 123	{
+		0xE0B2,	// powerline left triangle (filled), 123	{
-		0x0,	// 124	|
+		0xE0B3,	// powerline left triangle (hollow), 124	|	- reserved
-		0x2714,	// 125	}	✔         - checkboxes or checklist items
+		u'✔',	// 0x2714,	125	}	- checkboxes or checklist items
-		0x2718,	// 126	~	✘
+		u'✘',	// 0x2718,	126	~
 		// %%END:1%%
 	};
 
+#define CODEPAGE_2_BEGIN 33
+#define CODEPAGE_2_END 126
+
+// blocks, thick and split lines, line butts
+static const u16 codepage_2[] ESP_CONST_DATA =
+	{//            Unicode  ASCII  DOS
+		// %%BEGIN:2%%
+		u'▁',	// 0x2581,	33	! - those are ordered this way to allow easy calculating of the right code (for graphs)
+		u'▂',	// 0x2582,	34	"
+		u'▃',	// 0x2583,	35	#
+		u'▄',	// 0x2584,	36	$
+		u'▅',	// 0x2585,	37	%
+		u'▆',	// 0x2586,	38	&
+		u'▇',	// 0x2587,	39	' - 7-eighths
+		u'█',	// 0x2588,	40	( - full block, shared by both sequences
+		u'▉',	// 0x2589,	41	) - those grow thinner, to re-use the full block
+		u'▊',	// 0x258A,	42	*
+		u'▋',	// 0x258B,	43	+
+		u'▌',	// 0x258C,	44	,
+		u'▍',	// 0x258D,	45	-
+		u'▎',	// 0x258E,	46	.
+		u'▏',	// 0x258F,	47	/
+		u'▔',	// 0x2594,	48	0 - complementary symbols
+		u'▕',	// 0x2595,	49	1
+		u'▐',	// 0x2590,	50	2
+		u'▀',	// 0x2580,	51	3
+		u'▘',	// 0x2598,	52	4 - top-left, top-right, bottom-right, bottom-left
+		u'▝',	// 0x259D,	53	5
+		u'▗',	// 0x2597,	54	6
+		u'▖',	// 0x2596,	55	7
+		u'▟',	// 0x259F,	56	8
+		u'▙',	// 0x2599,	57	9
+		u'▛',	// 0x259B,	58	:
+		u'▜',	// 0x259C,	59	;
+		u'▞',	// 0x259E,	60	< - complementary diagonals
+		u'▚',	// 0x259A,	61	=
+		u'━',	// 0x,	62	> - here are thick and thin lines and their joins. it's really quite arbitrary, based on the unicode order, excluding single lines
+		u'┃',	// 0x,	63	?
+		u'┍',	// 0x,	64	@
+		u'┎',	// 0x,	65	A
+		u'┏',	// 0x,	66	B
+		u'┑',	// 0x,	67	C
+		u'┒',	// 0x,	68	D
+		u'┓',	// 0x,	69	E
+		u'┕',	// 0x,	70	F
+		u'┖',	// 0x,	71	G
+		u'┗',	// 0x,	72	H
+		u'┙',	// 0x,	73	I
+		u'┚',	// 0x,	74	J
+		u'┛',	// 0x,	75	K
+		u'┝',	// 0x,	76	L
+		u'┞',	// 0x,	77	M
+		u'┟',	// 0x,	78	N
+		u'┠',	// 0x,	79	O
+		u'┡',	// 0x,	80	P
+		u'┢',	// 0x,	81	Q
+		u'┣',	// 0x,	82	R
+		u'┥',	// 0x,	83	S
+		u'┦',	// 0x,	84	T
+		u'┧',	// 0x,	85	U
+		u'┨',	// 0x,	86	V
+		u'┩',	// 0x,	87	W
+		u'┪',	// 0x,	88	X
+		u'┫',	// 0x,	89	Y
+		u'┭',	// 0x,	90	Z
+		u'┮',	// 0x,	91	[
+		u'┯',	// 0x,	92	\ .
+		u'┰',	// 0x,	93	]
+		u'┱',	// 0x,	94	^
+		u'┲',	// 0x,	95	_
+		u'┳',	// 0x,	96	`
+		u'┵',	// 0x,	97	a
+		u'┶',	// 0x,	98	b
+		u'┷',	// 0x,	99	c
+		u'┸',	// 0x,	100	d
+		u'┹',	// 0x,	101	e
+		u'┺',	// 0x,	102	f
+		u'┻',	// 0x,	103	g
+		u'┽',	// 0x,	104	h
+		u'┾',	// 0x,	105	i
+		u'┿',	// 0x,	106	j
+		u'╀',	// 0x,	107	k
+		u'╁',	// 0x,	108	l
+		u'╂',	// 0x,	109	m
+		u'╃',	// 0x,	110	n
+		u'╄',	// 0x,	111	o
+		u'╅',	// 0x,	112	p
+		u'╆',	// 0x,	113	q
+		u'╇',	// 0x,	114	r
+		u'╈',	// 0x,	115	s
+		u'╉',	// 0x,	116	t
+		u'╊',	// 0x,	117	u
+		u'╋',	// 0x,	118	v
+		u'╴',	// 0x,	119	w - butts
+		u'╵',	// 0x,	120	x
+		u'╶',	// 0x,	121	y
+		u'╷',	// 0x,	122	z
+		u'╸',	// 0x,	123	{
+		u'╹',	// 0x,  124	|
+		u'╺',	// 0x,	125	}
+		u'╻',	// 0x,	126	~
+		// %%END:2%%
+	};
+
+#define CODEPAGE_3_BEGIN 33
+#define CODEPAGE_3_END 48
+
+// dashed lines, split straight lines
+static const u16 codepage_3[] ESP_CONST_DATA =
+	{//            Unicode  ASCII  DOS
+		// %%BEGIN:3%%
+		u'╌',	// 0x,	33	!
+		u'┄',	// 0x,	34	"
+		u'┈',	// 0x,	35	#
+		u'╍',	// 0x,	36	$
+		u'┅',	// 0x,	37	%
+		u'┉',	// 0x,	38	&
+		u'╎',	// 0x,	39	'
+		u'┆',	// 0x,	40	(
+		u'┊',	// 0x,	41	)
+		u'╏',	// 0x,	42	*
+		u'┇',	// 0x,	43	+
+		u'┋',	// 0x,	44	,
+		u'╼',	// 0x,	45	-
+		u'╽',	// 0x,	46	.
+		u'╾',	// 0x,	47	/
+		u'╿',	// 0x,	48	0
+		// %%END:3%%
+//		u'\0',	// 0x,	49	1
+//		u'\0',	// 0x,	50	2
+//		u'\0',	// 0x,	51	3
+//		u'\0',	// 0x,	52	4
+//		u'\0',	// 0x,	53	5
+//		u'\0',	// 0x,	54	6
+//		u'\0',	// 0x,	55	7
+//		u'\0',	// 0x,	56	8
+//		u'\0',	// 0x,	57	9
+//		u'\0',	// 0x,	58	:
+//		u'\0',	// 0x,	59	;
+//		u'\0',	// 0x,	60	<
+//		u'\0',	// 0x,	61	=
+//		u'\0',	// 0x,	62	>
+//		u'\0',	// 0x,	63	?
+//		u'\0',	// 0x,	64	@
+//		u'\0',	// 0x,	65	A
+//		u'\0',	// 0x,	66	B
+//		u'\0',	// 0x,	67	C
+//		u'\0',	// 0x,	68	D
+//		u'\0',	// 0x,	69	E
+//		u'\0',	// 0x,	70	F
+//		u'\0',	// 0x,	71	G
+//		u'\0',	// 0x,	72	H
+//		u'\0',	// 0x,	73	I
+//		u'\0',	// 0x,	74	J
+//		u'\0',	// 0x,	75	K
+//		u'\0',	// 0x,	76	L
+//		u'\0',	// 0x,	77	M
+//		u'\0',	// 0x,	78	N
+//		u'\0',	// 0x,	79	O
+//		u'\0',	// 0x,	80	P
+//		u'\0',	// 0x,	81	Q
+//		u'\0',	// 0x,	82	R
+//		u'\0',	// 0x,	83	S
+//		u'\0',	// 0x,	84	T
+//		u'\0',	// 0x,	85	U
+//		u'\0',	// 0x,	86	V
+//		u'\0',	// 0x,	87	W
+//		u'\0',	// 0x,	88	X
+//		u'\0',	// 0x,	89	Y
+//		u'\0',	// 0x,	90	Z
+//		u'\0',	// 0x,	91	[
+//		u'\0',	// 0x,	92	\ .
+//		u'\0',	// 0x,	93	]
+//		u'\0',	// 0x,	94	^
+//		u'\0',	// 0x,	95	_
+//		u'\0',	// 0x,	96	`
+//		u'\0',	// 0x,	97	a
+//		u'\0',	// 0x,	98	b
+//		u'\0',	// 0x,	99	c
+//		u'\0',	// 0x,	100	d
+//		u'\0',	// 0x,	101	e
+//		u'\0',	// 0x,	102	f
+//		u'\0',	// 0x,	103	g
+//		u'\0',	// 0x,	104	h
+//		u'\0',	// 0x,	105	i
+//		u'\0',	// 0x,	106	j
+//		u'\0',	// 0x,	107	k
+//		u'\0',	// 0x,	108	l
+//		u'\0',	// 0x,	109	m
+//		u'\0',	// 0x,	110	n
+//		u'\0',	// 0x,	111	o
+//		u'\0',	// 0x,	112	p
+//		u'\0',	// 0x,	113	q
+//		u'\0',	// 0x,	114	r
+//		u'\0',	// 0x,	115	s
+//		u'\0',	// 0x,	116	t
+//		u'\0',	// 0x,	117	u
+//		u'\0',	// 0x,	118	v
+//		u'\0',	// 0x,	119	w
+//		u'\0',	// 0x,	120	x
+//		u'\0',	// 0x,	121	y
+//		u'\0',	// 0x,	122	z
+//		u'\0',	// 0x,	123	{
+//		u'\0',	// 0x,  124	|
+//		u'\0',	// 0x,	125	}
+//		u'\0',	// 0x,	126	~
+	};
+
 #endif //ESPTERM_CHARACTER_SETS_H_H

user/screen.c

@@ -1794,6 +1794,20 @@ utf8_remap(char *out, char g, char charset)
 			}
 			break;
 
+		case CS_2_BLOCKS_LINES: /* ESPTerm Character Rom 2 */
+			if ((g >= CODEPAGE_2_BEGIN) && (g <= CODEPAGE_2_END)) {
+				n = codepage_2[g - CODEPAGE_2_BEGIN];
+				if (n) utf = n;
+			}
+			break;
+
+		case CS_3_LINES_EXTRA: /* ESPTerm Character Rom 3 */
+			if ((g >= CODEPAGE_3_BEGIN) && (g <= CODEPAGE_3_END)) {
+				n = codepage_3[g - CODEPAGE_3_BEGIN];
+				if (n) utf = n;
+			}
+			break;
+
 		case CS_A_UKASCII: /* UK, replaces # with GBP */
 			if (g == '#') utf = 0x20a4; // £
 			break;

user/screen.h

@@ -156,6 +156,8 @@ typedef enum {
 	CS_A_UKASCII = 'A',
 	CS_0_DEC_SUPPLEMENTAL = '0',
 	CS_1_DOS_437 = '1',
+	CS_2_BLOCKS_LINES = '2',
+	CS_3_LINES_EXTRA = '3',
 } CHARSET;
 
 enum ScreenSerializeTopic {

user/uart_handler.c

@@ -52,6 +52,7 @@ void ICACHE_FLASH_ATTR UART_Init(void)
 
 	// U0RXD
 	PIN_FUNC_SELECT(PERIPHS_IO_MUX_U0RXD_U, FUNC_U0RXD);
+	PIN_PULLUP_DIS(PERIPHS_IO_MUX_U0RXD_U);
 
 	// U1TXD (GPIO2)
 	PIN_FUNC_SELECT(PERIPHS_IO_MUX_GPIO2_U, FUNC_U1TXD_BK);

user/user_main.c

@@ -74,12 +74,12 @@ static void ICACHE_FLASH_ATTR prHeapTimerCb(void *arg)
 	if (diff == 0) {
 		if (cnt == 5) {
 			// only every 5 secs if no change
-			dbg("Rx: %2d%c, Tx: %2d%c, Hp: %d", rxp, '%', txp, '%', heap);
+			dbg("Rx/Tx: %d/%d%c, Hp: %d", rxp, txp, '%', heap);
 			cnt = 0;
 		}
 	} else {
 		// report change
-		dbg("Rx: %2d%c, Tx: %2d%c, Hp: %d (%s%d)", rxp, '%', txp, '%', heap, cc, diff);
+		dbg("Rx/Tx: %d/%d%c, Hp: %d (%s%d)", rxp, txp, '%', heap, cc, diff);
 		cnt = 0;
 	}
 
@@ -104,14 +104,22 @@ void ICACHE_FLASH_ATTR user_init(void)
 	wifi_station_set_auto_connect(false);
 	wifi_set_opmode(NULL_MODE); // saves to flash if changed - this might avoid the current spike on startup?
 
-	printf("\r\n");
+	u8 mac[6];
-	banner("====== ESPTerm ======");
+	wifi_get_macaddr(SOFTAP_IF, mac);
-	banner_info("Firmware (c) Ondrej Hruska, 2017");
+
-	banner_info(TERMINAL_GITHUB_REPO);
+	banner_gap();
-	banner_info("");
+	banner("================ ESPTerm ================");
-	banner_info("Version "FIRMWARE_VERSION",");
+	banner_info();
-	banner_info("built " __DATE__ " at " __TIME__ " " __TIMEZONE__);
+	banner_info("Project by Ondrej Hruska, 2017");
-	printf("\r\n");
+	banner_info();
+	banner_info(TERMINAL_GITHUB_REPO_NOPROTO);
+	banner_info();
+	banner_info("Version "FW_VERSION" ("ESP_LANG"), code name "FW_CODENAME_QUOTED);
+	banner_info(" back-end #"GIT_HASH_BACKEND" front-end #"GIT_HASH_FRONTEND);
+	banner_info(" built "__DATE__" at "__TIME__" "__TIMEZONE__);
+	banner_info();
+	banner_info("Device ID: %02X%02X%02X", mac[3], mac[4], mac[5]);
+	banner_gap();
 
 	ioInit();
 
@@ -123,11 +131,6 @@ void ICACHE_FLASH_ATTR user_init(void)
 	espFsInit((void *) (webpages_espfs_start));
 #endif
 
-#if DEBUG_HEAP
-	// Heap use timer & blink
-	TIMER_START(&prHeapTimer, prHeapTimerCb, HEAP_TIMER_MS, 1);
-#endif
-
 	// do later (some functions do not work if called from user_init)
 	TIMER_START(&userStartTimer, user_start, 10, 0);
 }
@@ -139,13 +142,18 @@ static void ICACHE_FLASH_ATTR user_start(void *unused)
 
 	captdnsInit();
 	httpdInit(routes, 80);
-	httpdSetName("ESPTerm " FIRMWARE_VERSION);
+	httpdSetName("ESPTerm " VERSION_STRING);
 
 	ansi_parser_inhibit = false;
 
 	// Print the CANCEL character to indicate the module has restarted
 	// Critically important for client application if any kind of screen persistence / content re-use is needed
 	UART_WriteChar(UART0, CAN, UART_TIMEOUT_US); // 0x18 - 24 - CAN
+
+#if DEBUG_HEAP
+	// Heap use timer & blink
+	TIMER_START(&prHeapTimer, prHeapTimerCb, HEAP_TIMER_MS, 1);
+#endif
 }
 
 // ---- unused funcs removed from sdk to save space ---

user/version.h

@@ -5,16 +5,25 @@
 #ifndef ESP_VT100_FIRMWARE_VERSION_H
 #define ESP_VT100_FIRMWARE_VERSION_H
 
-#include "helpers.h"
+#define STR_HELPER(x) #x
+#define STR(x) STR_HELPER(x)
 
 #define FW_V_MAJOR 2
 #define FW_V_MINOR 1
 #define FW_V_PATCH 0
+#define FW_V_SUFFIX ""
 #define FW_CODENAME "Anthill" // 2.1.0
+#define FW_CODENAME_QUOTED "\""FW_CODENAME"\""
+
+#define FW_VERSION STR(FW_V_MAJOR) "." STR(FW_V_MINOR) "." STR(FW_V_PATCH) FW_V_SUFFIX
+
+#define VERSION_STRING FW_VERSION " " FW_CODENAME_QUOTED
 
-#define FIRMWARE_VERSION STR(FW_V_MAJOR) "." STR(FW_V_MINOR) "." STR(FW_V_PATCH) " \"" FW_CODENAME "\""
 #define FIRMWARE_VERSION_NUM (FW_V_MAJOR*1000 + FW_V_MINOR*10 + FW_V_PATCH) // this is used in ID queries
-#define TERMINAL_GITHUB_REPO "https://github.com/espterm/espterm-firmware"
+
+#define TERMINAL_GITHUB_REPO_NOPROTO "github.com/espterm/espterm-firmware"
+#define TERMINAL_GITHUB_REPO "https://"TERMINAL_GITHUB_REPO_NOPROTO
+
 #define TERMINAL_GITHUB_REPO_FRONT "https://github.com/espterm/espterm-front-end"
 
 #endif //ESP_VT100_FIRMWARE_VERSION_H

user/wifimgr.c

@@ -8,6 +8,22 @@
 WiFiConfigBundle * const wificonf = &persist.current.wificonf;
 WiFiConfChangeFlags wifi_change_flags;
 
+int ICACHE_FLASH_ATTR getStaIpAsString(char *buffer)
+{
+	WIFI_MODE x = wifi_get_opmode();
+	STATION_STATUS connectStatus = wifi_station_get_connect_status();
+
+	if (x == SOFTAP_MODE || connectStatus != STATION_GOT_IP || wificonf->opmode == SOFTAP_MODE) {
+		strcpy(buffer, "");
+		return 0;
+	}
+	else {
+		struct ip_info info;
+		wifi_get_ip_info(STATION_IF, &info);
+		return sprintf(buffer, IPSTR, GOOD_IP2STR(info.ip.addr));
+	}
+}
+
 /**
  * Restore defaults in the WiFi config block.
  * This is to be called if the WiFi config is corrupted on startup,

user/wifimgr.h

@@ -60,6 +60,8 @@ void wifimgr_restore_defaults(void);
 
 void wifimgr_apply_settings(void);
 
+int getStaIpAsString(char *buffer);
+
 #if DEBUG_WIFI
 #define wifi_warn warn
 #define wifi_dbg dbg