Merge pull request #4 from esp8266/esp8266

pull master

Author: me-no-dev

Diff for: .travis.yml

@@ -24,6 +24,8 @@ script:
   - which arduino
   - source hardware/esp8266com/esp8266/tests/common.sh
   - arduino --board esp8266com:esp8266:generic --save-prefs
+  - arduino --get-pref sketchbook.path
+  - install_libraries
   - build_sketches arduino $PWD/hardware/esp8266com/esp8266
 
 notifications:

Diff for: boards.txt

@@ -181,7 +181,7 @@ nodemcu.name=NodeMCU 0.9 (ESP-12 Module)
 
 nodemcu.upload.tool=esptool
 nodemcu.upload.speed=115200
-nodemcu.upload.resetmethod=ck
+nodemcu.upload.resetmethod=nodemcu
 nodemcu.upload.maximum_size=1044464
 nodemcu.upload.maximum_data_size=81920
 nodemcu.upload.wait_for_upload_port=true

Diff for: cores/esp8266/Arduino.h

@@ -137,17 +137,29 @@ void timer0_detachInterrupt(void);
 void ets_intr_lock();
 void ets_intr_unlock();
 
-// level (0-15),
-// level 15 will disable ALL interrupts,
-// level 0 will disable most software interrupts
+#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
 //
-#define xt_disable_interrupts(state, level) __asm__ __volatile__("rsil %0," __STRINGIFY(level) : "=a" (state))
-#define xt_enable_interrupts(state)  __asm__ __volatile__("wsr %0,ps; isync" :: "a" (state) : "memory")
+//{
+//    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)); state;}))
+#define xt_wsr_ps(state)  __asm__ __volatile__("wsr %0,ps; isync" :: "a" (state) : "memory")
 
-extern uint32_t interruptsState;
+#define interrupts() xt_rsil(0)
+#define noInterrupts() xt_rsil(15)
 
-#define interrupts() xt_enable_interrupts(interruptsState)
-#define noInterrupts() __asm__ __volatile__("rsil %0,15" : "=a" (interruptsState))
 
 #define clockCyclesPerMicrosecond() ( F_CPU / 1000000L )
 #define clockCyclesToMicroseconds(a) ( (a) / clockCyclesPerMicrosecond() )
@@ -179,12 +191,12 @@ void initVariant(void);
 
 int atexit(void (*func)()) __attribute__((weak));
 
-void pinMode(uint8_t, uint8_t);
-void digitalWrite(uint8_t, uint8_t);
-int digitalRead(uint8_t);
-int analogRead(uint8_t);
+void pinMode(uint8_t pin, uint8_t mode);
+void digitalWrite(uint8_t pin, uint8_t val);
+int digitalRead(uint8_t pin);
+int analogRead(uint8_t pin);
 void analogReference(uint8_t mode);
-void analogWrite(uint8_t, int);
+void analogWrite(uint8_t pin, int val);
 void analogWriteFreq(uint32_t freq);
 void analogWriteRange(uint32_t range);
 
@@ -198,8 +210,8 @@ unsigned long pulseInLong(uint8_t pin, uint8_t state, unsigned long timeout);
 void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val);
 uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder);
 
-void attachInterrupt(uint8_t, void (*)(void), int mode);
-void detachInterrupt(uint8_t);
+void attachInterrupt(uint8_t pin, void (*)(void), int mode);
+void detachInterrupt(uint8_t pin);
 
 void setup(void);
 void loop(void);

Diff for: cores/esp8266/Esp.cpp

