Merge branch 'master' into espino-support

Rodmg · Rodmg · commit 516339149207 · 2015-12-07T17:42:44.000-06:00
diff --git a/cores/esp8266/Arduino.h b/cores/esp8266/Arduino.h
@@ -219,14 +219,12 @@ void loop(void);
 void yield(void);
 void optimistic_yield(uint32_t interval_us);
 
-// Get the bit location within the hardware port of the given virtual pin.
-// This comes from the pins_*.c file for the active board configuration.
 #define digitalPinToPort(pin)       (0)
 #define digitalPinToBitMask(pin)    (1UL << (pin))
 #define digitalPinToTimer(pin)      (0)
-#define portOutputRegister(port)    ((volatile uint32_t*) GPO)
-#define portInputRegister(port)     ((volatile uint32_t*) GPI)
-#define portModeRegister(port)      ((volatile uint32_t*) GPE)
+#define portOutputRegister(port)    ((volatile uint32_t*) &GPO)
+#define portInputRegister(port)     ((volatile uint32_t*) &GPI)
+#define portModeRegister(port)      ((volatile uint32_t*) &GPE)
 
 #define NOT_A_PIN -1
 #define NOT_A_PORT -1
diff --git a/cores/esp8266/HardwareSerial.cpp b/cores/esp8266/HardwareSerial.cpp
@@ -617,18 +617,15 @@ size_t HardwareSerial::write(uint8_t c) {
     size_t room = uart_get_tx_fifo_room(_uart);
     if(room > 0 && _tx_buffer->empty()) {
         uart_transmit_char(_uart, c);
-        if(room < 10) {
-            uart_arm_tx_interrupt(_uart);
-        }
         return 1;
     }
 
     while(_tx_buffer->room() == 0) {
         yield();
-        uart_arm_tx_interrupt(_uart);
     }
 
     _tx_buffer->write(c);
+    uart_arm_tx_interrupt(_uart);
     return 1;
 }
 
diff --git a/cores/esp8266/Updater.h b/cores/esp8266/Updater.h
@@ -26,7 +26,7 @@ class UpdaterClass {
       Call this to check the space needed for the update
       Will return false if there is not enough space
     */
-    bool begin(size_t size, int = U_FLASH);
+    bool begin(size_t size, int command = U_FLASH);
 
     /*
       Writes a buffer to the flash and increments the address
diff --git a/cores/esp8266/abi.cpp b/cores/esp8266/abi.cpp
@@ -68,6 +68,10 @@ void __throw_length_error(char const*) {
 void __throw_bad_alloc() {
     panic();
 }
+
+void __throw_logic_error(const char* str) {
+    panic();
+}
 }
 
 // TODO: rebuild windows toolchain to make this unnecessary:
diff --git a/cores/esp8266/cbuf.h b/cores/esp8266/cbuf.h
@@ -42,9 +42,6 @@ class cbuf {
             if(_end >= _begin) {
                 return _size - (_end - _begin) - 1;
             }
-            if(_begin == _end) {
-                return _size;
-            }
             return _begin - _end - 1;
         }
 
@@ -62,7 +59,7 @@ class cbuf {
             if(getSize() == 0) return -1;
 
             char result = *_begin;
-            if(++_begin == _bufend) _begin = _buf;
+            _begin = wrap_if_bufend(_begin + 1);
             return static_cast<int>(result);
         }
 
@@ -78,16 +75,15 @@ class cbuf {
                 dst += top_size;
             }
             memcpy(dst, _begin, size_to_read);
-            _begin += size_to_read;
-            if(_begin == _bufend) _begin = _buf;
+            _begin = wrap_if_bufend(_begin + size_to_read);
             return size_read;
         }
 
         size_t write(char c) {
             if(room() == 0) return 0;
 
             *_end = c;
-            if(++_end == _bufend) _end = _buf;
+            _end = wrap_if_bufend(_end + 1);
             return 1;
         }
 
@@ -103,8 +99,7 @@ class cbuf {
                 src += top_size;
             }
             memcpy(_end, src, size_to_write);
-            _end += size_to_write;
-            if(_end == _bufend) _end = _buf;
+            _end = wrap_if_bufend(_end + size_to_write);
             return size_written;
         }
 
@@ -114,6 +109,10 @@ class cbuf {
         }
 
     private:
+        inline char* wrap_if_bufend(char* ptr) {
+            return (ptr == _bufend) ? _buf : ptr;
+        }
+
         size_t _size;
         char* _buf;
         char* _bufend;
diff --git a/cores/esp8266/esp8266_peri.h b/cores/esp8266/esp8266_peri.h
@@ -494,7 +494,7 @@ extern uint8_t esp8266_gpioToFn[16];
 
 //SPI Phase Length Locations
 #define SPILCOMMAND	28 //4 bit in SPIxU2 default 7 (8bit)
-#define SPILADDR	16 //6 bit in SPIxU1 default:23 (24bit)
+#define SPILADDR	26 //6 bit in SPIxU1 default:23 (24bit)
 #define SPILDUMMY	0  //8 bit in SPIxU1 default:0 (0 cycles)
 #define SPILMISO	8  //9 bit in SPIxU1 default:0 (1bit)
 #define SPILMOSI	17 //9 bit in SPIxU1 default:0 (1bit)
diff --git a/cores/esp8266/pgmspace.h b/cores/esp8266/pgmspace.h
@@ -78,7 +78,7 @@ int	vsnprintf_P(char *str, size_t strSize, PGM_P formatP, va_list ap) __attribut
 (__extension__({                                                               \
     PGM_P __local = (PGM_P)(addr);  /* isolate varible for macro expansion */         \
     ptrdiff_t __offset = ((uint32_t)__local & 0x00000003); /* byte aligned mask */            \
-    const uint32_t* __addr32 = reinterpret_cast<const uint32_t*>(reinterpret_cast<const uint8_t*>(__local)-__offset);   \
+    const uint32_t* __addr32 = (const uint32_t*)((const uint8_t*)(__local)-__offset); \
     uint8_t __result = ((*__addr32) >> (__offset * 8));                        \
     __result;                                                                  \
 }))
