Merge branch 'master' into WiFiOffAtBoot

Author: d-a-v

cores/esp8266/HardwareSerial.h

@@ -101,31 +101,31 @@ class HardwareSerial: public Stream
  return uart_get_rx_buffer_size(_uart);
  }
 
- void swap()
+ bool swap()
  {
- swap(1);
+ return swap(1);
  }
- void swap(uint8_t tx_pin) //toggle between use of GPIO13/GPIO15 or GPIO3/GPIO(1/2) as RX and TX
+ bool swap(uint8_t tx_pin) //toggle between use of GPIO13/GPIO15 or GPIO3/GPIO(1/2) as RX and TX
  {
- uart_swap(_uart, tx_pin);
+ return uart_swap(_uart, tx_pin);
  }
 
  /*
  * Toggle between use of GPIO1 and GPIO2 as TX on UART 0.
  * Note: UART 1 can't be used if GPIO2 is used with UART 0!
  */
- void set_tx(uint8_t tx_pin)
+ bool set_tx(uint8_t tx_pin)
  {
- uart_set_tx(_uart, tx_pin);
+ return uart_set_tx(_uart, tx_pin);
  }
 
  /*
  * UART 0 possible options are (1, 3), (2, 3) or (15, 13)
  * UART 1 allows only TX on 2 if UART 0 is not (2, 3)
  */
- void pins(uint8_t tx, uint8_t rx)
+ bool pins(uint8_t tx, uint8_t rx)
  {
- uart_set_pins(_uart, tx, rx);
+ return uart_set_pins(_uart, tx, rx);
  }
 
  int available(void) override;

cores/esp8266/StreamDev.h

@@ -179,12 +179,14 @@ class StreamConstPtr: public StreamNull
 
  virtual int read() override
  {
- return _peekPointer < _size ? _buffer[_peekPointer++] : -1;
+ // valid with dram, iram and flash
+ return _peekPointer < _size ? pgm_read_byte(&_buffer[_peekPointer++]) : -1;
  }
 
  virtual int peek() override
  {
- return _peekPointer < _size ? _buffer[_peekPointer] : -1;
+ // valid with dram, iram and flash
+ return _peekPointer < _size ? pgm_read_byte(&_buffer[_peekPointer]) : -1;
  }
 
  virtual size_t readBytes(char* buffer, size_t len) override

cores/esp8266/StreamString.h

@@ -236,7 +236,6 @@ class StreamString: public String, public S2Stream
  StreamString(const String& string): String(string), S2Stream(this) { }
  StreamString(const __FlashStringHelper *str): String(str), S2Stream(this) { }
  StreamString(String&& string): String(string), S2Stream(this) { }
- StreamString(StringSumHelper&& sum): String(sum), S2Stream(this) { }
 
  explicit StreamString(char c): String(c), S2Stream(this) { }
  explicit StreamString(unsigned char c, unsigned char base = 10): String(c, base), S2Stream(this) { }
@@ -281,13 +280,6 @@ class StreamString: public String, public S2Stream
  resetpp();
  return *this;
  }
-
- StreamString& operator= (StringSumHelper&& rval)
- {
- String::operator=(rval);
- resetpp();
- return *this;
- }
 };
 
 #endif // __STREAMSTRING_H

cores/esp8266/WString.cpp

@@ -21,7 +21,7 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <Arduino.h>
+#include "Arduino.h"
 #include "WString.h"
 #include "stdlib_noniso.h"
 
@@ -56,11 +56,6 @@ String::String(String &&rval) noexcept {
  move(rval);
 }
 
