From c22ae3469f848b1b20dbcada97e96588f136a0c6 Mon Sep 17 00:00:00 2001
From: Jeroen Domburg <jeroen@spritesmods.com>
Date: Tue, 14 Oct 2014 22:40:02 +0200
Subject: [PATCH] Added webcounter to initial page

---
 html/{index.html => index.tpl} |  3 ++-
 user/cgi.c                     | 12 ++++++++++++
 user/cgi.h                     |  1 +
 user/cgiwifi.c                 |  5 ++++-
 user/espfs.c                   |  6 +++---
 user/httpd.c                   |  4 ++--
 user/user_main.c               |  3 ++-
 7 files changed, 26 insertions(+), 8 deletions(-)
 rename html/{index.html => index.tpl} (91%)

diff --git a/html/index.html b/html/index.tpl
similarity index 91%
rename from html/index.html
rename to html/index.tpl
index feab1f5..4310cb3 100644
--- a/html/index.html
+++ b/html/index.tpl
@@ -6,7 +6,8 @@
 <div id="main">
 <h1>It Works</h1>
 <p>
-If you see this, it means the tiny li'l website in your ESP8266 does actually work.
+If you see this, it means the tiny li'l website in your ESP8266 does actually work. Fyi, this page has
+been loaded <b>%counter%</b> times.
 <ul>
 <li>If you haven't connected this device to your WLAN network now, you can <a href="/wifi">do so.</a></li>
 <li>You can also control the <a href="led.tpl">LED</a>.</li>
diff --git a/user/cgi.c b/user/cgi.c
index 70ba86e..384bde4 100644
--- a/user/cgi.c
+++ b/user/cgi.c
@@ -62,7 +62,19 @@ void ICACHE_FLASH_ATTR tplLed(HttpdConnData *connData, char *token, void **arg)
 	espconn_sent(connData->conn, (uint8 *)buff, os_strlen(buff));
 }
 
+static long hitCounter=0;
 
+//Template code for the counter on the index page.
+void ICACHE_FLASH_ATTR tplCounter(HttpdConnData *connData, char *token, void **arg) {
+	char buff[128];
+	if (token==NULL) return;
+
+	if (os_strcmp(token, "counter")==0) {
+		hitCounter++;
+		os_sprintf(buff, "%ld", hitCounter);
+	}
+	espconn_sent(connData->conn, (uint8 *)buff, os_strlen(buff));
+}
 
 
 //Cgi that reads the SPI flash. Assumes 512KByte flash.
diff --git a/user/cgi.h b/user/cgi.h
index 07431a6..6dbf923 100644
--- a/user/cgi.h
+++ b/user/cgi.h
@@ -6,5 +6,6 @@
 int cgiLed(HttpdConnData *connData);
 void tplLed(HttpdConnData *connData, char *token, void **arg);
 int cgiReadFlash(HttpdConnData *connData);
+void tplCounter(HttpdConnData *connData, char *token, void **arg);
 
 #endif
\ No newline at end of file
diff --git a/user/cgiwifi.c b/user/cgiwifi.c
index 36529b6..a6bba43 100644
--- a/user/cgiwifi.c
+++ b/user/cgiwifi.c
@@ -184,10 +184,13 @@ int ICACHE_FLASH_ATTR cgiWiFiConnect(HttpdConnData *connData) {
 	//Schedule disconnect/connect
 	os_timer_disarm(&reassTimer);
 	os_timer_setfn(&reassTimer, reassTimerCb, NULL);
+#if 0
 	os_timer_arm(&reassTimer, 1000, 0);
 
 	httpdRedirect(connData, "connecting.html");
-
+#else
+	httpdRedirect(connData, "/wifi");
+#endif
 	return HTTPD_CGI_DONE;
 }
 
diff --git a/user/espfs.c b/user/espfs.c
index 08f1d1e..59f8643 100644
--- a/user/espfs.c
+++ b/user/espfs.c
@@ -125,8 +125,8 @@ EspFsFile ICACHE_FLASH_ATTR *espFsOpen(char *fileName) {
 		//Grab the name of the file.
 		p+=sizeof(EspFsHeader); 
 		os_memcpy(namebuf, p, sizeof(namebuf));
-		os_printf("Found file '%s'. Namelen=%x fileLenComp=%x, compr=%d flags=%d\n", 
-				namebuf, (unsigned int)h.nameLen, (unsigned int)h.fileLenComp, h.compression, h.flags);
+//		os_printf("Found file '%s'. Namelen=%x fileLenComp=%x, compr=%d flags=%d\n", 
+//				namebuf, (unsigned int)h.nameLen, (unsigned int)h.fileLenComp, h.compression, h.flags);
 		if (os_strcmp(namebuf, fileName)==0) {
 			//Yay, this is the file we need!
 			p+=h.nameLen; //Skip to content.
@@ -174,7 +174,7 @@ int ICACHE_FLASH_ATTR espFsRead(EspFsFile *fh, char *buff, int len) {
 		int toRead;
 		toRead=flen-(fh->posComp-fh->posStart);
 		if (len>toRead) len=toRead;
-		os_printf("Reading %d bytes from %x\n", len, (unsigned int)fh->posComp);
+//		os_printf("Reading %d bytes from %x\n", len, (unsigned int)fh->posComp);
 		memcpyAligned(buff, fh->posComp, len);
 		fh->posDecomp+=len;
 		fh->posComp+=len;
diff --git a/user/httpd.c b/user/httpd.c
index 2a29f66..49545ec 100644
--- a/user/httpd.c
+++ b/user/httpd.c
@@ -199,7 +199,7 @@ int ICACHE_FLASH_ATTR cgiRedirect(HttpdConnData *connData) {
 static void ICACHE_FLASH_ATTR httpdSentCb(void *arg) {
 	int r;
 	HttpdConnData *conn=httpdFindConnData(arg);
-	os_printf("Sent callback on conn %p\n", conn);
+//	os_printf("Sent callback on conn %p\n", conn);
 	if (conn==NULL) return;
 	if (conn->cgi==NULL) { //Marked for destruction?
 		os_printf("Conn %p is done. Closing.\n", conn->conn);
@@ -243,7 +243,7 @@ static void ICACHE_FLASH_ATTR httpdSendResp(HttpdConnData *conn) {
 
 static void ICACHE_FLASH_ATTR httpdParseHeader(char *h, HttpdConnData *conn) {
 	int i;
-	os_printf("Got header %s\n", h);
+//	os_printf("Got header %s\n", h);
 	if (os_strncmp(h, "GET ", 4)==0 || os_strncmp(h, "POST ", 5)==0) {
 		char *e;
 		
diff --git a/user/user_main.c b/user/user_main.c
index be273ff..abb9476 100644
--- a/user/user_main.c
+++ b/user/user_main.c
@@ -21,9 +21,10 @@
 #include "stdout.h"
 
 HttpdBuiltInUrl builtInUrls[]={
-	{"/", cgiRedirect, "/index.html"},
+	{"/", cgiRedirect, "/index.tpl"},
 	{"/flash.bin", cgiReadFlash, NULL},
 	{"/led.tpl", cgiEspFsTemplate, tplLed},
+	{"/index.tpl", cgiEspFsTemplate, tplCounter},
 	{"/led.cgi", cgiLed, NULL},
 
 	//Routines to make the /wifi URL and everything beneath it work.