working genpage

esp_meas.pro

@@ -3,7 +3,7 @@ CONFIG += console
 CONFIG -= app_bundle
 CONFIG -= qt
 
-DEFINES =
+DEFINES = ESPFS_HEATSHRINK
 
 INCLUDEPATH = . \
 	esp_iot_sdk_v1.5.2/include \
@@ -48,7 +48,7 @@ SOURCES += \
 	sbmp/sbmp_frame.c \
 	sbmp/sbmp_session.c \
 	user/datalink.c \
-    user/serial.c
+	user/serial.c
 
 HEADERS += \
 	include/uart_hw.h \
@@ -118,7 +118,7 @@ HEADERS += \
 	sbmp/sbmp_logging.h \
 	sbmp/sbmp_session.h \
 	user/datalink.h \
-    user/serial.h
+	user/serial.h
 
 DISTFILES += \
 	style.astylerc \

esp_meas.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.6.0, 2016-03-17T11:48:45. -->
+<!-- Written by QtCreator 3.6.0, 2016-03-17T20:40:21. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -106,7 +106,9 @@
     </valuemap>
     <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
     <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
-    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges">
+     <value type="QString">PATH=/usr/lib/qt/bin:/usr/bin:/home/ondra/GNUstep/Tools:/usr/local/sbin:/usr/local/bin:/usr/bin:/opt/android-sdk/platform-tools:/usr/lib/jvm/default/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:/home/ondra/devel/esp/sdk/esp-open-sdk/xtensa-lx106-elf/bin</value>
+    </valuelist>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>

html/index.tpl

@@ -10,6 +10,7 @@
 <nav>
 <ul>
 <li><a href="/wifi">WiFi setup</a>
+<li><a href="/random.tpl">Random numbers</a>
 </ul>
 
 <hr>

htmlpreview.sh

@@ -8,3 +8,5 @@ for file in $(find html_preview/ -name "*.tpl")
 do 
   mv $file `echo $file | sed s/.tpl$/.html/`
 done
+
+echo "Html preview updated."

libesphttpd/include/esp8266.h

@@ -24,6 +24,9 @@
 
 #define FLASH_FN ICACHE_FLASH_ATTR
 
+// this ideally would allow flash arrays, but alas works only for uint32_t
+#define FLASH_DATA ICACHE_RODATA_ATTR STORE_ATTR
+
 #include "platform.h"
 #include "espmissingincludes.h"
 #include "esp_sdk_ver.h"

sbmp/crc32.c

@@ -66,7 +66,7 @@
 /*     hardware you could probably optimize the shift in assembler by  */
 /*     using byte-swap instructions.                                   */
 
