Skip to content

Commit dfd9a31

Browse files
igrrigrr
committed
sdk: update to v2.1.0-10-g509eae8
1 parent 526f4fb commit dfd9a31

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+782
-1101
lines changed

Diff for: ‎boards.txt

-13
Original file line numberDiff line numberDiff line change
@@ -227,19 +227,6 @@ generic.menu.DebugLevel.OTA2____.build.debug_level=-DDEBUG_ESP_OTA -DDEBUG_ESP_U
227227
generic.menu.DebugLevel.all_____=All
228228
generic.menu.DebugLevel.all_____.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_TLS_MEM
229229

230-
# disabled because espressif's bootloader refuses to write above 4M
231-
# generic.menu.FlashSize.8M=8M (7M SPIFFS)
232-
# generic.menu.FlashSize.8M.build.flash_size=1M
233-
# generic.menu.FlashSize.8M.build.flash_ld=eagle.flash.8m.ld
234-
# generic.menu.FlashSize.8M.build.spiffs_start=0x100000
235-
# generic.menu.FlashSize.8M.build.spiffs_end=0x800000
236-
# generic.menu.FlashSize.8M.build.spiffs_blocksize=8192
237-
# generic.menu.FlashSize.16M=16M (15M SPIFFS)
238-
# generic.menu.FlashSize.16M.build.flash_size=1M
239-
# generic.menu.FlashSize.16M.build.flash_ld=eagle.flash.16m.ld
240-
# generic.menu.FlashSize.16M.build.spiffs_start=0x100000
241-
# generic.menu.FlashSize.16M.build.spiffs_end=0x1000000
242-
# generic.menu.FlashSize.16M.build.spiffs_blocksize=8192
243230

244231
##############################################################
245232
# ESP8285 chip has built-in 1MB flash

Diff for: ‎libraries/ESP8266WiFi/src/ESP8266WiFiScan.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -294,15 +294,15 @@ void ESP8266WiFiScanClass::_scanDone(void* result, int status) {
294294
int i = 0;
295295
bss_info* head = reinterpret_cast<bss_info*>(result);
296296

297-
for(bss_info* it = head; it; it = it->next, ++i)
297+
for(bss_info* it = head; it; it = STAILQ_NEXT(it, next), ++i)
298298
;
299299
ESP8266WiFiScanClass::_scanCount = i;
300300
if(i == 0) {
301301
ESP8266WiFiScanClass::_scanResult = 0;
302302
} else {
303303
bss_info* copied_info = new bss_info[i];
304304
i = 0;
305-
for(bss_info* it = head; it; it = it->next, ++i) {
305+
for(bss_info* it = head; it; it = STAILQ_NEXT(it, next), ++i) {
306306
memcpy(copied_info + i, it, sizeof(bss_info));
307307
}
308308

Diff for: ‎tools/sdk/License

+8-12
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
1-
ESPRSSIF MIT License
1+
ESPRESSIF MIT License
22

33
Copyright (c) 2015 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
44

5-
Permission is hereby granted for use on ESPRESSIF SYSTEMS ESP8266 only, in which case, it is free of charge, to any person obtaining a copy of this software and associated documentation files (the ��Software��), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
5+
Permission is hereby granted for use on ESPRESSIF SYSTEMS ESP8266 only, in which case, it is free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
66

77
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
88

9-
THE SOFTWARE IS PROVIDED ��AS IS��, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
9+
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1010

1111

12-
���� MIT ����֤
13-
14-
��Ȩ (c) 2015 <������Ϣ�Ƽ����Ϻ������޹�˾>
15-
16-
������֤��Ȩ������������Ϣ�Ƽ� ESP8266 ��Ʒ��Ӧ�ÿ������ڴ�����£�������֤�����Ȩ�κλ�ø�������������ĵ���ͳ��Ϊ�������������������Ƶؾ�Ӫ�����������������Ƶ�ʹ�á����ơ��޸ġ��ϲ������淢�С�ɢ��������Ȩ������������������������Ȩ��������Ȩ����������ЩȨ����ͬʱ������������������
17-
18-
�����������������и����ж�����������ϵİ�Ȩ��������Ȩ������
19-
20-
�������������������ṩ��û���κ���ȷ�򰵺��ĵ������������������ڹ��������ԡ��ʺ�ijһ�ض���;�ͷ���Ȩ�ı�֤�����ߺͰ�Ȩ���������κ�����¾�����������������ʹ��������Ժ�ͬ��ʽ��������Ȩ��������ʽ������κ����⡢�𺦻��������θ���
12+
乐鑫 MIT 许可证
2113

14+
版权 (c) 2015 <乐鑫信息科技（上海）有限公司>
2215

16+
该许可证授权仅限于乐鑫信息科技 ESP8266 产品的应用开发。在此情况下，该许可证免费授权任何获得该软件及其相关文档（统称为“软件”）的人无限制地经营该软件，包括无限制的使用、复制、修改、合并、出版发行、散布、再授权、及贩售软件及软件副本的权利。被授权人在享受这些权利的同时，需服从下面的条件：
2317

18+
在软件和软件的所有副本中都必须包含以上的版权声明和授权声明。
2419

20+
该软件按本来的样子提供，没有任何明确或暗含的担保，包括但不仅限于关于试销性、适合某一特定用途和非侵权的保证。作者和版权持有人在任何情况下均不就由软件或软件使用引起的以合同形式、民事侵权或其它方式提出的任何索赔、损害或其它责任负责。

0 commit comments

Comments
 (0)