@@ -1,8 +1,8 @@
-/* 
+/*
  Esp.cpp - ESP8266-specific APIs
  Copyright (c) 2015 Ivan Grokhotkov. All rights reserved.
  This file is part of the esp8266 core for Arduino environment.
- 
+
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
  License as published by the Free Software Foundation; either
@@ -22,6 +22,7 @@
 #include "flash_utils.h"
 #include "eboot_command.h"
 #include <memory>
+#include "interrupts.h"
 
 extern "C" {
 #include "user_interface.h"
@@ -32,7 +33,7 @@ extern struct rst_info resetInfo;
 
 //#define DEBUG_SERIAL Serial
 
-    
+
 /**
  * User-defined Literals
  *  usage:
@@ -92,23 +93,25 @@ void EspClass::wdtEnable(WDTO_t timeout_ms)
 
 void EspClass::wdtDisable(void)
 {
-    /// Please don’t stop software watchdog too long (less than 6 seconds),
+    /// Please don't stop software watchdog too long (less than 6 seconds),
     /// otherwise it will trigger hardware watchdog reset.
     system_soft_wdt_stop();
 }
 
 void EspClass::wdtFeed(void)
 {
-
+    system_soft_wdt_feed();
 }
 
+extern "C" void esp_yield();
+
 void EspClass::deepSleep(uint32_t time_us, WakeMode mode)
 {
-	system_deep_sleep_set_option(static_cast<int>(mode));
- 	system_deep_sleep(time_us);
+    system_deep_sleep_set_option(static_cast<int>(mode));
+    system_deep_sleep(time_us);
+    esp_yield();
 }
 
-extern "C" void esp_yield();
 extern "C" void __real_system_restart_local();
 void EspClass::reset(void)
 {
@@ -119,13 +122,11 @@ void EspClass::restart(void)
 {
     system_restart();
     esp_yield();
-    // todo: provide an alternative code path if this was called
-    // from system context, not from continuation
-    // (implement esp_is_cont_ctx()?)
 }
 
 uint16_t EspClass::getVcc(void)
 {
+    InterruptLock lock;
     return system_get_vdd33();
 }
 
@@ -333,7 +334,7 @@ uint32_t EspClass::getSketchSize() {
     DEBUG_SERIAL.printf("num_segments=%u\r\n", image_header.num_segments);
 #endif
     for (uint32_t section_index = 0;
-        section_index < image_header.num_segments; 
+        section_index < image_header.num_segments;
         ++section_index)
     {
         section_header_t section_header = {0};
@@ -395,8 +396,7 @@ bool EspClass::updateSketch(Stream& in, uint32_t size, bool restartOnFail, bool
 
 #ifdef DEBUG_SERIAL
     DEBUG_SERIAL.println("Update SUCCESS");
-#endif  
+#endif
     if(restartOnSuccess) ESP.restart();
     return true;
 }
-

Diff for: cores/esp8266/Esp.h

@@ -1,8 +1,8 @@
-/* 
+/*
  Esp.h - ESP8266-specific APIs
  Copyright (c) 2015 Ivan Grokhotkov. All rights reserved.
  This file is part of the esp8266 core for Arduino environment.
- 
+
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
  License as published by the Free Software Foundation; either
@@ -20,6 +20,9 @@
 
 #ifndef ESP_H
 #define ESP_H
+
+#include <Arduino.h>
+
 /**
  * AVR macros for WDT managment
  */

Diff for: cores/esp8266/FS.cpp

@@ -21,6 +21,8 @@
 #include "FS.h"
 #include "FSImpl.h"
 
