Merge branch 'master' into WiFiOffAtBoot

Author: d-a-v

boards.txt

@@ -26,15 +26,15 @@
 class Client: public Stream {
 
  public:
- virtual int connect(IPAddress ip, uint16_t port) =0;
- virtual int connect(const char *host, uint16_t port) =0;
- virtual size_t write(uint8_t) =0;
- virtual size_t write(const uint8_t *buf, size_t size) =0;
- virtual int available() = 0;
- virtual int read() = 0;
- virtual int read(uint8_t *buf, size_t size) = 0;
- virtual int peek() = 0;
- virtual void flush() = 0;
+ virtual int connect(IPAddress ip, uint16_t port) = 0;
+ virtual int connect(const char *host, uint16_t port) = 0;
+ virtual size_t write(uint8_t) override = 0;
+ virtual size_t write(const uint8_t *buf, size_t size) override = 0;
+ virtual int available() override = 0;
+ virtual int read() override = 0;
+ virtual int read(uint8_t *buf, size_t size) override = 0;
+ virtual int peek() override = 0;
+ virtual void flush() override = 0;
  virtual void stop() = 0;
  virtual uint8_t connected() = 0;
  virtual operator bool() = 0;

bootloaders/eboot/eboot.elf

@@ -29,7 +29,6 @@
 
 #include "coredecls.h"
 #include "umm_malloc/umm_malloc.h"
-// #include "core_esp8266_vm.h"
 #include <pgmspace.h>
 #include "reboot_uart_dwnld.h"
 
@@ -984,22 +983,11 @@ String EspClass::getSketchMD5()
  return result;
 }
 
