From 24a6a0dfd390ffdc988f9d5bbe565b4493a715de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= <ondra@ondrovo.com>
Date: Sun, 6 Aug 2017 14:58:46 +0200
Subject: [PATCH] added git hash to version string

---
 CMakeLists.txt            | 1 +
 Makefile                  | 5 +++--
 html_orig/pages/about.php | 2 +-
 libesphttpd               | 2 +-
 user/cgi_main.c           | 2 +-
 user/user_main.h          | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee97acb..24555ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,6 +144,7 @@ add_definitions(
         -DICACHE_RODATA_ATTR=
         -DFLAG_GZIP=2
         -DADMIN_PASSWORD="asdf"
+        -DGIT_HASH="blabla"
         -DESPFS_HEATSHRINK)
 
 add_executable(esp_vt100_firmware ${SOURCE_FILES})
diff --git a/Makefile b/Makefile
index afc9439..71f6ada 100644
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,8 @@ LIBS += esphttpd
 # compiler flags using during compilation of source files
 CFLAGS		= -Os -ggdb -std=gnu99 -Werror -Wpointer-arith -Wundef -Wall -Wl,-EL -fno-inline-functions \
 		-nostdlib -mlongcalls -mtext-section-literals  -D__ets__ -DICACHE_FLASH \
-		-Wno-address -Wno-unused -DHTTPD_MAX_BACKLOG_SIZE=4096 -DADMIN_PASSWORD=$(ADMIN_PASSWORD)
+		-Wno-address -Wno-unused -DHTTPD_MAX_BACKLOG_SIZE=4096 -DADMIN_PASSWORD=$(ADMIN_PASSWORD) \
+		-DGIT_HASH='"$(shell git rev-parse --short HEAD)"'
 
 # linker flags used to generate the main object file
 LDFLAGS		= -nostdlib -Wl,--no-check-sections -u call_user_start -Wl,-static
@@ -196,7 +197,7 @@ libesphttpd/Makefile:
 	$(Q) [[ -e "libesphttpd/Makefile" ]] || echo -e "\e[31mlibesphttpd submodule missing.\nIf build fails, run \"git submodule init\" and \"git submodule update\".\e[0m"
 
 libesphttpd: libesphttpd/Makefile
-	$(Q) make -C libesphttpd USE_OPENSDK=$(USE_OPENSDK)
+	$(Q) make -C libesphttpd USE_OPENSDK=$(USE_OPENSDK) SERVERNAME_PREFIX="ESPTerm "
 
 $(APP_AR): libesphttpd $(OBJ)
 	$(vecho) "AR $@"
diff --git a/html_orig/pages/about.php b/html_orig/pages/about.php
index 2708855..a40f181 100644
--- a/html_orig/pages/about.php
+++ b/html_orig/pages/about.php
@@ -20,7 +20,7 @@
 	<table>
 		<tr>
 			<th>ESPTerm</th>
-			<td>v%vers_fw%, build %date% at %time%</td>
+			<td>v%vers_fw%, built %date% at %time%</td>
 		</tr>
 		<tr>
 			<th>libesphttpd</th>
diff --git a/libesphttpd b/libesphttpd
index 61b5a25..b804b19 160000
--- a/libesphttpd
+++ b/libesphttpd
@@ -1 +1 @@
-Subproject commit 61b5a2592842048d7bb3e40b8e8da88e01665d2d
+Subproject commit b804b196fca6abf28a7e2b5bd482b76b49d518f7
diff --git a/user/cgi_main.c b/user/cgi_main.c
index 77bc636..3c03368 100644
--- a/user/cgi_main.c
+++ b/user/cgi_main.c
@@ -77,7 +77,7 @@ tplAbout(HttpdConnData *connData, char *token, void **arg)
 		tplSend(connData, __TIME__, -1);
 	}
 	else if (streq(token, "vers_httpd")) {
-		tplSend(connData, HTTPDVER, -1);
+		tplSend(connData, httpdGetVersion(), -1);
 	}
 	else if (streq(token, "vers_sdk")) {
 		tplSend(connData, STR(ESP_SDK_VERSION), -1);
diff --git a/user/user_main.h b/user/user_main.h
index 1a73c9d..4be00ad 100644
--- a/user/user_main.h
+++ b/user/user_main.h
@@ -1,7 +1,7 @@
 #ifndef USER_MAIN_H_H
 #define USER_MAIN_H_H
 
-#define FIRMWARE_VERSION "0.6.0-beta"
+#define FIRMWARE_VERSION "0.6.1+" GIT_HASH
 #define TERMINAL_GITHUB_REPO "https://github.com/MightyPork/esp-vt100-firmware"
 
 #endif //USER_MAIN_H_H