+using namespace fs;
+
 static bool sflags(const char* mode, OpenMode& om, AccessMode& am);
 
 size_t File::write(uint8_t c) {
@@ -41,7 +43,7 @@ int File::available() {
     if (!_p)
         return false;
 
-    return _p->position() < _p->size();
+    return _p->size() - _p->position();
 }
 
 int File::read() {
@@ -112,6 +114,13 @@ File::operator bool() const {
     return !!_p;
 }
 
+const char* File::name() const {
+    if (!_p)
+        return nullptr;
+
+    return _p->name();
+}
+
 File Dir::openFile(const char* mode) {
     if (!_impl) {
         return File();
@@ -135,6 +144,14 @@ String Dir::fileName() {
     return _impl->fileName();
 }
 
+size_t Dir::fileSize() {
+    if (!_impl) {
+        return 0;
+    }
+
+    return _impl->fileSize();
+}
+
 bool Dir::next() {
     if (!_impl) {
         return false;

Diff for: cores/esp8266/FS.h

@@ -24,6 +24,8 @@
 #include <Arduino.h>
 #include <memory>
 
+namespace fs {
+
 class File;
 class Dir;
 
@@ -64,6 +66,7 @@ class File : public Stream
     size_t size() const;
     void close();
     operator bool() const;
+    const char* name() const;
 
 protected:
     FileImplPtr _p;
@@ -75,6 +78,7 @@ class Dir {
 
     File openFile(const char* mode);
     String fileName();
+    size_t fileSize();
     bool next();
 
 protected:
@@ -102,9 +106,18 @@ class FS
 
 protected:
     FSImplPtr _impl;
-
 };
 
+} // namespace fs
+
+using fs::FS;
+using fs::File;
+using fs::Dir;
+using fs::SeekMode;
+using fs::SeekSet;
+using fs::SeekCur;
+using fs::SeekEnd;
+
 extern FS SPIFFS;
 
 #endif //FS_H

Diff for: cores/esp8266/FSImpl.h

@@ -23,6 +23,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
+namespace fs {
+
 class FileImpl {
 public:
     virtual ~FileImpl() { }
@@ -33,6 +35,7 @@ class FileImpl {
     virtual size_t position() const = 0;
     virtual size_t size() const = 0;
     virtual void close() = 0;
+    virtual const char* name() const = 0;
 };
 
 enum OpenMode {
@@ -53,6 +56,7 @@ class DirImpl {
     virtual ~DirImpl() { }
     virtual FileImplPtr openFile(OpenMode openMode, AccessMode accessMode) = 0;
     virtual const char* fileName() = 0;
+    virtual size_t fileSize() = 0;
     virtual bool next() = 0;
 };
 
@@ -66,5 +70,6 @@ class FSImpl {
 
 };
 
+} // namespace fs
 
 #endif //FSIMPL_H

Diff for: cores/esp8266/Tone.cpp

@@ -35,10 +35,12 @@
 #include "Arduino.h"
 #include "pins_arduino.h"
 
+/*
 static int8_t toneBegin(uint8_t _pin) {
     //TODO implement tone
     return 0;
 }
+*/
 
 void tone(uint8_t _pin, unsigned int frequency, unsigned long duration) {
     //TODO implement tone

Diff for: cores/esp8266/Updater.h

@@ -108,12 +108,12 @@ class UpdaterClass {
     void _reset();
     bool _writeBuffer();
 
+    uint8_t _error;
     uint8_t *_buffer;
     size_t _bufferLen;
     size_t _size;
     uint32_t _startAddress;
     uint32_t _currentAddress;
-    uint8_t _error;
 };
 
 extern UpdaterClass Update;

Diff for: cores/esp8266/cbuf.h

@@ -70,7 +70,7 @@ class cbuf {
             size_t bytes_available = getSize();
             size_t size_to_read = (size < bytes_available) ? size : bytes_available;
             size_t size_read = size_to_read;
-            if(_end < _begin && size_to_read > _bufend - _begin) {
+            if(_end < _begin && size_to_read > (size_t)(_bufend - _begin)) {
                 size_t top_size = _bufend - _begin;
                 memcpy(dst, _begin, top_size);
                 _begin = _buf;
@@ -95,7 +95,7 @@ class cbuf {
             size_t bytes_available = room();
             size_t size_to_write = (size < bytes_available) ? size : bytes_available;
             size_t size_written = size_to_write;
-            if(_end > _begin && size_to_write > _bufend - _end) {
+            if(_end > _begin && size_to_write > (size_t)(_bufend - _end)) {
                 size_t top_size = _bufend - _end;
                 memcpy(_end, src, top_size);
                 _end = _buf;

Diff for: cores/esp8266/core_esp8266_main.cpp

@@ -74,7 +74,9 @@ extern "C" void abort() {
 }
 
 extern "C" void esp_yield() {
-    cont_yield(&g_cont);
+    if (cont_can_yield(&g_cont)) {
+        cont_yield(&g_cont);
+    }
 }
 
 extern "C" void esp_schedule() {