Merge remote-tracking branch 'esp8266/master'

cores/esp8266/core_esp8266_phy.c

@@ -24,7 +24,9 @@
  #include <stddef.h>
  #include <stdbool.h>
 
-static uint8_t phy_init_data[128] =
+#include "c_types.h"
+
+static const uint8_t ICACHE_FLASH_ATTR phy_init_data[128] =
 {
     [0] = 5,  // Reserved, do not change
     [1] = 0,  // Reserved, do not change
@@ -241,9 +243,12 @@ static uint8_t phy_init_data[128] =
 };
 
 extern int __real_register_chipv6_phy(uint8_t* init_data);
-extern int __wrap_register_chipv6_phy(uint8_t* unused) {
+extern int __wrap_register_chipv6_phy(uint8_t* init_data) {
-    phy_init_data[107] = __get_adc_mode();
+    if (init_data != NULL) {
-    return __real_register_chipv6_phy(phy_init_data);
+      memcpy(init_data, phy_init_data, sizeof(phy_init_data));
+      init_data[107] = __get_adc_mode();
+    }
+    return __real_register_chipv6_phy(init_data);
 }
 
 extern int __get_rf_mode(void)  __attribute__((weak));

cores/esp8266/spiffs_api.cpp

@@ -495,7 +495,7 @@ static bool isSpiffsFilenameValid(const char* name) {
     if (name == nullptr)
         return false;
     auto len = strlen(name);
-    return len > 0 && len <= SPIFFS_OBJ_NAME_LEN;
+    return len > 0 && len < SPIFFS_OBJ_NAME_LEN;
 }
 
 // these symbols should be defined in the linker script for each flash layout

doc/filesystem.md

@@ -169,8 +169,14 @@ struct FSInfo {
 };
 ```
 
-This is the structure which may be filled using FS::info method. Field names
+This is the structure which may be filled using FS::info method.
-are self-explanatory.
+- `totalBytes` — total size of useful data on the file system
+- `usedBytes` — number of bytes used by files
+- `blockSize` — SPIFFS block size
+- `pageSize` — SPIFFS logical page size
+- `maxOpenFiles` — max number of files which may be open simultaneously
+- `maxPathLength` — max file name length (including one byte for zero termination)
+
 
 ## Directory object (Dir)
 

libraries/ESP8266WiFiMesh/examples/HelloMesh/HelloMesh.ino

@@ -1,6 +1,9 @@
 #include <ESP8266WiFi.h>
 #include <ESP8266WiFiMesh.h>
 
+unsigned int request_i = 0;
+unsigned int response_i = 0;
+
 /* Create the mesh node object */
 ESP8266WiFiMesh mesh_node = ESP8266WiFiMesh(ESP.getChipId(), manageRequest);
 
@@ -17,7 +20,9 @@ String manageRequest(String request)
 	Serial.println(request);
 
 	/* return a string to send back */
-	return String("Hello world response.");
+	char response[60];
+	sprintf(response, "Hello world response #%d from Mesh_Node%d.", response_i++, ESP.getChipId());
+	return response;
 }
 
 void setup()
@@ -39,6 +44,8 @@ void loop()
 	mesh_node.acceptRequest();
 
 	/* Scan for other nodes and send them a message */
-	mesh_node.attemptScan("Hello world request.");
+	char request[60];
+	sprintf(request, "Hello world request #%d from Mesh_Node%d.", request_i++, ESP.getChipId());
+	mesh_node.attemptScan(request);
 	delay(1000);
 }

tools/sdk/changelog.txt

@@ -1,3 +1,9 @@
+esp_iot_sdk_v1.5.0_15_12_15_p1 Release Note
+----------------------------------------
+Here is a patch based on ESP8266_NONOS_SDK_V1.5.0 solved a problem that calling espconn_abort may cause unexpected reset.
+
+Sorry for the inconvenience.
+
 esp_iot_sdk_v1.5.0_15_11_27 Release Note
 ----------------------------------------
 Resolved Issues (Bugs listed below apply to Bug Bounty Program):

tools/sdk/ld/eagle.rom.addr.v6.ld

@@ -343,5 +343,8 @@ PROVIDE ( xthal_window_spill = 0x4000e324 );
 PROVIDE ( xthal_window_spill_nw = 0x4000e320 );
 
 PROVIDE ( Te0 = 0x3fffccf0 );
+PROVIDE ( Td0 = 0x3fffd100 );
+PROVIDE ( Td4s = 0x3fffd500);
+PROVIDE ( rcons = 0x3fffd0f0);
 PROVIDE ( UartDev = 0x3fffde10 );
 PROVIDE ( flashchip = 0x3fffc714);

tools/sdk/version

@@ -1 +1 @@
-1.5.0
+1.5.0_15_12_15_p1