Merge 3b1b9744c1 into 2c29e2940a

Makefile

@@ -19,7 +19,7 @@ XTENSA_TOOLS_ROOT ?= $(abspath ../esp-open-sdk/xtensa-lx106-elf/bin)/
 
 # Base directory of the ESP8266 SDK package, absolute
 # Typically you'll download from Espressif's BBS, http://bbs.espressif.com/viewforum.php?f=5
-SDK_BASE	?= $(abspath ../esp_iot_sdk_v1.3.0)
+SDK_BASE	?= $(abspath ../esp_iot_sdk_v1.4.0)
 
 # Esptool.py path and port, only used for 1-time serial flashing
 # Typically you'll use https://github.com/themadinventor/esptool

html/console.html

@@ -20,7 +20,7 @@
 <script type="text/javascript">console_url = "/console/text"</script>
 <script src="console.js"></script>
 <script type="text/javascript">
-  var rates = [57600, 115200, 230400, 460800];
+  var rates = [9600, 57600, 115200, 250000];
 
   onLoad(function() {
     fetchText(100, true);

include/espmissingincludes.h

@@ -41,15 +41,16 @@ int os_printf(const char *format, ...)  __attribute__ ((format (printf, 1, 2)));
 int os_snprintf(char *str, size_t size, const char *format, ...) __attribute__ ((format (printf, 3, 4)));
 int os_printf_plus(const char *format, ...)  __attribute__ ((format (printf, 1, 2)));
 
+// memory allocation functions are "different" due to memory debugging functionality
+// added in SDK 1.4.0
+void vPortFree(void *ptr, char * file, int line);
+void *pvPortMalloc(size_t xWantedSize, char * file, int line);
+void *pvPortZalloc(size_t, char * file, int line);
+void *vPortMalloc(size_t xWantedSize);
 void pvPortFree(void *ptr);
-void *pvPortMalloc(size_t xWantedSize);
-void *pvPortZalloc(size_t);
+
 void uart_div_modify(int no, unsigned int freq);
-void vPortFree(void *ptr);
-void *vPortMalloc(size_t xWantedSize);
 uint32 system_get_time();
-//uint8 wifi_get_opmode(void); // defined in SDK 1.0.0 onwards
-//int os_random(); // defined in SDK 1.1.0 onwards
 int rand(void);
 void ets_bzero(void *s, size_t n);
 void ets_delay_us(int ms);
@@ -67,4 +68,12 @@ void ets_delay_us(int ms);
             |( (((FUNC&BIT2)<<2)|(FUNC&0x3))<<PERIPHS_IO_MUX_FUNC_S) );  \
     } while (0)
 
+
+// Shortcuts for memory functions
+//#define os_malloc   pvPortMalloc // defined in SDK 1.4.0 onwards
+//#define os_free     vPortFree    // defined in SDK 1.4.0 onwards
+//#define os_zalloc   pvPortZalloc // defined in SDK 1.4.0 onwards
+//uint8 wifi_get_opmode(void); // defined in SDK 1.0.0 onwards
+//int os_random();             // defined in SDK 1.1.0 onwards
+
 #endif