-static uint32_t ICACHE_RODATA_ATTR STORE_ATTR crc_32_tab[] = { /* CRC polynomial 0xedb88320 */
+static uint32_t FLASH_DATA crc_32_tab[] = { /* CRC polynomial 0xedb88320 */
 	0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
 	0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
 	0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,

user/cgi.c

@@ -6,9 +6,9 @@ flash as a binary. Also handles the hit counter on the main page.
 /*
  * ----------------------------------------------------------------------------
  * "THE BEER-WARE LICENSE" (Revision 42):
- * Jeroen Domburg <jeroen@spritesmods.com> wrote this file. As long as you retain 
+ * Jeroen Domburg <jeroen@spritesmods.com> wrote this file. As long as you retain
- * this notice you can do whatever you want with this stuff. If we meet some day, 
+ * this notice you can do whatever you want with this stuff. If we meet some day,
- * and you think this stuff is worth it, you can buy me a beer in return. 
+ * and you think this stuff is worth it, you can buy me a beer in return.
  * ----------------------------------------------------------------------------
  */
 
@@ -16,14 +16,15 @@ flash as a binary. Also handles the hit counter on the main page.
 #include <esp8266.h>
 #include "cgi.h"
 
-static long hitCounter=0;
+static long hitCounter = 0;
 
 //Template code for the counter on the index page.
-int ICACHE_FLASH_ATTR tplCounter(HttpdConnData *connData, char *token, void **arg) {
+int ICACHE_FLASH_ATTR tplCounter(HttpdConnData *connData, char *token, void **arg)
+{
 	char buff[128];
-	if (token==NULL) return HTTPD_CGI_DONE;
+	if (token == NULL) return HTTPD_CGI_DONE;
 
-	if (os_strcmp(token, "counter")==0) {
+	if (os_strcmp(token, "counter") == 0) {
 		hitCounter++;
 		os_sprintf(buff, "%ld", hitCounter);
 	}
@@ -31,3 +32,79 @@ int ICACHE_FLASH_ATTR tplCounter(HttpdConnData *connData, char *token, void **ar
 	return HTTPD_CGI_DONE;
 }
 
+
+typedef struct {
+	uint32_t count_remain;
+} RandomNumberState;
+
+
+// better to put it in the fs...
+
+int FLASH_FN cgiRandomNumbers(HttpdConnData *connData) {
+	RandomNumberState *rns=connData->cgiData;
+	char buff[128];
+
+	if (connData->conn == NULL) {
+		//Connection aborted. Clean up.
+		if (rns != NULL) free(rns);
+		return HTTPD_CGI_DONE;
+	}
+
+	if (rns == NULL) {
+		//First call to this cgi. Open the file so we can read it.
+		rns=(RandomNumberState *)malloc(sizeof(RandomNumberState));
+		connData->cgiData=rns;
+
+		// parse count
+		uint32_t count = 1;
+		int len = httpdFindArg(connData->getArgs, "count", buff, sizeof(buff));
+		if (len==-1) {
+			// no such get arg
+		} else {
+			count = (uint32_t)atoi(buff);
+		}
+		rns->count_remain = count;
+
+		printf("User wants %d numbers.", count);
+
+		httpdStartResponse(connData, 200);
+		httpdHeader(connData, "Content-Type", "text/html");
+		httpdEndHeaders(connData);
+
+		// start the page
+
+		httpdSend(connData, "<!DOCTYPE html>"
+							"<html>"
+							"<head>"
+							"	<title>Generated page.</title>"
+							"	<link rel=\"stylesheet\" type=\"text/css\" href=\"style.css\">"
+							"</head>"
+							"<body>"
+							"<div id=\"main\">"
+							"<h1>Random numbers:</h1>"
+							"<ul>", -1);
+
+		return HTTPD_CGI_MORE;
+	}
+
+	// send end of the page
+	if (rns->count_remain == 0) {
+		httpdSend(connData, "</ul></body></html>", -1);
+
+		free(rns);
+		return HTTPD_CGI_DONE;
+	}
+
+
+	// print chunk of data
+	for (int i = 0; i < 100; i++) {
+		os_sprintf(buff, "<li>%lu\n", os_random());
+		httpdSend(connData, buff, -1);
+
+		if (--rns->count_remain == 0) {
+			break;
+		}
+	}
+
+	return HTTPD_CGI_MORE;
+}

user/cgi.h

@@ -6,4 +6,6 @@
 
 int tplCounter(HttpdConnData *connData, char *token, void **arg);
 
+int cgiRandomNumbers(HttpdConnData *connData);
+
 #endif

user/user_main.c

@@ -98,9 +98,11 @@ CgiUploadFlashDef uploadParams = {
  * should be placed above the URLs they protect.
  */
 static HttpdBuiltInUrl builtInUrls[] = {
-	{"*", cgiRedirectApClientToHostname, "esp8266.nonet"},
+	{"*", cgiRedirectApClientToHostname, "esp8266.nonet"}, // redirect func for the captive portal
 	{"/", cgiEspFsTemplate, (void *)tplCounter},
 
+	{"/random.tpl", cgiRandomNumbers, NULL},
+
 //Enable the line below to protect the WiFi configuration with an username/password combo.
 //  {"/wifi/*", authBasic, (void *)myPassFn},