Merge pull request #262 from schneemaier/patch-1

Update flash.sh

front-end

@@ -1 +1 @@
-Subproject commit f729d91651fda22ebdd94d41ebc7e0aa47a2c2e6
+Subproject commit 9aae724df2ce60a144eb9f170bb09bdbd02297df

rel-tpl/flash.sh

@@ -18,8 +18,8 @@ if [ -z ${ESPTOOL} ]; then
 	fi
 fi
 
-[ -z ESPPORT ] && ESPPORT=/dev/ttyUSB0
+[ -z ${ESPPORT} ] && ESPPORT=/dev/ttyUSB0
-[ -z ESPBAUD ] && ESPBAUD=460800
+[ -z ${ESPBAUD} ] && ESPBAUD=460800
 
 set -x
 ${ESPTOOL} --port ${ESPPORT} --baud ${ESPBAUD} \

user/cgi_system.c

@@ -10,7 +10,8 @@
 #include "cgi_logging.h"
 
 #define SET_REDIR_SUC "/cfg/system"
-#define SET_REDIR_ERR SET_REDIR_SUC"?err="
+
+void buildInputsJson(char *buff);
 
 static ETSTimer tmr;
 
@@ -82,7 +83,18 @@ cgiSystemCfgSetParams(HttpdConnData *connData)
 	char redir_url_buf[100];
 
 	char *redir_url = redir_url_buf;