-String::String(StringSumHelper &&rval) noexcept {
- init();
- move(rval);
-}
-
 String::String(unsigned char value, unsigned char base) {
  init();
  char buf[1 + 8 * sizeof(unsigned char)];
@@ -390,98 +385,92 @@ unsigned char String::concat(const __FlashStringHelper *str) {
 }
 
 /*********************************************/
-/* Concatenate */
+/* Insert  */
 /*********************************************/
 
-StringSumHelper &operator +(const StringSumHelper &lhs, const String &rhs) {
- StringSumHelper &a = const_cast<StringSumHelper &>(lhs);
- if (!a.concat(rhs.buffer(), rhs.len()))
- a.invalidate();
- return a;
-}
+String &String::insert(size_t position, const char *other, size_t other_length) {
+ if (position > length())
+ return *this;
 
-StringSumHelper &operator +(const StringSumHelper &lhs, const char *cstr) {
- StringSumHelper &a = const_cast<StringSumHelper &>(lhs);
- if (!cstr || !a.concat(cstr, strlen(cstr)))
- a.invalidate();
- return a;
-}
+ auto len = length();
+ auto total = len + other_length;
+ if (!reserve(total))
+ return *this;
 
-StringSumHelper &operator +(const StringSumHelper &lhs, char c) {
- StringSumHelper &a = const_cast<StringSumHelper &>(lhs);
- if (!a.concat(c))
- a.invalidate();
- return a;
-}
+ auto left = len - position;
+ setLen(total);
 
-StringSumHelper &operator +(const StringSumHelper &lhs, unsigned char num) {
- StringSumHelper &a = const_cast<StringSumHelper &>(lhs);
- if (!a.concat(num))
- a.invalidate();
- return a;
-}
+ auto *start = wbuffer() + position;
+ memmove(start + other_length, start, left);
+ memmove_P(start, other, other_length);
+ wbuffer()[total] = '\0';
 
-StringSumHelper &operator +(const StringSumHelper &lhs, int num) {
- StringSumHelper &a = const_cast<StringSumHelper &>(lhs);
- if (!a.concat(num))
- a.invalidate();
- return a;
+ return *this;
 }
 
-StringSumHelper &operator +(const StringSumHelper &lhs, unsigned int num) {
- StringSumHelper &a = const_cast<StringSumHelper &>(lhs);
- if (!a.concat(num))
- a.invalidate();
- return a;
+String &String::insert(size_t position, const __FlashStringHelper *other) {
+ auto *p = reinterpret_cast<const char*>(other);
+ return insert(position, p, strlen_P(p));
 }
 
-StringSumHelper &operator +(const StringSumHelper &lhs, long num) {
- StringSumHelper &a = const_cast<StringSumHelper &>(lhs);
- if (!a.concat(num))
- a.invalidate();
- return a;
+String &String::insert(size_t position, char other) {
+ char tmp[2] { other, '\0' };
+ return insert(position, tmp, 1);
 }
 
-StringSumHelper &operator +(const StringSumHelper &lhs, unsigned long num) {
- StringSumHelper &a = const_cast<StringSumHelper &>(lhs);
- if (!a.concat(num))
- a.invalidate();
- return a;
+String &String::insert(size_t position, const char *other) {
+ return insert(position, other, strlen(other));
 }
 
-StringSumHelper &operator +(const StringSumHelper &lhs, long long num) {
- StringSumHelper &a = const_cast<StringSumHelper &>(lhs);
- if (!a.concat(num))
- a.invalidate();
- return a;
+String &String::insert(size_t position, const String &other) {
+ return insert(position, other.c_str(), other.length());
 }
 
-StringSumHelper &operator +(const StringSumHelper &lhs, unsigned long long num) {
- StringSumHelper &a = const_cast<StringSumHelper &>(lhs);
- if (!a.concat(num))
- a.invalidate();
- return a;
+String operator +(const String &lhs, String &&rhs) {
+ String res;
+ auto total = lhs.length() + rhs.length();
+ if (rhs.capacity() > total) {
+ rhs.insert(0, lhs);
+ res = std::move(rhs);
+ } else {
+ res.reserve(total);
+ res += lhs;
+ res += rhs;
+ rhs.invalidate();
+ }
+
+ return res;
 }
 
-StringSumHelper &operator +(const StringSumHelper &lhs, float num) {
- StringSumHelper &a = const_cast<StringSumHelper &>(lhs);
- if (!a.concat(num))
- a.invalidate();
- return a;
+String operator +(String &&lhs, String &&rhs) {
+ String res;
+ auto total = lhs.length() + rhs.length();
+ if ((total > lhs.capacity()) && (total < rhs.capacity())) {
+ rhs.insert(0, lhs);
+ res = std::move(rhs);
+ } else {
+ lhs += rhs;
+ rhs.invalidate();
+ res = std::move(lhs);
+ }
+
+ return res;
 }
 
-StringSumHelper &operator +(const StringSumHelper &lhs, double num) {
- StringSumHelper &a = const_cast<StringSumHelper &>(lhs);
- if (!a.concat(num))
- a.invalidate();
- return a;
+String operator +(char lhs, const String &rhs) {
+ String res;
+ res.reserve(rhs.length() + 1);
+ res += lhs;
+ res += rhs;
+ return res;
 }
 
-StringSumHelper &operator +(const StringSumHelper &lhs, const __FlashStringHelper *rhs) {
- StringSumHelper &a = const_cast<StringSumHelper &>(lhs);
- if (!a.concat(rhs))
- a.invalidate();
- return a;
+String operator +(const char *lhs, const String &rhs) {
+ String res;
+ res.reserve(strlen_P(lhs) + rhs.length());
+ res += lhs;
+ res += rhs;
+ return res;
 }
 
 /*********************************************/