Merge branch 'master' into webserver-template

Author: earlephilhower

cores/esp8266/FunctionalInterrupt.cpp

@@ -11,7 +11,7 @@ typedef void (*voidFuncPtrArg)(void*);
 extern "C" void ICACHE_RAM_ATTR __attachInterruptArg(uint8_t pin, voidFuncPtr userFunc, void*fp , int mode);
 
 
-void interruptFunctional(void* arg)
+void ICACHE_RAM_ATTR interruptFunctional(void* arg)
 {
     ArgStructure* localArg = (ArgStructure*)arg;
 	if (localArg->functionInfo->reqScheduledFunction)

cores/esp8266/PolledTimeout.h

@@ -142,6 +142,7 @@ class timeoutTemplate
 {
 public:
   using timeType = typename TimePolicyT::timeType;
+  static_assert(std::is_unsigned<timeType>::value == true, "timeType must be unsigned");
 
   static constexpr timeType alwaysExpired   = 0;
   static constexpr timeType neverExpires    = std::numeric_limits<timeType>::max();

cores/esp8266/WString.cpp

@@ -829,17 +829,24 @@ void String::trim(void) {
 // /*********************************************/
 
 long String::toInt(void) const {
-    if(buffer())
+    if (buffer())
         return atol(buffer());
     return 0;
 }
 
 float String::toFloat(void) const {
-    if(buffer())
+    if (buffer())
         return atof(buffer());
     return 0;
 }
 
+double String::toDouble(void) const
+{
+    if (buffer())
+        return atof(buffer());
+    return 0.0;
+}
+
 // global empty string to allow returning const String& with nothing
 
 const String emptyString;

cores/esp8266/WString.h

@@ -241,6 +241,7 @@ class String {
         // parsing/conversion
         long toInt(void) const;
         float toFloat(void) const;
+	double toDouble(void) const;
 
     protected:
         // Contains the string info when we're not in SSO mode

cores/esp8266/core_esp8266_wiring_digital.cpp

@@ -171,6 +171,16 @@ void ICACHE_RAM_ATTR interrupt_handler(void *arg) {
 extern void cleanupFunctional(void* arg);
 
 extern void ICACHE_RAM_ATTR __attachInterruptArg(uint8_t pin, voidFuncPtr userFunc, void *arg, int mode) {
+
+  // #5780
+  // https://github.com/esp8266/esp8266-wiki/wiki/Memory-Map
+  if ((uint32_t)userFunc >= 0x40200000)
+  {
+    // ISR not in IRAM
+    ::printf((PGM_P)F("ISR not in IRAM!\r\n"));
+    abort();
+  }
+
   if(pin < 16) {
     ETS_GPIO_INTR_DISABLE();
     interrupt_handler_t *handler = &interrupt_handlers[pin];

doc/esp8266wifi/station-class.rst

@@ -535,7 +535,7 @@ Function returns value of the ``String`` type.
 BSSID
 ^^^^^
 
-Return the mac address the access point where ESP module is connected to. This address is formally called `Basic Service Set Identification (BSSID) <http://www.juniper.net/techpubs/en_US/network-director1.1/topics/concept/wireless-ssid-bssid-essid.html#jd0e47>`__.
+Return the mac address of the access point to which the ESP module was directed to connect to. This address is formally called `Basic Service Set Identification (BSSID) <http://www.juniper.net/techpubs/en_US/network-director1.1/topics/concept/wireless-ssid-bssid-essid.html#jd0e47>`__. The returned pointer is what the user configured when calling begin() with a bssid argument. It does _not_ necessarily reflect the mac address of the access point to which the ESP module's station interface is currently connected to.
 
 .. code:: cpp
 

doc/installing.rst

@@ -105,7 +105,7 @@ Instructions - Windows 10
 
    .. code:: bash
 
-       cd %USERPROFILE%\Documents\hardware\esp8266com\esp8266
+       cd %USERPROFILE%\Documents\Arduino\hardware\esp8266com\esp8266
        git submodule update --init   
   
   If error messages about missing files related to ``SoftwareSerial`` are encountered during the build process, it should be because this step was missed and is required.
@@ -125,7 +125,7 @@ Instructions - Windows 10
 
    .. code:: bash
 
-       cd %USERPROFILE%\Documents\hardware\esp8266com\esp8266
+       cd %USERPROFILE%\Documents\Arduino\hardware\esp8266com\esp8266
        git status
        git pull
 

libraries/SoftwareSerial

@@ -19,6 +19,8 @@ If you want to add emulation of a certain feature, add it into tests/host/common
 
 ### Running test cases
 
+**NOTE!** The test-on-host environment is dependent on some submodules. Make sure to run `git submodule update --init` before running any test.
+
 To run test cases, go to tests/host/ directory and run `make`. This will compile and run the tests. 
 
 If all tests pass, you will see "All tests passed" message and the exit code will be 0.

tests/README.md

@@ -145,7 +145,7 @@ FLAGS += -DLWIP_IPV6=0
 FLAGS += -DHOST_MOCK=1
 FLAGS += -DNONOSDK221=1
 FLAGS += $(MKFLAGS)
-CXXFLAGS += -std=c++11 $(FLAGS)
+CXXFLAGS += -std=c++11 -fno-rtti $(FLAGS)
 CFLAGS += -std=c99 $(FLAGS)
 LDFLAGS += -coverage $(OPTZ) -g $(M32)
 VALGRINDFLAGS += --leak-check=full --track-origins=yes --error-limit=no --show-leak-kinds=all --error-exitcode=999

tests/host/Makefile

@@ -21,31 +21,53 @@
 import os
 import subprocess
 
-parser = argparse.ArgumentParser(description='Generate core_version.h')
-parser.add_argument('-b', '--build_path', action='store', required=True, help='build.path variable')
-parser.add_argument('-p', '--platform_path', action='store', required=True, help='platform.path variable')
-parser.add_argument('-v', '--version', action='store', required=True, help='version variable')
-
-args = parser.parse_args()
-
-core = args.build_path + '/core'
-try:
-    os.makedirs(core)
-except:
-    pass
-
-out = open(core + '/core_version.h', "w")
-
-try:
-    p = subprocess.Popen(['git', '--git-dir', args.platform_path + '/.git', 'rev-parse', '--short=8', 'HEAD'], stdout = subprocess.PIPE )
-    git_ver = '0x' + p.stdout.readlines()[0].strip()
-    p = subprocess.Popen(['git', '--git-dir', args.platform_path + '/.git', 'describe', '--tags'], stdout = subprocess.PIPE )
-    git_desc = p.stdout.readlines()[0].strip()
-except:
-    git_ver = '0xffffffff'
-    git_desc = args.version
-
-out.write('#define ARDUINO_ESP8266_GIT_VER  ' + git_ver + '\n')
-out.write('#define ARDUINO_ESP8266_GIT_DESC ' + git_desc + '\n')
-
-out.close()
+
+def generate(path, platform_path, git_ver="0xffffffff", git_desc="unspecified"):
+    def git(*args):
+        cmd = ["git", "-C", platform_path]
+        cmd.extend(args)
+        proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, universal_newlines=True)
+        return proc.stdout.readlines()[0].strip()
+
+    try:
+        git_ver = git("rev-parse", "--short=8", "HEAD")
+        git_desc = git("describe", "--tags")
+    except:
+        pass
+
+    with open(path, "w") as out:
+        out.write("#define ARDUINO_ESP8266_GIT_VER 0x{}\n".format(git_ver))
+        out.write("#define ARDUINO_ESP8266_GIT_DESC {}\n".format(git_desc))
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description="Generate core_version.h")
+
+    parser.add_argument(
+        "-b", "--build_path", action="store", required=True, help="build.path variable"
+    )
+    parser.add_argument(
+        "-p",
+        "--platform_path",
+        action="store",
+        required=True,
+        help="platform.path variable",
+    )
+    parser.add_argument(
+        "-v", "--version", action="store", required=True, help="version variable"
+    )
+    parser.add_argument("-i", "--include_dir", default="core")
+
+    args = parser.parse_args()
+
+    include_dir = os.path.join(args.build_path, args.include_dir)
+    try:
+        os.makedirs(include_dir)
+    except:
+        pass
+
+    generate(
+        os.path.join(include_dir, "core_version.h"),
+        args.platform_path,
+        git_desc=args.version,
+    )

tools/makecorever.py

@@ -24,6 +24,9 @@
 
 # Extends: https://github.com/platformio/platform-espressif8266/blob/develop/builder/main.py
 
+import os
+import subprocess
+
 from os.path import isdir, join
 
 from SCons import Builder, Util
@@ -220,6 +223,41 @@ def scons_patched_match_splitext(path, suffixes=None):
         "Generating LD script $TARGET"))
 env.Depends("$BUILD_DIR/$PROGNAME$PROGSUFFIX", app_ld)
 
+#
+# Dynamic core_version.h for staging builds
+#
+
+def platform_txt_version(default):
+    with open(join(FRAMEWORK_DIR, "platform.txt"), "r") as platform_txt:
+        for line in platform_txt:
+            if not line:
+                continue
+            k, delim, v = line.partition("=")
+            if not delim:
+                continue
+            if k == "version":
+                return v.strip()
+
+    return default
+
+if isdir(join(FRAMEWORK_DIR, ".git")):
+    cmd = '"$PYTHONEXE" "{script}" -b "$BUILD_DIR" -p "{framework_dir}" -v {version}'
+    fmt = {
+        "script": join(FRAMEWORK_DIR, "tools", "makecorever.py"),
+        "framework_dir": FRAMEWORK_DIR,
+        "version": platform_txt_version("unspecified")
+    }
+
+    env.Prepend(CPPPATH=[
+        join("$BUILD_DIR", "core")
+    ])
+    core_version = env.Command(
+        join("$BUILD_DIR", "core", "core_version.h"),
+        join(FRAMEWORK_DIR, ".git"),
+        env.VerboseAction(cmd.format(**fmt), "Generating $TARGET")
+    )
+    env.Depends("$BUILD_DIR/$PROGNAME$PROGSUFFIX", core_version)
+
 
 #
 # Target: Build Core Library