Merge remote-tracking branch 'upstream/master'

Author: salqadri

cores/esp8266/Schedule.cpp

@@ -14,9 +14,9 @@ static scheduled_fn_t* sLastUnused = 0;
 
 static int sCount = 0;
 
+static void init_lists() __attribute__((unused));
 static void init_lists()
 {
-    (void) init_lists;
     if (sCount != 0) {
         return;
     }

cores/esp8266/pgmspace.h

@@ -99,19 +99,23 @@ int	vsnprintf_P(char *str, size_t strSize, PGM_P formatP, va_list ap) __attribut
       :"1"(addr) \
       :);
 
-static inline uint8_t pgm_read_byte(const void* addr) {
+static inline uint8_t pgm_read_byte_inlined(const void* addr) {
   register uint32_t res;
   pgm_read_with_offset(addr, res);
   return (uint8_t) res;     /* This masks the lower byte from the returned word */
 }
 
 /* Although this says "word", it's actually 16 bit, i.e. half word on Xtensa */
-static inline uint16_t pgm_read_word(const void* addr) {
+static inline uint16_t pgm_read_word_inlined(const void* addr) {
   register uint32_t res;
   pgm_read_with_offset(addr, res);
   return (uint16_t) res;    /* This masks the lower half-word from the returned word */
 }
 
+// Make sure, that libraries checking existence of this macro are not failing
+#define pgm_read_byte(addr) pgm_read_byte_inlined(addr)
+#define pgm_read_word(addr) pgm_read_word_inlined(addr)
+
 #else //__ets__
 #define pgm_read_byte(addr)     (*reinterpret_cast<const uint8_t*>(addr))
 #define pgm_read_word(addr)     (*reinterpret_cast<const uint16_t*>(addr))

doc/esp8266wifi/readme.rst

@@ -233,7 +233,13 @@ Some functions provide more than just a binary status information. A good exampl
 
     Serial.printf("Connection status: %d\n", WiFi.status());
 
-This function returns following codes to describe what is going on with Wi-Fi connection: \* 0 : ``WL_IDLE_STATUS`` when Wi-Fi is in process of changing between statuses \* 1 : ``WL_NO_SSID_AVAIL``\ in case configured SSID cannot be reached \* 3 : ``WL_CONNECTED`` after successful connection is established \* 4 : ``WL_CONNECT_FAILED`` if password is incorrect \* 6 : ``WL_DISCONNECTED`` if module is not configured in station mode
+This function returns following codes to describe what is going on with Wi-Fi connection: 
+
+* 0 : ``WL_IDLE_STATUS`` when Wi-Fi is in process of changing between statuses 
+* 1 : ``WL_NO_SSID_AVAIL``\ in case configured SSID cannot be reached 
+* 3 : ``WL_CONNECTED`` after successful connection is established 
+* 4 : ``WL_CONNECT_FAILED`` if password is incorrect 
+* 6 : ``WL_DISCONNECTED`` if module is not configured in station mode
 
 It is a good practice to display and check information returned by functions. Application development and troubleshooting will be easier with that.
 

doc/libraries.rst

@@ -11,7 +11,7 @@ ESP8266WiFi library has been developed basing on ESP8266 SDK, using naming conve
 Ticker
 ------
 
-Library for calling functions repeatedly with a certain period. Two examples included.
+Library for calling functions repeatedly with a certain period. `Two examples <https://github.com/esp8266/Arduino/tree/master/libraries/Ticker/examples>`__ included.
 
 It is currently not recommended to do blocking IO operations (network, serial, file) from Ticker callback functions. Instead, set a flag inside the ticker callback and check for that flag inside the loop function.
 
@@ -27,7 +27,7 @@ This is a bit different from standard EEPROM class. You need to call ``EEPROM.be
 
 EEPROM library uses one sector of flash located just after the SPIFFS.
 
-Three examples included.
+`Three examples <https://github.com/esp8266/Arduino/tree/master/libraries/EEPROM>`__  included.
 
 I2C (Wire library)
 ------------------

libraries/ESP8266WiFi/src/WiFiClientSecure.cpp

@@ -93,10 +93,16 @@ class SSLContext
         SSL_EXTENSIONS* ext = ssl_ext_new();
         ssl_ext_set_host_name(ext, hostName);
         ssl_ext_set_max_fragment_size(ext, 4096);
-        s_io_ctx = ctx;
         if (_ssl) {
+            /* Creating a new TLS session on top of a new TCP connection.
+               ssl_free will want to send a close notify alert, but the old TCP connection
+               is already gone at this point, so reset s_io_ctx. */
+            s_io_ctx = nullptr;
             ssl_free(_ssl);
+            _available = 0;
+            _read_ptr = nullptr;
         }
+        s_io_ctx = ctx;
         _ssl = ssl_client_new(_ssl_ctx, 0, nullptr, 0, ext);
         uint32_t t = millis();
 

libraries/SPI/SPI.cpp

@@ -343,12 +343,11 @@ void SPIClass::write16(uint16_t data, bool msb) {
     if(msb) {
         // MSBFIRST Byte first
         SPI1W0 = (data >> 8) | (data << 8);
-        SPI1CMD |= SPIBUSY;
     } else {
         // LSBFIRST Byte first
         SPI1W0 = data;
-        SPI1CMD |= SPIBUSY;
     }
+    SPI1CMD |= SPIBUSY;
     while(SPI1CMD & SPIBUSY) {}
 }
 
@@ -367,14 +366,11 @@ void SPIClass::write32(uint32_t data, bool msb) {
         } data_;
         data_.l = data;
         // MSBFIRST Byte first
-        SPI1W0 = (data_.b[3] | (data_.b[2] << 8) | (data_.b[1] << 16) | (data_.b[0] << 24));
-        SPI1CMD |= SPIBUSY;
-    } else {
-        // LSBFIRST Byte first
-        SPI1W0 = data;
-        SPI1CMD |= SPIBUSY;
+        data = (data_.b[3] | (data_.b[2] << 8) | (data_.b[1] << 16) | (data_.b[0] << 24));
     }
-    while(SPI1CMD & SPIBUSY) {}	
+    SPI1W0 = data;
+    SPI1CMD |= SPIBUSY;
+    while(SPI1CMD & SPIBUSY) {}
 }
 
 /**
@@ -402,16 +398,17 @@ void SPIClass::writeBytes_(uint8_t * data, uint8_t size) {
     // Set Bits to transfer
     setDataBits(size * 8);
 
-    volatile uint32_t * fifoPtr = &SPI1W0;
+    uint32_t * fifoPtr = (uint32_t*)&SPI1W0;
     uint32_t * dataPtr = (uint32_t*) data;
-    uint8_t dataSize = ((size + 3) / 4);
+    uint32_t dataSize = ((size + 3) / 4);
 
     while(dataSize--) {
         *fifoPtr = *dataPtr;
         dataPtr++;
         fifoPtr++;
     }
 
+    __sync_synchronize();
     SPI1CMD |= SPIBUSY;
     while(SPI1CMD & SPIBUSY) {}
 }