Merge remote-tracking branch 'esp8266/master'

Author: Me No Dev

cores/esp8266/Arduino.h

@@ -271,6 +271,8 @@ void noTone(uint8_t _pin);
 long random(long);
 long random(long, long);
 void randomSeed(unsigned long);
+long secureRandom(long);
+long secureRandom(long, long);
 long map(long, long, long, long, long);
 
 extern "C" void configTime(long timezone, int daylightOffset_sec,

cores/esp8266/HardwareSerial.cpp

@@ -180,6 +180,13 @@ size_t HardwareSerial::write(uint8_t c)
     return 1;
 }
 
+int HardwareSerial::baudRate(void)
+{
+    // Null pointer on _uart is checked by SDK
+    return uart_get_baudrate(_uart);
+}
+
+
 HardwareSerial::operator bool() const
 {
     return _uart != 0;

cores/esp8266/HardwareSerial.h

@@ -133,6 +133,7 @@ class HardwareSerial: public Stream
     void setDebugOutput(bool);
     bool isTxEnabled(void);
     bool isRxEnabled(void);
+    int  baudRate(void);
 
 protected:
     int _uart_nr;

cores/esp8266/MD5Builder.cpp

@@ -1,82 +1,101 @@
-#include "Arduino.h"
-#include "md5.h"
-#include "MD5Builder.h"
+#include <Arduino.h>
+#include <MD5Builder.h>
 
-#define hex_char_to_byte(c) (((c)>='a'&&(c)<='f')?((c)-87):((c)>='A'&&(c)<='F')?((c)-55):((c)>='0'&&(c)<='9')?((c)-48):0)
+uint8_t hex_char_to_byte(uint8_t c)
+{
+    return  (c >= 'a' && c <= 'f') ? (c - ((uint8_t)'a' - 0xa)) :
+            (c >= 'A' && c <= 'F') ? (c - ((uint8_t)'A' - 0xA)) :
+            (c >= '0' &&  c<= '9') ? (c - (uint8_t)'0') : 0;
+}
 
-void MD5Builder::begin(void){
-  memset(_buf, 0x00, 16);
-  MD5Init(&_ctx);
+void MD5Builder::begin(void)
+{
+    memset(_buf, 0x00, 16);
+    MD5Init(&_ctx);
 }
 
-void MD5Builder::add(uint8_t * data, uint16_t len){
-  MD5Update(&_ctx, data, len);
+void MD5Builder::add(uint8_t * data, uint16_t len)
+{
+    MD5Update(&_ctx, data, len);
 }
 
-void MD5Builder::addHexString(const char * data){
-  uint16_t i, len = strlen(data);
-  uint8_t * tmp = (uint8_t*)malloc(len/2);
-  if(tmp == NULL)
-    return;
-  for(i=0; i<len; i+=2) tmp[i/2] = (hex_char_to_byte(data[i]) & 0x0F) << 4 | (hex_char_to_byte(data[i+1]) & 0x0F);
-  add(tmp, len/2);
-  free(tmp);
+void MD5Builder::addHexString(const char * data)
+{
+    uint16_t i, len = strlen(data);
+    uint8_t * tmp = (uint8_t*)malloc(len/2);
+    if(tmp == NULL) {
+        return;
+    }
+    for(i=0; i<len; i+=2) {
+        uint8_t high = hex_char_to_byte(data[i]);
+        uint8_t low = hex_char_to_byte(data[i+1]);
+        tmp[i/2] = (high & 0x0F) << 4 | (low & 0x0F);
+    }
+    add(tmp, len/2);
+    free(tmp);
 }
 
-bool MD5Builder::addStream(Stream & stream, const size_t total_len) {
-  const int buf_size = 512;
-  int bytesleft = total_len;
-  uint8_t * buf = (uint8_t*) malloc(buf_size);
-  if(buf) {
-    while((stream.available() > -1) && (bytesleft > 0)) {
-      // get available data size
-      int sizeAvailable = stream.available();
-      if(sizeAvailable) {
-        int readBytes = sizeAvailable;
-
-        // read only the asked bytes
-        if(readBytes > bytesleft) {
-          readBytes = bytesleft ;
-        }
+bool MD5Builder::addStream(Stream & stream, const size_t maxLen)
+{
+    const int buf_size = 512;
+    int maxLengthLeft = maxLen;
+    uint8_t * buf = (uint8_t*) malloc(buf_size);
+
+    if(!buf) {
+        return false;
+    }
+
+    int bytesAvailable = stream.available();
+    while((bytesAvailable > 0) && (maxLengthLeft > 0)) {
 
-        // not read more the buffer can handle
+        // determine number of bytes to read
+        int readBytes = bytesAvailable;
+        if(readBytes > maxLengthLeft) {
+            readBytes = maxLengthLeft ;    // read only until max_len
+        }
         if(readBytes > buf_size) {
-          readBytes = buf_size;
+            readBytes = buf_size;    // not read more the buffer can handle
         }
 
-        // read data
-        int bytesread = stream.readBytes(buf, readBytes);
-        bytesleft -= bytesread;
-        if(bytesread > 0) {
-          MD5Update(&_ctx, buf, bytesread);
+        // read data and check if we got something
+        int numBytesRead = stream.readBytes(buf, readBytes);
+        if(numBytesRead< 1) {
+            return false;
         }
-      }
-      // time for network streams
-      delay(0);
+
+        // Update MD5 with buffer payload
+        MD5Update(&_ctx, buf, numBytesRead);
+
+        yield();      // time for network streams
+
+        // update available number of bytes
+        maxLengthLeft -= numBytesRead;
+        bytesAvailable = stream.available();
     }
-    // guaranteed not null
     free(buf);
-    return (bytesleft == 0);
-  } else {
-    return false;
-  }
+    return true;
 }
 
-void MD5Builder::calculate(void){
-  MD5Final(_buf, &_ctx);
+void MD5Builder::calculate(void)
+{
+    MD5Final(_buf, &_ctx);
 }
 
-void MD5Builder::getBytes(uint8_t * output){
-  memcpy(output, _buf, 16);
+void MD5Builder::getBytes(uint8_t * output)
+{
+    memcpy(output, _buf, 16);
 }
 
-void MD5Builder::getChars(char * output){
-  for(uint8_t i = 0; i < 16; i++)
-    sprintf(output + (i * 2), "%02x", _buf[i]);
+void MD5Builder::getChars(char * output)
+{
+    for(uint8_t i = 0; i < 16; i++) {
+        sprintf(output + (i * 2), "%02x", _buf[i]);
+    }
 }
 
-String MD5Builder::toString(void){
-  char out[33];
-  getChars(out);
-  return String(out);
-}
+String MD5Builder::toString(void)
+{
+    char out[33];
+    getChars(out);
+    return String(out);
+}

cores/esp8266/MD5Builder.h

@@ -21,7 +21,8 @@
 #ifndef __ESP8266_MD5_BUILDER__
 #define __ESP8266_MD5_BUILDER__
 
-#include "Arduino.h"
+#include <WString.h>
+#include <Stream.h>
 #include "md5.h"
 
 class MD5Builder {
@@ -37,7 +38,7 @@ class MD5Builder {
     void addHexString(const char * data);
     void addHexString(char * data){ addHexString((const char*)data); }
     void addHexString(String data){ addHexString(data.c_str()); }
-    bool addStream(Stream & stream, const size_t total_len);
+    bool addStream(Stream & stream, const size_t maxLen);
     void calculate(void);
     void getBytes(uint8_t * output);
     void getChars(char * output);

cores/esp8266/StreamString.h

@@ -25,15 +25,14 @@
 
 
 class StreamString: public Stream, public String {
-
-        size_t write(const uint8_t *buffer, size_t size);
-        size_t write(uint8_t data);
-
-        int available();
-        int read();
-        int peek();
-        void flush();
-
+public:
+    size_t write(const uint8_t *buffer, size_t size) override;
+    size_t write(uint8_t data) override;
+
+    int available() override;
+    int read() override;
+    int peek() override;
+    void flush() override;
 };
 
 

cores/esp8266/Updater.h

@@ -1,9 +1,9 @@
 #ifndef ESP8266UPDATER_H
 #define ESP8266UPDATER_H
 
-#include "Arduino.h"
-#include "flash_utils.h"
-#include "MD5Builder.h"
+#include <Arduino.h>
+#include <flash_utils.h>
+#include <MD5Builder.h>
 
 #define UPDATE_ERROR_OK                 (0)
 #define UPDATE_ERROR_WRITE              (1)

cores/esp8266/WMath.cpp

@@ -28,17 +28,22 @@ extern "C" {
 }
 #include "esp8266_peri.h"
 
+static bool s_randomSeedCalled = false;
+
 void randomSeed(unsigned long seed) {
     if(seed != 0) {
-        srand((seed ^ RANDOM_REG32));
+        srand(seed);
+        s_randomSeedCalled = true;
     }
 }
 
 long random(long howbig) {
     if(howbig == 0) {
         return 0;
     }
-    return (rand() ^ RANDOM_REG32) % howbig;
+    // if randomSeed was called, fall back to software PRNG
+    uint32_t val = (s_randomSeedCalled) ? rand() : RANDOM_REG32;
+    return val % howbig;
 }
 
 long random(long howsmall, long howbig) {
@@ -49,6 +54,21 @@ long random(long howsmall, long howbig) {
     return random(diff) + howsmall;
 }
 
+long secureRandom(long howbig) {
+    if(howbig == 0) {
+        return 0;
+    }
+    return RANDOM_REG32 % howbig;
+}
+
+long secureRandom(long howsmall, long howbig) {
+    if(howsmall >= howbig) {
+        return howsmall;
+    }
+    long diff = howbig - howsmall;
+    return secureRandom(diff) + howsmall;
+}
+
 long map(long x, long in_min, long in_max, long out_min, long out_max) {
     return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
 }

cores/esp8266/spiffs_api.cpp

@@ -63,9 +63,9 @@ bool SPIFFSImpl::exists(const char* path)
     return rc == SPIFFS_OK;
 }
 
-DirImplPtr SPIFFSImpl::openDir(const char* path)
+DirImplPtr SPIFFSImpl::openDir(const char* path) 
 {
-    if (!isSpiffsFilenameValid(path)) {
+    if (strlen(path) > 0 && !isSpiffsFilenameValid(path)) {
         DEBUGV("SPIFFSImpl::openDir: invalid path=`%s` \r\n", path);
         return DirImplPtr();
     }

doc/changes.md

@@ -9,6 +9,26 @@ title: Change Log
 - Update SDK to 1.5.3
 - umm_malloc: print block start address before heap corruption callback is triggered
 - If GDBStub library is used, break into gdb on assert and panic
+- Add option to keep FS classes in namespace (#2030)
+- Add SPIFFS::end (#1657)
+- Add ArduinoOTA::getHostname() interface
+- Add __throw_out_of_range
+- Add support for RTC user memory in ESP-specific APIs. (#1836)
+- Expose RTC_USER_MEM in esp8266_peri.h
+- Remove DISABLED macro (#2072)
+- Execute global constructors in correct order (#2074)
+- Real board name available in Sketch/MDNS/OTA (#2054)
+- Add DOUT/QOUT flash modes
+- Add ESP8285 entry in boards menu
+- Move timer detachInterrupt functions into IRAM (#2083)
+- Make Updater be able to run inside async callbacks (#2096)
+- Add new boards Phoenix 1.0 & Phoenix 2.0 (#2088)
+- Store git version of the core in the compiled binary (#2099)
+- Rebuild libstdc++ with mlongcalls and link against it (#1983)
+- Add mechanism for posting functions to the main loop (#2082)
+- MD5Builder::addStream: fixed falsy calculated hash for len > filelength (#2126)
+- Fix SPIFFS.openDir("") (#2143)
+- Bring back old semantics to random and randomSeed, add secureRandom (#1710) (#2142)
 
 ### Libraries
 
@@ -25,6 +45,25 @@ title: Change Log
 - HTTPClient: include non-standard ports in Host: header
 - ESP8266WiFi: Prevent WiFi config corruption (#1997 #1856 #1699 #1675)
 - GDBStub: fix section attribute for core gdbstub functions
+- Wire: I2C bus reset with info to user
+- ESP8266HTTPClient: allow HTTP header value without LWS
+- ESP8266mDNS: Fix mDNS doesn't accept queryService responses from avahi-daemon (#2015)
+- Add MFRC522 to supported libraries (#2044)
+- Update axTLS to ab516f7 (1.5.3+)
+- Mention ESP8266Ping library
+- ESP8266HTTPClient: fix duplicate Content-Length headers (#1902)
+- ESP8266HTTPUpdateServer: make HTTP Update Server more secure (#2104)
+- ESP8266WiFi: add virtual destructor to WiFiServer class (#2116)
+- ESP8266WiFi: fix error when calling `WiFiServer::close` more than once
+- ESP8266WiFi: WiFi event handling refactoring (#2119)
+- ESP8266mDNS: restart listening when WiFi STA is connected/disconnected (#1828)
+- ESP8266WiFi: allow DHCP client to be re-enabled using WiFi.config(0U, 0U, 0U) (#1896)
+- ESP8266WiFi: enable SO_REUSE in LwIP and WiFiServer (#1431)
+- ESP8266WebServer: make ESP8266WebServer::urlDecode public (#1419)
+- LwIP: sntp_localtime: return -1 in tm_isdst field (#2010)
+- ESP8266WiFi: fix for crash in WiFiClientSecure when WiFi is disconnected (#2139)
+- SD: Prevent WDT resets in SD library (#1815)
+- ESP8266WiFi: Fix issue when WiFi.begin(ssid, pass) is called right after WiFi.mode(WIFI_OFF)
 
 ### Tools
 

doc/reference.md

@@ -84,6 +84,21 @@ You also need to use `Serial.setDebugOutput(true)` to enable output from `printf
 
 Both `Serial` and `Serial1` objects support 5, 6, 7, 8 data bits, odd (O), even (E), and no (N) parity, and 1 or 2 stop bits. To set the desired mode, call `Serial.begin(baudrate, SERIAL_8N1)`, `Serial.begin(baudrate, SERIAL_6E2)`, etc.
 
+A new method has been implemented on both `Serial` and `Serial1` to get current baud rate setting. To get the current baud rate, call `Serial.baudRate()`, `Serial1.baudRate()`. Return a `int` of current speed. For example
+```cpp
+// Set Baud rate to 57600
+Serial.begin(57600);
+
+// Get current baud rate
+int br = Serial.baudRate();
+
+// Will print "Serial is 57600 bps"
+Serial.printf("Serial is %d bps", br);
+```
+
+I've done this also for official ESP8266 [Software Serial](https://github.com/esp8266/Arduino/blob/master/doc/libraries.md#softwareserial) library, see this [pull request](https://github.com/plerup/espsoftwareserial/pull/22).    
+Note that this implementation is **only for ESP8266 based boards**, and will not works with other Arduino boards.
+
 ## Progmem
 
 The Program memory features work much the same way as on a regular Arduino; placing read only data and strings in read only memory and freeing heap for your application.

libraries/ESP8266WebServer/src/ESP8266WebServer.h

@@ -119,6 +119,8 @@ class ESP8266WebServer
   void sendContent_P(PGM_P content);
   void sendContent_P(PGM_P content, size_t size);
 
+  static String urlDecode(const String& text);
+
 template<typename T> size_t streamFile(T &file, const String& contentType){
   setContentLength(file.size());
   if (String(file.name()).endsWith(".gz") &&
@@ -142,7 +144,6 @@ template<typename T> size_t streamFile(T &file, const String& contentType){
   uint8_t _uploadReadByte(WiFiClient& client);
   void _prepareHeader(String& response, int code, const char* content_type, size_t contentLength);
   bool _collectHeader(const char* headerName, const char* headerValue);
-  String urlDecode(const String& text);
 
   struct RequestArgument {
     String key;