@@ -87,7 +87,7 @@ int	vsnprintf_P(char *str, size_t strSize, PGM_P formatP, va_list ap) __attribut
 (__extension__({                                                               \
     PGM_P __local = (PGM_P)(addr); /* isolate varible for macro expansion */          \
     ptrdiff_t __offset = ((uint32_t)__local & 0x00000002);   /* word aligned mask */          \
-    const uint32_t* __addr32 = reinterpret_cast<const uint32_t*>(reinterpret_cast<const uint8_t*>(__local) - __offset); \
+    const uint32_t* __addr32 = (const uint32_t*)((const uint8_t*)(__local) - __offset); \
     uint16_t __result = ((*__addr32) >> (__offset * 8));                       \
     __result;                                                                  \
 }))	
diff --git a/cores/esp8266/spiffs_api.cpp b/cores/esp8266/spiffs_api.cpp
@@ -410,6 +410,17 @@ class SPIFFSDirImpl : public DirImpl {
 FileImplPtr SPIFFSImpl::open(const char* path, OpenMode openMode, AccessMode accessMode) {
     int mode = getSpiffsMode(openMode, accessMode);
     int fd = SPIFFS_open(&_fs, path, mode, 0);
+    if (fd < 0 && _fs.err_code == SPIFFS_ERR_DELETED && (openMode & OM_CREATE)) {
+        DEBUGV("SPIFFSImpl::open: fd=%d path=`%s` openMode=%d accessMode=%d err=%d, trying to remove\r\n",
+            fd, path, openMode, accessMode, _fs.err_code);
+        auto rc = SPIFFS_remove(&_fs, path);
+        if (rc != SPIFFS_OK) {
+            DEBUGV("SPIFFSImpl::open: SPIFFS_ERR_DELETED, but failed to remove path=`%s` openMode=%d accessMode=%d err=%d\r\n",
+                path, openMode, accessMode, _fs.err_code);
+            return FileImplPtr();
+        }
+        fd = SPIFFS_open(&_fs, path, mode, 0);
+    }
     if (fd < 0) {
         DEBUGV("SPIFFSImpl::open: fd=%d path=`%s` openMode=%d accessMode=%d err=%d\r\n",
             fd, path, openMode, accessMode, _fs.err_code);
diff --git a/doc/eclipse/makefile.init b/doc/eclipse/makefile.init
@@ -0,0 +1,39 @@
+vecho := @echo
+Q := @
+
+PROJECT_NAME=project_name
+
+OTA_IP=192.168.254.100
+OTA_PORT=8266
+
+SERIAL_PORT=COM3
+SERIAL_BAUD=230400
+
+ARDUINO_BASE      = D:/Coding/avr/Programme/arduino-nightly
+ESP8266_BASE      = $(ARDUINO_BASE)/hardware/esp8266com/esp8266
+ESP8266_TOOLS     = $(ESP8266_BASE)/tools
+XTENSA_TOOLS_ROOT = $(ESP8266_TOOLS)/xtensa-lx106-elf/bin
+
+PYTHON_BIN        = python
+ESPTOOL_PY_BIN    = $(ESP8266_TOOLS)/esptool.py
+ESPOTA_PY_BIN     = $(ESP8266_TOOLS)/espota.py
+ESPTOOL_BIN       = $(ESP8266_TOOLS)/esptool/esptool.exe
+
+ota:
+    $(vecho) ota...
+    $(PYTHON_BIN) $(ESPOTA_PY_BIN) -i $(OTA_IP) -p $(OTA_PORT) --auth= -f ./$(PROJECT_NAME).bin
+    
+ota_spiffs:
+    $(vecho) ota spiffs...
+    $(PYTHON_BIN) $(ESPOTA_PY_BIN) -i $(OTA_IP) -p $(OTA_PORT) --auth= -s -f ./$(PROJECT_NAME)_spiffs.bin
+        
+erase_flash:
+    $(vecho) "Erase Flash"
+    $(PYTHON_BIN) $(ESPTOOL_PY_BIN) -p $(SERIAL_PORT) -b $(SERIAL_BAUD) erase_flash    
+    
+dumpmem:     
+    $(vecho) "Read Flash need some time..."                                     
+    $(PYTHON_BIN) $(ESPTOOL_PY_BIN) -p $(SERIAL_PORT) -b $(SERIAL_BAUD) read_flash 0 4194304 dump.bin
+
+objdump:
+    "$(XTENSA_TOOLS_ROOT)/xtensa-lx106-elf-objdump" -S $(PROJECT_NAME).elf > $(PROJECT_NAME).dobj
diff --git a/libraries/ESP8266WiFi/examples/WiFiClient/WiFiClient.ino b/libraries/ESP8266WiFi/examples/WiFiClient/WiFiClient.ino
@@ -71,7 +71,14 @@ void loop() {
   client.print(String("GET ") + url + " HTTP/1.1\r\n" +
                "Host: " + host + "\r\n" + 
                "Connection: close\r\n\r\n");
-  delay(10);
+  int timeout = millis() + 5000;
+  while (client.available() == 0) {
+    if (timeout - millis() < 0) {
+      Serial.println(">>> Client Timeout !");
+      client.stop();
+      return;
+    }
+  }
   
   // Read all the lines of the reply from server and print them to Serial
   while(client.available()){
diff --git a/libraries/ESP8266WiFi/examples/WiFiClientBasic/WiFiClientBasic.ino b/libraries/ESP8266WiFi/examples/WiFiClientBasic/WiFiClientBasic.ino
@@ -0,0 +1,68 @@
+/*
+ *  This sketch sends a message to a TCP server
+ *
+ */
+
+#include <ESP8266WiFi.h>
+#include <ESP8266WiFiMulti.h>
+
+ESP8266WiFiMulti WiFiMulti;
+
+void setup() {
+    Serial.begin(115200);
+    delay(10);
+
+    // We start by connecting to a WiFi network
+    WiFiMulti.addAP("SSID", "passpasspass");
+
+    Serial.println();
+    Serial.println();
+    Serial.print("Wait for WiFi... ");
+
+    while(WiFiMulti.run() != WL_CONNECTED) {
+        Serial.print(".");
+        delay(500);
+    }
+
+    Serial.println("");
+    Serial.println("WiFi connected");
+    Serial.println("IP address: ");
+    Serial.println(WiFi.localIP());
+
+    delay(500);
+}
+
+
+void loop() {
+    const uint16_t port = 80;
+    const char * host = "192.168.1.1"; // ip or dns
+
+    
+    
+    Serial.print("connecting to ");
+    Serial.println(host);
+
+    // Use WiFiClient class to create TCP connections
+    WiFiClient client;
+
+    if (!client.connect(host, port)) {
+        Serial.println("connection failed");
+        Serial.println("wait 5 sec...");
+        delay(5000);
+        return;
+    }
+
+    // This will send the request to the server
+    client.print("Send this data to server");
+
+    //read back one line from server
+    String line = client.readStringUntil('\r');
+    client.println(line);
+
+    Serial.println("closing connection");
+    client.stop();
+    
+    Serial.println("wait 5 sec...");
+    delay(5000);
+}
+
diff --git a/libraries/ESP8266WiFi/src/include/UdpContext.h b/libraries/ESP8266WiFi/src/include/UdpContext.h
diff --git a/tests/FSWrapper/FSWrapper.ino b/tests/FSWrapper/FSWrapper.ino

Original file line number	Diff line number	Diff line change
`@@ -617,18 +617,15 @@ size_t HardwareSerial::write(uint8_t c) {`
`617`	`617`	`size_t room = uart_get_tx_fifo_room(_uart);`
`618`	`618`	`if(room > 0 && _tx_buffer->empty()) {`
`619`	`619`	`uart_transmit_char(_uart, c);`
`620`		`- if(room < 10) {`
`621`		`- uart_arm_tx_interrupt(_uart);`
`622`		`- }`
`623`	`620`	`return 1;`
`624`	`621`	`}`
`625`	`622`
`626`	`623`	`while(_tx_buffer->room() == 0) {`
`627`	`624`	`yield();`
`628`		`- uart_arm_tx_interrupt(_uart);`
`629`	`625`	`}`
`630`	`626`
`631`	`627`	`_tx_buffer->write(c);`
	`628`	`+ uart_arm_tx_interrupt(_uart);`
`632`	`629`	`return 1;`
`633`	`630`	`}`
`634`	`631`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,10 @@ void __throw_length_error(char const*) {`
`68`	`68`	`void __throw_bad_alloc() {`
`69`	`69`	`panic();`
`70`	`70`	`}`
	`71`	`+`
	`72`	`+void __throw_logic_error(const char* str) {`
	`73`	`+ panic();`
	`74`	`+}`
`71`	`75`	`}`
`72`	`76`
`73`	`77`	`// TODO: rebuild windows toolchain to make this unnecessary:`
Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,6 @@ class cbuf {`
`42`	`42`	`if(_end >= _begin) {`
`43`	`43`	`return _size - (_end - _begin) - 1;`
`44`	`44`	`}`
`45`		`- if(_begin == _end) {`
`46`		`- return _size;`
`47`		`- }`
`48`	`45`	`return _begin - _end - 1;`
`49`	`46`	`}`
`50`	`47`
`@@ -62,7 +59,7 @@ class cbuf {`
`62`	`59`	`if(getSize() == 0) return -1;`
`63`	`60`
`64`	`61`	`char result = *_begin;`
`65`		`- if(++_begin == _bufend) _begin = _buf;`
	`62`	`+ _begin = wrap_if_bufend(_begin + 1);`
`66`	`63`	`return static_cast<int>(result);`
`67`	`64`	`}`
`68`	`65`
`@@ -78,16 +75,15 @@ class cbuf {`
`78`	`75`	`dst += top_size;`
`79`	`76`	`}`
`80`	`77`	`memcpy(dst, _begin, size_to_read);`
`81`		`- _begin += size_to_read;`
`82`		`- if(_begin == _bufend) _begin = _buf;`
	`78`	`+ _begin = wrap_if_bufend(_begin + size_to_read);`
`83`	`79`	`return size_read;`
`84`	`80`	`}`
`85`	`81`
`86`	`82`	`size_t write(char c) {`
`87`	`83`	`if(room() == 0) return 0;`
`88`	`84`
`89`	`85`	`*_end = c;`
`90`		`- if(++_end == _bufend) _end = _buf;`
	`86`	`+ _end = wrap_if_bufend(_end + 1);`
`91`	`87`	`return 1;`
`92`	`88`	`}`
`93`	`89`
`@@ -103,8 +99,7 @@ class cbuf {`
`103`	`99`	`src += top_size;`
`104`	`100`	`}`
`105`	`101`	`memcpy(_end, src, size_to_write);`
`106`		`- _end += size_to_write;`
`107`		`- if(_end == _bufend) _end = _buf;`
	`102`	`+ _end = wrap_if_bufend(_end + size_to_write);`
`108`	`103`	`return size_written;`
`109`	`104`	`}`
`110`	`105`
`@@ -114,6 +109,10 @@ class cbuf {`
`114`	`109`	`}`
`115`	`110`
`116`	`111`	`private:`
	`112`	`+ inline char* wrap_if_bufend(char* ptr) {`
	`113`	`+ return (ptr == _bufend) ? _buf : ptr;`
	`114`	`+ }`
	`115`	`+`
`117`	`116`	`size_t _size;`
`118`	`117`	`char* _buf;`
`119`	`118`	`char* _bufend;`