Merge branch 'master' into bugfix/urlparams

Author: igrr

cores/esp8266/core_esp8266_postmortem.c

@@ -27,12 +27,14 @@
 #include "user_interface.h"
 #include "esp8266_peri.h"
 #include "cont.h"
+#include "pgmspace.h"
 
 extern void __real_system_restart_local();
 extern void gdb_do_break();
 
 extern cont_t g_cont;
 
+// These will be pointers to PROGMEM const strings
 static const char* s_panic_file = 0;
 static int s_panic_line = 0;
 static const char* s_panic_func = 0;
@@ -55,6 +57,14 @@ extern void __custom_crash_callback( struct rst_info * rst_info, uint32_t stack,
 
 extern void custom_crash_callback( struct rst_info * rst_info, uint32_t stack, uint32_t stack_end ) __attribute__ ((weak, alias("__custom_crash_callback")));
 
+static void ets_puts_P(const char *romString) {
+    char c = pgm_read_byte(romString++);
+    while (c) {
+        ets_putc(c);
+        c = pgm_read_byte(romString++);
+    }
+}
+
 void __wrap_system_restart_local() {
     if (crash_for_gdb) *((int*)0) = 0;
     register uint32_t sp asm("a1");
@@ -71,17 +81,21 @@ void __wrap_system_restart_local() {
     ets_install_putc1(&uart_write_char_d);
 
     if (s_panic_line) {
-        ets_printf("\nPanic %s:%d %s\n", s_panic_file, s_panic_line, s_panic_func);
+        ets_puts_P(PSTR("\nPanic "));
+        ets_puts_P(s_panic_file);
+        ets_printf(":%d ", s_panic_line);
+        ets_puts_P(s_panic_func);
+        ets_puts_P(PSTR("\n"));
     }
     else if (s_abort_called) {
-        ets_printf("Abort called\n");
+        ets_puts_P(PSTR("Abort called\n"));
     }
     else if (rst_info.reason == REASON_EXCEPTION_RST) {
         ets_printf("\nException (%d):\nepc1=0x%08x epc2=0x%08x epc3=0x%08x excvaddr=0x%08x depc=0x%08x\n",
             rst_info.exccause, rst_info.epc1, rst_info.epc2, rst_info.epc3, rst_info.excvaddr, rst_info.depc);
     }
     else if (rst_info.reason == REASON_SOFT_WDT_RST) {
-        ets_printf("\nSoft WDT reset\n");
+        ets_puts_P(PSTR("\nSoft WDT reset\n"));
     }
 
     uint32_t cont_stack_start = (uint32_t) &(g_cont.stack);
@@ -103,11 +117,11 @@ void __wrap_system_restart_local() {
     }
 
     if (sp > cont_stack_start && sp < cont_stack_end) {
-        ets_printf("\nctx: cont \n");
+        ets_puts_P(PSTR("\nctx: cont \n"));
         stack_end = cont_stack_end;
     }
     else {
-        ets_printf("\nctx: sys \n");
+        ets_puts_P(("\nctx: sys \n"));
         stack_end = 0x3fffffb0;
         // it's actually 0x3ffffff0, but the stuff below ets_run
         // is likely not really relevant to the crash
@@ -126,7 +140,7 @@ void __wrap_system_restart_local() {
 
 
 static void print_stack(uint32_t start, uint32_t end) {
-    ets_printf("\n>>>stack>>>\n");
+    ets_puts_P(PSTR("\n>>>stack>>>\n"));
     for (uint32_t pos = start; pos < end; pos += 0x10) {
         uint32_t* values = (uint32_t*)(pos);
 
@@ -136,7 +150,7 @@ static void print_stack(uint32_t start, uint32_t end) {
         ets_printf("%08x:  %08x %08x %08x %08x %c\n",
             pos, values[0], values[1], values[2], values[3], (looksLikeStackFrame)?'<':' ');
     }
-    ets_printf("<<<stack<<<\n");
+    ets_puts_P(PSTR("<<<stack<<<\n"));
 }
 
 /*

cores/esp8266/umm_malloc/umm_malloc.c

@@ -493,6 +493,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <pgmspace.h>
 
 #include "umm_malloc.h"
 
@@ -512,6 +513,9 @@
 #  define DBG_LOG_LEVEL DBG_LOG_LEVEL
 #endif
 
+// Macro to place constant strings into PROGMEM and print them properly
+#define printf(fmt, ...)  do { static const char fstr[] PROGMEM = fmt; char rstr[sizeof(fmt)]; for (size_t i=0; i<sizeof(rstr); i++) rstr[i] = fstr[i]; printf(rstr, ##__VA_ARGS__); } while (0)
+
 /* -- dbglog {{{ */
 
 /* ----------------------------------------------------------------------------

libraries/ESP8266HTTPUpdateServer/src/ESP8266HTTPUpdateServer.cpp

@@ -12,7 +12,7 @@ static const char serverIndex[] PROGMEM =
                   <input type='file' name='update'>
                   <input type='submit' value='Update'>
                </form>
-         </body></html>\n)";
+         </body></html>)";
 static const char successResponse[] PROGMEM = 
   "<META http-equiv=\"refresh\" content=\"15;URL=\">Update Success! Rebooting...\n";
 

libraries/ESP8266WebServer/src/Parsing.cpp

@@ -91,7 +91,7 @@ bool ESP8266WebServer::_parseRequest(WiFiClient& client) {
   String searchStr = "";
   int hasSearch = url.indexOf('?');
   if (hasSearch != -1){
-    searchStr = urlDecode(url.substring(hasSearch + 1));
+    searchStr = url.substring(hasSearch + 1);
     url = url.substring(0, hasSearch);
   }
   _currentUri = url;
@@ -321,7 +321,7 @@ void ESP8266WebServer::_parseArguments(String data) {
     }
     RequestArgument& arg = _currentArgs[iarg];
     arg.key = data.substring(pos, equal_sign_index);
-	arg.value = data.substring(equal_sign_index + 1, next_arg_index);
+    arg.value = urlDecode(data.substring(equal_sign_index + 1, next_arg_index));
 #ifdef DEBUG_ESP_HTTP_SERVER
     DEBUG_OUTPUT.print("arg ");
     DEBUG_OUTPUT.print(iarg);

libraries/ESP8266WebServer/src/detail/RequestHandlersImpl.h

@@ -3,6 +3,32 @@
 
 #include "RequestHandler.h"
 
+// Table of extension->MIME strings stored in PROGMEM, needs to be global due to GCC section typing rules
+static const struct {const char endsWith[16]; const char mimeType[32];} mimeTable[] ICACHE_RODATA_ATTR = {
+    { ".html", "text/html" },
+    { ".htm", "text/html" },
+    { ".css", "text/css" },
+    { ".txt", "text/plain" },
+    { ".js", "application/javascript" },
+    { ".json", "application/json" },
+    { ".png", "image/png" },
+    { ".gif", "image/gif" },
+    { ".jpg", "image/jpeg" },
+    { ".ico", "image/x-icon" },
+    { ".svg", "image/svg+xml" },
+    { ".ttf", "application/x-font-ttf" },
+    { ".otf", "application/x-font-opentype" },
+    { ".woff", "application/font-woff" },
+    { ".woff2", "application/font-woff2" },
+    { ".eot", "application/vnd.ms-fontobject" },
+    { ".sfnt", "application/font-sfnt" },
+    { ".xml", "text/xml" },
+    { ".pdf", "application/pdf" },
+    { ".zip", "application/zip" },
+    { ".gz", "application/x-gzip" },
+    { ".appcache", "text/cache-manifest" },
+    { "", "application/octet-stream" } };
+
 class FunctionRequestHandler : public RequestHandler {
 public:
     FunctionRequestHandler(ESP8266WebServer::THandlerFunction fn, ESP8266WebServer::THandlerFunction ufn, const String &uri, HTTPMethod method)
@@ -116,29 +142,18 @@ class StaticRequestHandler : public RequestHandler {
     }
 
     static String getContentType(const String& path) {
-        if (path.endsWith(".html")) return "text/html";
-        else if (path.endsWith(".htm")) return "text/html";
-        else if (path.endsWith(".css")) return "text/css";
-        else if (path.endsWith(".txt")) return "text/plain";
-        else if (path.endsWith(".js")) return "application/javascript";
-        else if (path.endsWith(".json")) return "application/json";
-        else if (path.endsWith(".png")) return "image/png";
-        else if (path.endsWith(".gif")) return "image/gif";
-        else if (path.endsWith(".jpg")) return "image/jpeg";
-        else if (path.endsWith(".ico")) return "image/x-icon";
-        else if (path.endsWith(".svg")) return "image/svg+xml";
-        else if (path.endsWith(".ttf")) return "application/x-font-ttf";
-        else if (path.endsWith(".otf")) return "application/x-font-opentype";
-        else if (path.endsWith(".woff")) return "application/font-woff";
-        else if (path.endsWith(".woff2")) return "application/font-woff2";
-        else if (path.endsWith(".eot")) return "application/vnd.ms-fontobject";
-        else if (path.endsWith(".sfnt")) return "application/font-sfnt";
-        else if (path.endsWith(".xml")) return "text/xml";
-        else if (path.endsWith(".pdf")) return "application/pdf";
-        else if (path.endsWith(".zip")) return "application/zip";
-        else if(path.endsWith(".gz")) return "application/x-gzip";
-        else if (path.endsWith(".appcache")) return "text/cache-manifest";
-        return "application/octet-stream";
+        char buff[sizeof(mimeTable[0].mimeType)];
+        // Check all entries but last one for match, return if found
+        for (size_t i=0; i < sizeof(mimeTable)/sizeof(mimeTable[0])-1; i++) {
+            strcpy_P(buff, mimeTable[i].endsWith);
+            if (path.endsWith(buff)) {
+                strcpy_P(buff, mimeTable[i].mimeType);
+                return String(buff);
+            }
+        }
+        // Fall-through and just return default type
+        strcpy_P(buff, mimeTable[sizeof(mimeTable)/sizeof(mimeTable[0])-1].mimeType);
+        return String(buff);
     }
 
 protected:

libraries/ESP8266WiFi/src/WiFiClientSecure.cpp

@@ -657,53 +657,6 @@ extern "C" int __ax_get_file(const char *filename, uint8_t **buf)
 }
 extern "C" void ax_get_file() __attribute__ ((weak, alias("__ax_get_file")));
 
-
-#ifdef DEBUG_TLS_MEM
-#define DEBUG_TLS_MEM_PRINT(...) DEBUGV(__VA_ARGS__)
-#else
-#define DEBUG_TLS_MEM_PRINT(...)
-#endif
-
-extern "C" void* ax_port_malloc(size_t size, const char* file, int line)
-{
-    (void) file;
-    (void) line;
-    void* result = malloc(size);
-    if (result == nullptr) {
-        DEBUG_TLS_MEM_PRINT("%s:%d malloc %d failed, left %d\r\n", file, line, size, ESP.getFreeHeap());
-    }
-    if (size >= 1024) {
-        DEBUG_TLS_MEM_PRINT("%s:%d malloc %d, left %d\r\n", file, line, size, ESP.getFreeHeap());
-    }
-    return result;
-}
-
-extern "C" void* ax_port_calloc(size_t size, size_t count, const char* file, int line)
-{
-    void* result = ax_port_malloc(size * count, file, line);
-    memset(result, 0, size * count);
-    return result;
-}
-
-extern "C" void* ax_port_realloc(void* ptr, size_t size, const char* file, int line)
-{
-    (void) file;
-    (void) line;
-    void* result = realloc(ptr, size);
-    if (result == nullptr) {
-        DEBUG_TLS_MEM_PRINT("%s:%d realloc %d failed, left %d\r\n", file, line, size, ESP.getFreeHeap());
-    }
-    if (size >= 1024) {
-        DEBUG_TLS_MEM_PRINT("%s:%d realloc %d, left %d\r\n", file, line, size, ESP.getFreeHeap());
-    }
-    return result;
-}
-
-extern "C" void ax_port_free(void* ptr)
-{
-    free(ptr);
-}
-
 extern "C" void __ax_wdt_feed()
 {
     optimistic_yield(10000);

libraries/GDBStub/library.json

@@ -0,0 +1,30 @@
+{
+  "name": "GDBStub",
+  "version": "0.2",  
+  "keywords": "gdb, debug",
+  "description": "GDB server stub helps debug crashes when JTAG isn't an option.",
+  "repository":
+  {
+    "type": "git",
+    "url": "https://github.com/esp8266/Arduino.git"
+  },
+  "export": {
+    "include": "libraries/GDBStub"
+  },  
+  "authors":
+  [
+    {
+      "name": "Jeroen Domburg"
+    },
+    {
+      "name": "Ivan Grokhotkov",
+      "email": "[email protected]",
+      "maintainer": true
+    }
+  ],
+  "frameworks": "arduino",
+  "platforms": "espressif8266",
+  "build": {
+    "libArchive": false
+  }  
+}

package.json

@@ -0,0 +1,6 @@
+{
+    "name": "framework-arduinoespressif8266",
+    "description": "Arduino Wiring-based Framework (ESP8266 Core)",
+    "url": "https://github.com/esp8266/Arduino",
+    "version": "2.4.0-rc.1"
+}

tests/common.sh

@@ -122,6 +122,53 @@ function build_package()
     ./build_boards_manager_package.sh
 }
 
+
+function install_platformio()
+{
+    pip install -U https://github.com/platformio/platformio/archive/develop.zip
+    platformio platform install https://github.com/platformio/platform-espressif8266.git#feature/stage
+    sed -i 's/https:\/\/github\.com\/esp8266\/Arduino\.git/*/' ~/.platformio/platforms/espressif8266_stage/platform.json
+    ln -s $TRAVIS_BUILD_DIR ~/.platformio/packages/framework-arduinoespressif8266
+    # Install dependencies:
+    # - esp8266/examples/ConfigFile
+    pio lib install ArduinoJson
+}
+
+function build_sketches_with_platformio()
+{
+    set +e
+    local srcpath=$1
+    local build_arg=$2
+    local sketches=$(find $srcpath -name *.ino)
+    for sketch in $sketches; do
+        local sketchdir=$(dirname $sketch)
+        local sketchdirname=$(basename $sketchdir)
+        local sketchname=$(basename $sketch)
+        if [[ "${sketchdirname}.ino" != "$sketchname" ]]; then
+            echo "Skipping $sketch, beacause it is not the main sketch file";
+            continue
+        fi;
+        if [[ -f "$sketchdir/.test.skip" ]]; then
+            echo -e "\n ------------ Skipping $sketch ------------ \n";
+            continue
+        fi
+        local build_cmd="pio ci $sketchdir $build_arg"
+        echo -e "\n ------------ Building $sketch ------------ \n";
+        echo "$build_cmd"
+        time ($build_cmd >build.log)
+        local result=$?
+        if [ $result -ne 0 ]; then
+            echo "Build failed ($1)"
+            echo "Build log:"
+            cat build.log
+            set -e
+            return $result
+        fi
+        rm build.log
+    done
+    set -e
+}
+
 function run_travis_ci_build()
 {
     # Build documentation using Sphinx
@@ -165,6 +212,15 @@ function run_travis_ci_build()
     echo -e "travis_fold:start:size_report"
     cat size.log
     echo -e "travis_fold:end:size_report"
+
+    # PlatformIO
+    echo -e "travis_fold:start:install_platformio"
+    install_platformio
+    echo -e "travis_fold:end:install_platformio"
+
+    echo -e "travis_fold:start:build_sketches_with_platformio"
+    build_sketches_with_platformio $TRAVIS_BUILD_DIR/libraries "--board nodemcuv2 --verbose"
+    echo -e "travis_fold:end:build_sketches_with_platformio"
 }
 
 set -e