-void EspClass::enableVM()
-{
-#ifdef UMM_HEAP_EXTERNAL
- if (!vmEnabled)
- install_vm_exception_handler();
- vmEnabled = true;
-#endif
-}
-
 void EspClass::setExternalHeap()
 {
 #ifdef UMM_HEAP_EXTERNAL
- if (vmEnabled) {
- if (!umm_push_heap(UMM_HEAP_EXTERNAL)) {
- panic();
- }
+ if (!umm_push_heap(UMM_HEAP_EXTERNAL)) {
+ panic();
  }
 #endif
 }
@@ -1016,10 +1004,8 @@ void EspClass::setIramHeap()
 void EspClass::setDramHeap()
 {
 #if defined(UMM_HEAP_EXTERNAL) && !defined(UMM_HEAP_IRAM)
- if (vmEnabled) {
- if (!umm_push_heap(UMM_HEAP_DRAM)) {
- panic();
- }
+ if (!umm_push_heap(UMM_HEAP_DRAM)) {
+ panic();
  }
 #elif defined(UMM_HEAP_IRAM)
  if (!umm_push_heap(UMM_HEAP_DRAM)) {
@@ -1031,10 +1017,8 @@ void EspClass::setDramHeap()
 void EspClass::resetHeap()
 {
 #if defined(UMM_HEAP_EXTERNAL) && !defined(UMM_HEAP_IRAM)
- if (vmEnabled) {
- if (!umm_pop_heap()) {
- panic();
- }
+ if (!umm_pop_heap()) {
+ panic();
  }
 #elif defined(UMM_HEAP_IRAM)
  if (!umm_pop_heap()) {

cores/esp8266/Client.h

@@ -221,13 +221,6 @@ class EspClass {
 #else
  uint32_t getCycleCount();
 #endif // !defined(CORE_MOCK)
- /**
- * @brief Installs VM exception handler to support External memory (Experimental)
- *
- * @param none
- * @return none
- */
- void enableVM();
  /**
  * @brief Push current Heap selection and set Heap selection to DRAM.
  *
@@ -258,9 +251,6 @@ class EspClass {
  */
  void resetHeap();
  private:
-#ifdef UMM_HEAP_EXTERNAL
- bool vmEnabled = false;
-#endif
  /**
  * @brief Replaces @a byteCount bytes of a 4 byte block on flash
  *

cores/esp8266/Esp.cpp

@@ -66,7 +66,7 @@ int File::read() {
  return result;
 }
 
-size_t File::read(uint8_t* buf, size_t size) {
+int File::read(uint8_t* buf, size_t size) {
  if (!_p)
  return 0;
 
@@ -441,6 +441,13 @@ bool FS::rename(const String& pathFrom, const String& pathTo) {
  return rename(pathFrom.c_str(), pathTo.c_str());
 }
 
+time_t FS::getCreationTime() {
+ if (!_impl) {
+ return 0;
+ }
+ return _impl->getCreationTime();
+}
+
 void FS::setTimeCallback(time_t (*cb)(void)) {
  if (!_impl)
  return;

cores/esp8266/Esp.h

@@ -67,13 +67,14 @@ class File : public Stream
  size_t readBytes(char *buffer, size_t length) override {
  return read((uint8_t*)buffer, length);
  }
- size_t read(uint8_t* buf, size_t size);
+ int read(uint8_t* buf, size_t size) override;
  bool seek(uint32_t pos, SeekMode mode);
  bool seek(uint32_t pos) {
  return seek(pos, SeekSet);
  }
  size_t position() const;
  size_t size() const;
+ virtual ssize_t streamRemaining() override { return (ssize_t)size() - (ssize_t)position(); }
  void close();
  operator bool() const;
  const char* name() const;
@@ -84,6 +85,7 @@ class File : public Stream
  bool isDirectory() const;
 
  // Arduino "class SD" methods for compatibility
+ //TODO use stream::send / check read(buf,size) result
  template<typename T> size_t write(T &src){
  uint8_t obuf[256];
  size_t doneLen = 0;
@@ -235,6 +237,8 @@ class FS
  bool gc();
  bool check();
 
+ time_t getCreationTime();
+
  void setTimeCallback(time_t (*cb)(void));
 
  friend class ::SDClass; // More of a frenemy, but SD needs internal implementation to get private FAT bits

cores/esp8266/FS.cpp

@@ -30,7 +30,7 @@ class FileImpl {
 public:
  virtual ~FileImpl() { }
  virtual size_t write(const uint8_t *buf, size_t size) = 0;
- virtual size_t read(uint8_t* buf, size_t size) = 0;
+ virtual int read(uint8_t* buf, size_t size) = 0;
  virtual void flush() = 0;
  virtual bool seek(uint32_t pos, SeekMode mode) = 0;
  virtual size_t position() const = 0;
@@ -115,6 +115,7 @@ class FSImpl {
  virtual bool rmdir(const char* path) = 0;
  virtual bool gc() { return true; } // May not be implemented in all file systems.
  virtual bool check() { return true; } // May not be implemented in all file systems.
+ virtual time_t getCreationTime() { return 0; } // May not be implemented in all file systems.
 
  // Filesystems *may* support a timestamp per-file, so allow the user to override with
  // their own callback for all files on this FS. The default implementation simply

cores/esp8266/FS.h

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

cores/esp8266/FSImpl.h

@@ -135,16 +135,45 @@ class HardwareSerial: public Stream
  // return -1 when data is unvailable (arduino api)
  return uart_peek_char(_uart);
  }
+
+ virtual bool hasPeekBufferAPI () const override
+ {
+ return true;
+ }
+
+ // return a pointer to available data buffer (size = available())
+ // semantic forbids any kind of read() before calling peekConsume()
+ const char* peekBuffer () override
+ {
+ return uart_peek_buffer(_uart);
+ }
+
+ // return number of byte accessible by peekBuffer()
+ size_t peekAvailable () override
+ {
+ return uart_peek_available(_uart);
+ }
+
+ // consume bytes after use (see peekBuffer)
+ void peekConsume (size_t consume) override
+ {
+ return uart_peek_consume(_uart, consume);
+ }
+
  int read(void) override
  {
  // return -1 when data is unvailable (arduino api)
  return uart_read_char(_uart);
  }
  // ::read(buffer, size): same as readBytes without timeout
- size_t read(char* buffer, size_t size)
+ int read(char* buffer, size_t size)
  {
  return uart_read(_uart, buffer, size);
  }
+ int read(uint8_t* buffer, size_t size) override
+ {
+ return uart_read(_uart, (char*)buffer, size);
+ }
  size_t readBytes(char* buffer, size_t size) override;
  size_t readBytes(uint8_t* buffer, size_t size) override
  {