Merge branch 'master' into wifi_mesh_update_2.2

Author: aerlon

.gitignore

@@ -4,6 +4,7 @@ tools/xtensa-lx106-elf/
 tools/mkspiffs/
 tools/mklittlefs/
 tools/python/
+tools/python3/
 package/versions/
 exclude.txt
 tools/sdk/lib/liblwip_src.a

.travis.yml

@@ -107,6 +107,18 @@ jobs:
       script: $TRAVIS_BUILD_DIR/tests/buildm.sh
       env: CC=gcc-7 CXX=g++-7
 
+    - name: "Mac OSX can build sketches"
+      os: osx
+      stage: build
+      script: $TRAVIS_BUILD_DIR/tests/build.sh
+      env: MACOSX=1 BUILD_PARITY=custom mod=500 rem=1
+
+    - name: "Windows can build sketches"
+      os: windows
+      stage: build
+      script: $TRAVIS_BUILD_DIR/tests/build.sh
+      env: WINDOWS=1 BUILD_PARITY=custom mod=500 rem=1
+
     - name: "Boards"
       stage: build
       script: $TRAVIS_BUILD_DIR/tests/ci/build_boards.sh

boards.txt

@@ -128,6 +128,7 @@ struct netifWrapper
     const char* ifmac () const      { return (const char*)_netif->hwaddr; }
     int ifnumber () const           { return _netif->num; }
     bool ifUp () const              { return !!(_netif->flags & NETIF_FLAG_UP); }
+    CONST netif* interface () const { return _netif; }
 
     const ip_addr_t* ipFromNetifNum () const
     {

cores/esp8266/AddrList.h

@@ -142,30 +142,9 @@ void timer0_detachInterrupt(void);
 void ets_intr_lock();
 void ets_intr_unlock();
 
-#ifndef __STRINGIFY
-#define __STRINGIFY(a) #a
-#endif
-
-// these low level routines provide a replacement for SREG interrupt save that AVR uses
-// but are esp8266 specific. A normal use pattern is like
-//
-//{
-//    uint32_t savedPS = xt_rsil(1); // this routine will allow level 2 and above
-//    // do work here
-//    xt_wsr_ps(savedPS); // restore the state
-//}
-//
-// level (0-15), interrupts of the given level and above will be active
-// level 15 will disable ALL interrupts,
-// level 0 will enable ALL interrupts,
-//
-#define xt_rsil(level) (__extension__({uint32_t state; __asm__ __volatile__("rsil %0," __STRINGIFY(level) : "=a" (state) :: "memory"); state;}))
-#define xt_wsr_ps(state)  __asm__ __volatile__("wsr %0,ps; isync" :: "a" (state) : "memory")
-
 #define interrupts() xt_rsil(0)
 #define noInterrupts() xt_rsil(15)
 
-
 #define clockCyclesPerMicrosecond() ( F_CPU / 1000000L )
 #define clockCyclesToMicroseconds(a) ( (a) / clockCyclesPerMicrosecond() )
 #define microsecondsToClockCycles(a) ( (a) * clockCyclesPerMicrosecond() )
@@ -272,8 +251,8 @@ using std::max;
 using std::isinf;
 using std::isnan;
 
-#define _min(a,b) ((a)<(b)?(a):(b))
-#define _max(a,b) ((a)>(b)?(a):(b))
+#define _min(a,b) ({ decltype(a) _a = (a); decltype(b) _b = (b); _a < _b? _a : _b; })
+#define _max(a,b) ({ decltype(a) _a = (a); decltype(b) _b = (b); _a > _b? _a : _b; })
 
 uint16_t makeWord(uint16_t w);
 uint16_t makeWord(byte h, byte l);

cores/esp8266/Arduino.h

@@ -201,17 +201,16 @@ class EspClass {
         bool eraseConfig();
 
 #ifndef CORE_MOCK
-        inline
-#endif
+        inline uint32_t getCycleCount() __attribute__((always_inline));
+#else
         uint32_t getCycleCount();
+#endif
 };
 
 #ifndef CORE_MOCK
 uint32_t EspClass::getCycleCount()
 {
-    uint32_t ccount;
-    __asm__ __volatile__("esync; rsr %0,ccount":"=a" (ccount));
-    return ccount;
+    return esp_get_cycle_count();
 }
 
 #endif // !defined(CORE_MOCK)

cores/esp8266/Esp.h

@@ -60,6 +60,15 @@ void HardwareSerial::end()
     _uart = NULL;
 }
 
+void HardwareSerial::updateBaudRate(unsigned long baud)
+{
+    if(!_uart) {
+        return;
+    }
+
+    uart_set_baudrate(_uart, baud);    
+}
+
 size_t HardwareSerial::setRxBufferSize(size_t size){
     if(_uart) {
         _rx_size = uart_resize_rx_buffer(_uart, size);
@@ -121,9 +130,9 @@ unsigned long HardwareSerial::testBaudrate()
 
 unsigned long HardwareSerial::detectBaudrate(time_t timeoutMillis)
 {
-    time_t startMillis = millis();
+    esp8266::polledTimeout::oneShotFastMs timeOut(timeoutMillis);
     unsigned long detectedBaudrate;
-    while ((time_t) millis() - startMillis < timeoutMillis) {
+    while (!timeOut) {
         if ((detectedBaudrate = testBaudrate())) {
           break;
         }
@@ -133,8 +142,8 @@ unsigned long HardwareSerial::detectBaudrate(time_t timeoutMillis)
     return detectedBaudrate;
 }
 
-size_t HardwareSerial::readBytes(char* buffer, size_t size)
-{
+size_t HardwareSerial::readBytes(char* buffer, size_t size)
+{
     size_t got = 0;
 
     while (got < size)
@@ -147,7 +156,7 @@ size_t HardwareSerial::readBytes(char* buffer, size_t size)
         got += read(buffer + got, std::min(size - got, avail));
     }
     return got;
-}
+}
 
 #if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_SERIAL)
 HardwareSerial Serial(UART0);

cores/esp8266/HardwareSerial.cpp

@@ -88,6 +88,8 @@ class HardwareSerial: public Stream
 
     void end();
 
+    void updateBaudRate(unsigned long baud);
+
     size_t setRxBufferSize(size_t size);
     size_t getRxBufferSize()
     {

cores/esp8266/HardwareSerial.h

@@ -45,7 +45,7 @@ size_t Print::write(const uint8_t *buffer, size_t size) {
 
     size_t n = 0;
     while (size--) {
-        size_t ret = write(*buffer++);
+        size_t ret = write(pgm_read_byte(buffer++));
         if (ret == 0) {
             // Write of last byte didn't complete, abort additional processing
             break;

cores/esp8266/Print.cpp

@@ -56,7 +56,7 @@ class Print {
         size_t write(const char *str) {
             if(str == NULL)
                 return 0;
-            return write((const uint8_t *) str, strlen(str));
+            return write((const uint8_t *) str, strlen_P(str));
         }
         virtual size_t write(const uint8_t *buffer, size_t size);
         size_t write(const char *buffer, size_t size) {