-	redir_url += sprintf(redir_url, SET_REDIR_ERR);
+
+	if (GET_ARG("redir")) {
+		strncpy(redir_url, buff, 40);
+		u32 len = strlen(buff);
+		if (len > 40) len = 40;
+		redir_url += len;
+	} else {
+		redir_url += sprintf(redir_url, SET_REDIR_SUC);
+	}
+	char *end_of_redir_url = redir_url;
+	redir_url += sprintf(redir_url, "?err=");
+	char *end_of_failed_redir_url = redir_url;
 	// we'll test if anything was printed by looking for \0 in failed_keys_buf
 
 	if (connData->conn == NULL) {
@@ -174,14 +186,16 @@ cgiSystemCfgSetParams(HttpdConnData *connData)
 	(void)redir_url;
 	(void)uart_changed; // unused
 
-	if (redir_url_buf[strlen(SET_REDIR_ERR)] == 0) {
+	if (*end_of_failed_redir_url == '\0') {
 		// All was OK
 		cgi_info("Set system params - success, saving...");
 
 		sysconf_apply_settings();
 		persist_store();
 
-		httpdRedirect(connData, SET_REDIR_SUC "?msg=Settings%20saved%20and%20applied.");
+		strcpy(end_of_redir_url, "?msg=Settings%20saved%20and%20applied.");
+
+		httpdRedirect(connData, redir_url_buf);
 	} else {
 		cgi_warn("Some settings did not validate, asking for correction");
 
@@ -198,39 +212,54 @@ cgiSystemCfgSetParams(HttpdConnData *connData)
 	return HTTPD_CGI_DONE;
 }
 
-
+static void tplSystemCfgFill(char *token, char *buff)
-httpd_cgi_state ICACHE_FLASH_ATTR
-tplSystemCfg(HttpdConnData *connData, char *token, void **arg)
 {
-#define BUFLEN 100
+    buff[0] = '\0';
-	char buff[BUFLEN];
-
-	if (token == NULL) {
-		// We're done
-		return HTTPD_CGI_DONE;
-	}
-
-	strcpy(buff, ""); // fallback
 
     const bool admin = false;
     const bool tpl=true;
 
 #define XSTRUCT sysconf
-#define X XGET_CGI_FUNC
+#define X XGET_CGI_FUNC_RETURN
     XTABLE_SYSCONF
 #undef X
 #undef XSTRUCT
 
     if (streq(token, "def_access_name")) {
         sprintf(buff, "%s", DEF_ACCESS_NAME);
+        return;
     }
-	else if (streq(token, "def_access_pw")) {
+
+    if (streq(token, "def_access_pw")) {
         sprintf(buff, "%s", DEF_ACCESS_PW);
+        return;
     }
-	else if (streq(token, "def_admin_pw")) {
+
+    if (streq(token, "def_admin_pw")) {
         sprintf(buff, "%s", DEFAULT_ADMIN_PW);
+        return;
+    }
+
+    if (streq(token, "gpio_initial")) {
+        buildInputsJson(buff);
+        return;
+    }
+}
+
+
+httpd_cgi_state ICACHE_FLASH_ATTR
+tplSystemCfg(HttpdConnData *connData, char *token, void **arg)
+{
+#define BUFLEN 100
+	char buff[BUFLEN];
+
+	if (token == NULL) {
+		// We're done
+		return HTTPD_CGI_DONE;
 	}
 
+    tplSystemCfgFill(token, buff);
+
 	tplSend(connData, buff, -1);
 	return HTTPD_CGI_DONE;
 }
@@ -247,6 +276,19 @@ static void ICACHE_FLASH_ATTR tmrPulseCb(void *arg)
 	gpio_output_set(set_off, set_on, 0, 0); // the args are swapped here to achieve the opposite
 }
 
+
+void ICACHE_FLASH_ATTR
+buildInputsJson(char *buff)
+{
+    u32 inputs = gpio_input_get();
+
+    sprintf(buff, "{\"io2\":%d,\"io4\":%d,\"io5\":%d}",
+            ((inputs&(1<<2)) != 0),
+            ((inputs&(1<<4)) != 0),
+            ((inputs&(1<<5)) != 0)
+    );
+}
+
 /**
  * API to set GPIOs
  *
@@ -255,8 +297,7 @@ static void ICACHE_FLASH_ATTR tmrPulseCb(void *arg)
  */
 httpd_cgi_state ICACHE_FLASH_ATTR cgiGPIO(HttpdConnData *connData)
 {
-#define BUFLEN 100
+	char buff[32];
-	char buff[BUFLEN];
 
 	if (connData->conn==NULL) {
 		//Connection aborted. Clean up.
@@ -266,16 +307,14 @@ httpd_cgi_state ICACHE_FLASH_ATTR cgiGPIO(HttpdConnData *connData)
 	bool set = 0;
 	u32 inputs = gpio_input_get();
 
-	// TODO pulse option
+	// args are do2, do4, do5, pulse. Values: 0 - off, 1 - on, t - toggle. pulse is in ms
-
-	// args are do2, do4, do5. Values: 0 - off, 1 - on, -1 - toggle
 
 	s8 set_d2 = -1, set_d4 = -1, set_d5 = -1;
 
 	if (sysconf->gpio2_conf == GPIOCONF_OUT_START_0 || sysconf->gpio2_conf == GPIOCONF_OUT_START_1) {
 		if (GET_ARG("do2")) {
 			if (buff[0] == 't') {
-				set = ((inputs&(1<<2)) == 0);
+				set = ((inputs & (1<<2)) == 0);
 			} else {
 				set = buff[0] == '1';
 			}
@@ -287,7 +326,7 @@ httpd_cgi_state ICACHE_FLASH_ATTR cgiGPIO(HttpdConnData *connData)
 	if (sysconf->gpio4_conf == GPIOCONF_OUT_START_0 || sysconf->gpio4_conf == GPIOCONF_OUT_START_1) {
 		if (GET_ARG("do4")) {
 			if (buff[0] == 't') {
-				set = ((inputs&(1<<4)) == 0);
+				set = ((inputs & (1<<4)) == 0);
 			} else {
 				set = buff[0] == '1';
 			}
@@ -299,7 +338,7 @@ httpd_cgi_state ICACHE_FLASH_ATTR cgiGPIO(HttpdConnData *connData)
 	if (sysconf->gpio5_conf == GPIOCONF_OUT_START_0 || sysconf->gpio5_conf == GPIOCONF_OUT_START_1) {
 		if (GET_ARG("do5")) {
 			if (buff[0] == 't') {
-				set = ((inputs&(1<<5)) == 0);
+				set = ((inputs & (1<<5)) == 0);
 			} else {
 				set = buff[0] == '1';
 			}
@@ -314,27 +353,15 @@ httpd_cgi_state ICACHE_FLASH_ATTR cgiGPIO(HttpdConnData *connData)
 		if (duration > 0) {
 			u32 cmd = 0;
 			if (set_d2 != -1) {
-				if (set_d2) {
+				if (set_d2) { cmd |= 1<<2; } else { cmd |= 1<<(16+2); }
-					cmd |= 1<<2;
-				} else {
-					cmd |= 1<<(16+2);
-				}
 			}
 
 			if (set_d4 != -1) {
-				if (set_d4) {
+				if (set_d4) { cmd |= 1<<4; } else { cmd |= 1<<(16+4); }
-					cmd |= 1<<4;
-				} else {
-					cmd |= 1<<(16+4);
-				}
 			}
 
 			if (set_d5 != -1) {
-				if (set_d5) {
+				if (set_d5) { cmd |= 1<<5; } else { cmd |= 1<<(16+5); }
-					cmd |= 1<<5;
-				} else {
-					cmd |= 1<<(16+5);
-				}
 			}
 
 			os_timer_disarm(&tmrPulse);
@@ -348,15 +375,15 @@ httpd_cgi_state ICACHE_FLASH_ATTR cgiGPIO(HttpdConnData *connData)
 	httpdEndHeaders(connData);
 
 	// refresh inputs
-	inputs = gpio_input_get();
+	buildInputsJson(buff);
-
-	sprintf(buff, "{\"io2\":%d,\"io4\":%d,\"io5\":%d}",
-			((inputs&(1<<2)) != 0),
-			((inputs&(1<<4)) != 0),
-			((inputs&(1<<5)) != 0)
-		);
-
 	httpdSend(connData, buff, -1);
 
 	return HTTPD_CGI_DONE;
 }
+
+/** "GPIO" page */
+httpd_cgi_state ICACHE_FLASH_ATTR
+tplGpio(HttpdConnData *connData, char *token, void **arg)
+{
+	return tplSystemCfg(connData, token, arg);
+}

user/cgi_system.h

@@ -10,5 +10,6 @@ httpd_cgi_state cgiSystemCfgSetParams(HttpdConnData *connData);
 httpd_cgi_state tplSystemCfg(HttpdConnData *connData, char *token, void **arg);
 httpd_cgi_state cgiResetScreen(HttpdConnData *connData);
 httpd_cgi_state cgiGPIO(HttpdConnData *connData);
+httpd_cgi_state tplGpio(HttpdConnData *connData, char *token, void **arg);
 
 #endif // CGI_PING_H

user/config_xmacros.h

@@ -88,6 +88,9 @@ enum xset_result xset_ustring(const char *name, u8 *field, const char *buff, con
 #define XGET_CGI_FUNC(type, name, suffix, deref, xget, xset, xsarg, xnotify, allow) \
 	if ((allow) && streq(token, #name)) xget(buff, deref XSTRUCT->name);
 
+#define XGET_CGI_FUNC_RETURN(type, name, suffix, deref, xget, xset, xsarg, xnotify, allow) \
+	if ((allow) && streq(token, #name)) { xget(buff, deref XSTRUCT->name); return; }
+
 #define XSTRUCT_FIELD(type, name, suffix, deref, xget, xset, xsarg, xnotify, allow) \
 	type name suffix;
 

user/routes.c

@@ -103,6 +103,7 @@ const HttpdBuiltInUrl routes[] ESP_CONST_DATA = {
 	ROUTE_TPL_FILE("/", tplScreen, "/term.tpl"),
 	ROUTE_TPL_FILE("/about/?", tplAbout, "/about.tpl"),
 	ROUTE_FILE("/help/?", "/help.html"),
+	ROUTE_TPL_FILE("/cfg/gpio/?", tplGpio, "/cfg_gpio.tpl"),
 
 	// --- Sockets ---
 	ROUTE_WS(URL_WS_UPDATE, updateSockConnect),

user/version.h

@@ -11,7 +11,7 @@
 #define FW_V_MAJOR 2
 #define FW_V_MINOR 4
 #define FW_V_PATCH 0
-#define FW_V_SUFFIX "-pre1"
+#define FW_V_SUFFIX "-pre2"
 #define FW_CODENAME "Damselfly"
 #define FW_CODENAME_QUOTED "\""FW_CODENAME"\""