Add support for automatic character delays after \n.

Author: David Betz

Makefile

@@ -178,7 +178,6 @@ INCDIR	:= $(addprefix -I,$(SRC_DIR))
 EXTRA_INCDIR	:= $(addprefix -I,$(EXTRA_INCDIR))
 MODULE_INCDIR	:= $(addsuffix /include,$(INCDIR))
 
-ESP_FLASH_SIZE_IX=$(call maplookup,$(ESP_SPI_FLASH_SIZE_K),512:0 1024:2 2048:5 4096:4)
 ESPTOOL_FREQ=$(call maplookup,$(ESP_FLASH_FREQ_DIV),0:40m 1:26m 2:20m 0xf:80m 15:80m)
 ESPTOOL_MODE=$(call maplookup,$(ESP_FLASH_MODE),0:qio 1:qout 2:dio 3:dout)
 ESPTOOL_SIZE=$(call maplookup,$(ESP_SPI_FLASH_SIZE_K),512:4m 256:2m 1024:8m 2048:16m 4096:32m)

html/wifi/wifi.html

@@ -71,23 +71,25 @@
       xhr.send();
     }
 
-    window.onload=function(e) {
-      patchSetting("module-name");
+    function refreshData() {
+      patchSetting("station-ipaddr");
+      patchSetting("station-macaddr");
+      patchSetting("softap-ipaddr");
+      patchSetting("softap-macaddr");
+    };
 
+    window.onload = function (e) {
+      patchSetting("module-name");
       wifiModeCtl = document.getElementById("wifi-mode");
       var wifiMode = getSetting("wifi-mode");
       for (var i = 0; i < wifiModeCtl.length; ++i)
         if (wifiMode == wifiModeCtl[i].value) {
           wifiModeCtl.selectedIndex = i;
           break;
         }
-
-      patchSetting("station-ipaddr");
-      patchSetting("station-macaddr");
-      patchSetting("softap-ipaddr");
-      patchSetting("softap-macaddr");
+      refreshData();
       updateNetworkList(wifiMode);
-    };
+    }
 
   function getSetting(name) {
     var req = new XMLHttpRequest();
@@ -129,11 +131,11 @@
 
   function on_wifiModeChanged() {
     var newMode = wifiModeCtl[wifiModeCtl.selectedIndex].value;
-    setSetting("wifi-mode", newMode);
-//    var req = new XMLHttpRequest();
-//    var url = '/wifi/setmode.cgi?mode=' + encodeURIComponent(newMode);
-//    req.open('GET', url, false);
-//    req.send();
+    var req = new XMLHttpRequest();
+    var url = '/wifi/setmode.cgi?mode=' + encodeURIComponent(newMode);
+    req.open('POST', url, false);
+    req.send();
+    refreshData();
     updateNetworkList(newMode);
   }
 

parallax/sscp.c

@@ -229,20 +229,32 @@ static void ICACHE_FLASH_ATTR sendToMCU(int prefix, char *fmt, va_list ap)
     buf[2 + cnt] = '\r';
     cnt += 3;
 
+    // handle inserting pauses after certain characters
     if (flashConfig.sscp_pause_time_ms > 0) {
         char *p = buf;
         while (--cnt >= 0) {
+            int needPause = 0;
             int byte = *p++;
-            int i;
             uart_tx_one_char(UART0, byte);
-            for (i = 0; i < flashConfig.sscp_need_pause_cnt; ++i) {
-                if (byte == flashConfig.sscp_need_pause[i]) {
-                    uart_drain_tx_buffer(UART0);
-                    os_delay_us(flashConfig.sscp_pause_time_ms * 1000);
+            if (byte == '\r')
+                needPause = 1;
+            else {
+                int i;
+                for (i = 0; i < flashConfig.sscp_need_pause_cnt; ++i) {
+                    if (byte == flashConfig.sscp_need_pause[i]) {
+                        needPause = 1;
+                        break;
+                    }
                 }
             }
+            if (needPause) {
+                uart_drain_tx_buffer(UART0);
+                os_delay_us(flashConfig.sscp_pause_time_ms * 1000);
+            }
         }
     }
+
+    // no pauses after characters needed
     else {
         uart_tx_buffer(UART0, buf, cnt);
     }

parallax/user_main.c

@@ -201,7 +201,7 @@ void ICACHE_FLASH_ATTR user_init(void) {
     if (!(restoreOk = configRestore()))
         configSave();
 
-	captdnsInit();
+    captdnsInit();
 
     // init UART
     uart_init(flashConfig.baud_rate, 115200);