Merge pull request #11 from esp8266/esp8266

Esp8266

Author: me-no-dev

.gitignore

@@ -13,7 +13,7 @@ hardware/arduino/bootloaders/caterina_LUFA/Caterina.lss
 hardware/arduino/bootloaders/caterina_LUFA/Caterina.elf
 hardware/arduino/bootloaders/caterina_LUFA/Caterina.eep
 hardware/arduino/bootloaders/caterina_LUFA/.dep/
-build/libastylej-*.zip
+build/*.zip
 build/windows/work/
 build/windows/*.zip
 build/windows/*.tgz
@@ -56,6 +56,9 @@ avr-toolchain-*.zip
 /hardware/tools/esp8266/utils/
 /hardware/tools/esp8266/xtensa-lx106-elf
 /hardware/tools/esp8266/esptool.exe
+/hardware/esp8266com/esp8266/tools/xtensa*
+/hardware/esp8266com/esp8266/tools/esptool*
+/hardware/esp8266com/esp8266/tools/utils
 /hardware/tools/avr/
 /hardware/tools/gcc-arm-none-eabi-4.8.3-2014q1/
 /hardware/tools/bossac.exe

boards.txt

@@ -21,13 +21,7 @@ generic.build.board=ESP8266_ESP01
 generic.build.core=esp8266
 generic.build.variant=generic
 generic.build.flash_mode=qio
-generic.build.flash_size=512K
-generic.build.flash_freq=40
-generic.build.flash_ld=eagle.flash.512k.ld
-generic.build.spiffs_start=0x6B000
-generic.build.spiffs_end=0x7B000
 generic.build.spiffs_pagesize=256
-generic.build.spiffs_blocksize=4096
 
 generic.menu.CpuFrequency.80=80 MHz
 generic.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -123,10 +117,10 @@ generic.menu.FlashSize.4M.upload.maximum_size=1044464
 # generic.menu.FlashSize.16M.build.spiffs_end=0x1000000
 # generic.menu.FlashSize.16M.build.spiffs_blocksize=8192
 
-# generic.menu.FlashFreq.40=40MHz
-# generic.menu.FlashFreq.40.build.flash_freq=40
-# generic.menu.FlashFreq.80=80MHz
-# generic.menu.FlashFreq.80.build.flash_freq=80
+generic.menu.FlashFreq.40=40MHz
+generic.menu.FlashFreq.40.build.flash_freq=40
+generic.menu.FlashFreq.80=80MHz
+generic.menu.FlashFreq.80.build.flash_freq=80
 
 ##############################################################
 modwifi.name=Olimex MOD-WIFI-ESP8266(-DEV)

cores/esp8266/Arduino.h

@@ -143,13 +143,13 @@ void ets_intr_unlock();
 // level 15 will disable ALL interrupts, 
 // level 0 will disable most software interrupts
 //
-#define xt_disable_interrupts(state, level) __asm__ __volatile__("rsil %0," __STRINGIFY(level) "; esync; isync; dsync" : "=a" (state))
-#define xt_enable_interrupts(state)  __asm__ __volatile__("wsr %0,ps; esync" :: "a" (state) : "memory")
+#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")
 
 extern uint32_t interruptsState;
 
 #define interrupts() xt_enable_interrupts(interruptsState)
-#define noInterrupts() __asm__ __volatile__("rsil %0,15; esync; isync; dsync" : "=a" (interruptsState))
+#define noInterrupts() __asm__ __volatile__("rsil %0,15" : "=a" (interruptsState))
 
 #define clockCyclesPerMicrosecond() ( F_CPU / 1000000L )
 #define clockCyclesToMicroseconds(a) ( (a) / clockCyclesPerMicrosecond() )
@@ -195,6 +195,7 @@ unsigned long micros(void);
 void delay(unsigned long);
 void delayMicroseconds(unsigned int us);
 unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout);
+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);
@@ -236,21 +237,24 @@ void loop(void);
 
 #define min(a,b) ((a)<(b)?(a):(b))
 #define max(a,b) ((a)>(b)?(a):(b))
+#define _min(a,b) ((a)<(b)?(a):(b))
+#define _max(a,b) ((a)>(b)?(a):(b))
 
 uint16_t makeWord(uint16_t w);
 uint16_t makeWord(byte h, byte l);
 
 #define word(...) makeWord(__VA_ARGS__)
 
 unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout = 1000000L);
+unsigned long pulseInLong(uint8_t pin, uint8_t state, unsigned long timeout = 1000000L);
 
 void tone(uint8_t _pin, unsigned int frequency, unsigned long duration = 0);
 void noTone(uint8_t _pin);
 
 // WMath prototypes
 long random(long);
 long random(long, long);
-void randomSeed(unsigned int);
+void randomSeed(unsigned long);
 long map(long, long, long, long, long);
 
 

cores/esp8266/Esp.cpp

@@ -32,7 +32,7 @@ extern struct rst_info resetInfo;
 
 // #define DEBUG_SERIAL Serial
 
-
+    
 /**
  * User-defined Literals
  *  usage:
@@ -97,8 +97,8 @@ void EspClass::wdtFeed(void)
 
 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);
 }
 
 extern "C" void esp_yield();
@@ -280,8 +280,8 @@ uint32_t EspClass::getFlashChipSizeByChipId(void) {
 
 String EspClass::getResetInfo(void) {
     if(resetInfo.reason != 0) {
-        char buff[150];
-        sprintf(&buff[0], "Fatal exception:%d flag:%d epc1:0x%08x epc2:0x%08x epc3:0x%08x excvaddr:0x%08x depc:0x%08x", resetInfo.exccause, resetInfo.reason, resetInfo.epc1, resetInfo.epc2, resetInfo.epc3, resetInfo.excvaddr, resetInfo.depc);
+        char buff[200];
+        sprintf(&buff[0], "Fatal exception:%d flag:%d (%s) epc1:0x%08x epc2:0x%08x epc3:0x%08x excvaddr:0x%08x depc:0x%08x", resetInfo.exccause, resetInfo.reason, (resetInfo.reason == 0 ? "DEFAULT" : resetInfo.reason == 1 ? "WDT" : resetInfo.reason == 2 ? "EXCEPTION" : resetInfo.reason == 3 ? "SOFT_WDT" : resetInfo.reason == 4 ? "SOFT_RESTART" : resetInfo.reason == 5 ? "DEEP_SLEEP_AWAKE" : "???"), resetInfo.epc1, resetInfo.epc2, resetInfo.epc3, resetInfo.excvaddr, resetInfo.depc);
         return String(buff);
     }
     return String("flag: 0");
@@ -400,6 +400,13 @@ bool EspClass::updateSketch(Stream& in, uint32_t size) {
             return false;
         }
 
+        if(addr == freeSpaceStart) {
+            // check for valid first magic byte
+            if(*((uint8 *) buffer.get()) != 0xE9) {
+                return false;
+            }
+        }
+
         noInterrupts();
         rc = SPIWrite(addr, buffer.get(), willRead);
         interrupts();
@@ -426,7 +433,7 @@ bool EspClass::updateSketch(Stream& in, uint32_t size) {
     ebcmd.args[1] = 0x00000;
     ebcmd.args[2] = size;
     eboot_command_write(&ebcmd);
-    
+
     ESP.restart();
     return true; // never happens
 }

cores/esp8266/Esp.h

@@ -129,7 +129,7 @@ class EspClass {
 uint32_t EspClass::getCycleCount()
 {
     uint32_t ccount;
-    __asm__ __volatile__("rsr %0,ccount":"=a" (ccount));
+    __asm__ __volatile__("esync; rsr %0,ccount":"=a" (ccount));
     return ccount;
 }
 

cores/esp8266/HardwareSerial.cpp

@@ -620,6 +620,7 @@ size_t HardwareSerial::write(uint8_t c) {
 
     while(_tx_buffer->room() == 0) {
         yield();
+        uart_arm_tx_interrupt(_uart);
     }
 
     _tx_buffer->write(c);

cores/esp8266/Print.cpp

@@ -127,8 +127,7 @@ size_t ICACHE_FLASH_ATTR Print::print(const Printable& x) {
 }
 
 size_t ICACHE_FLASH_ATTR Print::println(void) {
-    size_t n = print("\r\n");
-    return n;
+    return print("\r\n");
 }
 
 size_t ICACHE_FLASH_ATTR Print::println(const String &s) {

cores/esp8266/Stream.h

@@ -69,6 +69,8 @@ class Stream: public Print {
         }
         // returns true if target string is found, false if timed out
 
+        bool find(char target) { return find (&target, 1); }
+
         bool findUntil(const char *target, const char *terminator);   // as find but search ends if the terminator string is found
         bool findUntil(const uint8_t *target, const char *terminator) {
             return findUntil((char *) target, terminator);

cores/esp8266/WMath.cpp

@@ -27,7 +27,7 @@ extern "C" {
 #include <stdlib.h>
 }
 
-void randomSeed(unsigned int seed) {
+void randomSeed(unsigned long seed) {
     if(seed != 0) {
         srand(seed);
     }

cores/esp8266/cbuf.h

@@ -39,8 +39,12 @@ class cbuf {
         }
 
         size_t room() const {
-            if(_end >= _begin) return _size - (_end - _begin) - 1;
-
+            if(_end >= _begin) {
+                return _size - (_end - _begin) - 1;
+            }
+            if(_begin == _end) {
+                return _size;
+            }
             return _begin - _end - 1;
         }
 

cores/esp8266/core_esp8266_main.cpp

@@ -121,9 +121,10 @@ void init_done() {
 
 extern "C" {
 void user_init(void) {
-    system_rtc_mem_read(0, &resetInfo, sizeof(struct rst_info));
-    struct rst_info info = { 0 };
-    system_rtc_mem_write(0, &info, sizeof(struct rst_info));
+    struct rst_info *rtc_info_ptr = system_get_rst_info();
+
+    memcpy((void *) &resetInfo, (void *) rtc_info_ptr, sizeof(resetInfo));
+
 
     uart_div_modify(0, UART_CLK_FREQ / (115200));
 

cores/esp8266/core_esp8266_phy.c

@@ -201,6 +201,17 @@ static uint8_t phy_init_data[128] =
     // 18<=x<=36: use input voltage,  
     // the value is voltage*10, 33 is 3.3V, 30 is 3.0V,
     // x<18 or x>36: default voltage is 3.3V
+    //
+    // the value of this byte depend from the TOUT pin usage (1 or 2):
+    // 1) 
+    // analogRead function (system_adc_read()):
+    // is only available when wire TOUT pin17 to external circuitry, Input Voltage Range restricted to 0 ~ 1.0V.
+    // For this function the vdd33_const must be set as real power voltage of VDD3P3 pin 3 and 4
+    // The range of operating voltage of ESP8266 is 1.8V~3.6V，the unit of vdd33_const is 0.1V，so effective value range of vdd33_const is [18,36]
+    // 2) 
+    // getVcc function (system_get_vdd33):
+    // is only available when TOUT pin17 is suspended (floating), this function measure the power voltage of VDD3P3 pin 3 and 4
+    // For this function the vdd33_const must be set to 255 (0xFF).
     [107] = 33,
 
     // disable RF calibration for certain number of times

cores/esp8266/core_esp8266_wiring_pulse.c

@@ -30,3 +30,7 @@ unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout) {
   while(digitalRead(pin) == state && (micros() - start) < timeout);
   return micros() - start;
 }
+
+unsigned long pulseInLong(uint8_t pin, uint8_t state, unsigned long timeout) {
+    return pulseIn(pin, state, timeout);
+}

doc/eclipse/1_Install_New_Software.png

@@ -0,0 +1,38 @@
+using Eclipse with Arduino ESP8266
+===========================================
+
+### What to Download ###
+- [arduino IDE](https://www.arduino.cc/en/Main/Software)
+- [Eclipse IDE for C/C++ Developers](http://www.eclipse.org/downloads/packages/eclipse-ide-cc-developers/marsr)
+- [Java](http://www.java.com/)
+
+### Setup Arduino ###
+ see the [Readme](https://github.com/esp8266/Arduino#installing-with-boards-manager)
+ 
+### Setup Eclipse ###
+- [step 1](http://www.baeyens.it/eclipse/how_to.shtml#/c)
+- [step 2](http://www.baeyens.it/eclipse/how_to.shtml#/e)
+- go to Window --> preferences --> Arduino
+- add as private hardware path the Part to the ESP8266 
+
+###### example private hardware path
+	Windows: C:\Users\[username]\AppData\Roaming\Arduino15\packages\esp8266\hardware
+	Linux: /home/[username]/.arduino15/packages/esp8266/hardware
+
+### Eclipse wont build ###
+if eclipse dont find the path to the Compiler add to the platform.txt 
+after:
+```
+version=1.6.4
+```
+this:
+```
+runtime.tools.xtensa-lx106-elf-gcc.path={runtime.platform.path}/../../../tools/xtensa-lx106-elf-gcc/1.20.0-26-gb404fb9
+runtime.tools.esptool.path={runtime.platform.path}/../../../tools/esptool/0.4.4
+```
+Note: 
+ - the path may changed, check the current version.
+ - each update over the Arduino IDE will remove the fix
+ - may not needed in future if Eclipse Plugin get an Update
+
+ 

doc/eclipse/2_Install_software.png

@@ -0,0 +1,34 @@
+#include <ESP8266WiFi.h>
+#include <DNSServer.h>
+#include <ESP8266WebServer.h>
+
+const byte DNS_PORT = 53;
+IPAddress apIP(192, 168, 1, 1);
+DNSServer dnsServer;
+ESP8266WebServer webServer(80);
+
+String responseHTML = ""
+  "<!DOCTYPE html><html><head><title>CaptivePortal</title></head><body>"
+  "<h1>Hello World!</h1><p>This is a captive portal example. All requests will "
+  "be redirected here.</p></body></html>";
+
+void setup() {
+  WiFi.mode(WIFI_AP);
+  WiFi.softAPConfig(apIP, apIP, IPAddress(255, 255, 255, 0));
+  WiFi.softAP("DNSServer CaptivePortal example");
+
+  // if DNSServer is started with "*" for domain name, it will reply with
+  // provided IP to all DNS request
+  dnsServer.start(DNS_PORT, "*", apIP);
+
+  // replay to all requests with same HTML
+  webServer.onNotFound([]() {
+    webServer.send(200, "text/html", responseHTML);
+  });
+  webServer.begin();
+}
+
+void loop() {
+  dnsServer.processNextRequest();
+  webServer.handleClient();
+}

doc/eclipse/eclipse.md

@@ -1,9 +1,11 @@
 #include <ESP8266WiFi.h>
 #include <DNSServer.h>
+#include <ESP8266WebServer.h>
 
 const byte DNS_PORT = 53;
 IPAddress apIP(192, 168, 1, 1);
 DNSServer dnsServer;
+ESP8266WebServer webServer(80);
 
 void setup() {
   WiFi.mode(WIFI_AP);
@@ -19,10 +21,21 @@ void setup() {
   // default is DNSReplyCode::NonExistentDomain
   dnsServer.setErrorReplyCode(DNSReplyCode::ServerFailure);
 
-  //start DNS server for a specific domain name
+  // start DNS server for a specific domain name
   dnsServer.start(DNS_PORT, "www.example.com", apIP);
+
+  // simple HTTP server to see that DNS server is working
+  webServer.onNotFound([]() {
+    String message = "Hello World!\n\n";
+    message += "URI: ";
+    message += webServer.uri();
+
+    webServer.send(200, "text/plain", message);
+  });
+  webServer.begin();
 }
 
 void loop() {
   dnsServer.processNextRequest();
+  webServer.handleClient();
 }

libraries/DNSServer/examples/CaptivePortal/CaptivePortal.ino

@@ -1,5 +1,5 @@
 name=DNSServer
-version=1.0.0
+version=1.1.0
 author=Kristijan Novoselić
 maintainer=Kristijan Novoselić, <[email protected]>
 sentence=A simple DNS server for ESP8266.

libraries/DNSServer/examples/DNSServer/DNSServer.ino

@@ -54,7 +54,8 @@ void DNSServer::processNextRequest()
     if (_dnsHeader->QR == DNS_QR_QUERY &&
         _dnsHeader->OPCode == DNS_OPCODE_QUERY &&
         requestIncludesOnlyOneQuestion() &&
-        getDomainNameWithoutWwwPrefix() == _domainName)
+        (_domainName == "*" || getDomainNameWithoutWwwPrefix() == _domainName)
+       )
     {
       replyWithIP();
     }

libraries/DNSServer/library.properties

@@ -27,7 +27,7 @@ struct DNSHeader
   unsigned char AA : 1;      // authoritive answer
   unsigned char OPCode : 4;  // message_type
   unsigned char QR : 1;      // query/response flag
-  unsigned char RCode : 4;    // response code
+  unsigned char RCode : 4;   // response code
   unsigned char Z : 3;       // its z! reserved
   unsigned char RA : 1;      // recursion available
   uint16_t QDCount;          // number of question entries
@@ -62,7 +62,6 @@ class DNSServer
     uint32_t _ttl;
     DNSReplyCode _errorReplyCode;
 
-
     void downcaseAndRemoveWwwPrefix(String &domainName);
     String getDomainNameWithoutWwwPrefix();
     bool requestIncludesOnlyOneQuestion();