Skip to content

Commit 386d6b1

Browse files
authored
Merge pull request #5 from esp8266/2.7.3
2.7.3
2 parents 818cb2c + 59bbfc7 commit 386d6b1

File tree

13 files changed

+159
-24
lines changed

13 files changed

+159
-24
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Arduino core for ESP8266 WiFi chip
33

44
# Quick links
55

6-
- [Latest release documentation](https://arduino-esp8266.readthedocs.io/en/2.7.1/)
6+
- [Latest release documentation](https://arduino-esp8266.readthedocs.io/en/2.7.3/)
77
- [Current "git version" documentation](https://arduino-esp8266.readthedocs.io/en/latest/)
88
- [Install git version](https://arduino-esp8266.readthedocs.io/en/latest/installing.html#using-git-version) ([sources](doc/installing.rst#using-git-version))
99

@@ -36,7 +36,7 @@ Starting with 1.6.4, Arduino allows installation of third-party platform package
3636
#### Latest release [![Latest release](https://img.shields.io/github/release/esp8266/Arduino.svg)](https://github.com/esp8266/Arduino/releases/latest/)
3737
Boards manager link: `https://arduino.esp8266.com/stable/package_esp8266com_index.json`
3838

39-
Documentation: [https://arduino-esp8266.readthedocs.io/en/2.7.1/](https://arduino-esp8266.readthedocs.io/en/2.7.1/)
39+
Documentation: [https://arduino-esp8266.readthedocs.io/en/2.7.3/](https://arduino-esp8266.readthedocs.io/en/2.7.3/)
4040

4141
### Using git version
4242
[![Linux build status](https://travis-ci.org/esp8266/Arduino.svg)](https://travis-ci.org/esp8266/Arduino)

boards.txt

+69-2
Original file line numberDiff line numberDiff line change
@@ -5458,9 +5458,76 @@ gen4iod.menu.ssl.all.build.sslflags=
54585458
gen4iod.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
54595459
gen4iod.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
54605460
gen4iod.upload.resetmethod=--before default_reset --after hard_reset
5461-
gen4iod.build.flash_mode=dio
5462-
gen4iod.build.flash_flags=-DFLASHMODE_DIO
5461+
gen4iod.menu.FlashMode.dout=DOUT (compatible)
5462+
gen4iod.menu.FlashMode.dout.build.flash_mode=dout
5463+
gen4iod.menu.FlashMode.dout.build.flash_flags=-DFLASHMODE_DOUT
5464+
gen4iod.menu.FlashMode.dio=DIO
5465+
gen4iod.menu.FlashMode.dio.build.flash_mode=dio
5466+
gen4iod.menu.FlashMode.dio.build.flash_flags=-DFLASHMODE_DIO
5467+
gen4iod.menu.FlashMode.qout=QOUT
5468+
gen4iod.menu.FlashMode.qout.build.flash_mode=qout
5469+
gen4iod.menu.FlashMode.qout.build.flash_flags=-DFLASHMODE_QOUT
5470+
gen4iod.menu.FlashMode.qio=QIO (fast)
5471+
gen4iod.menu.FlashMode.qio.build.flash_mode=qio
5472+
gen4iod.menu.FlashMode.qio.build.flash_flags=-DFLASHMODE_QIO
54635473
gen4iod.build.flash_freq=80
5474+
gen4iod.menu.eesz.2M64=2MB (FS:64KB OTA:~992KB)
5475+
gen4iod.menu.eesz.2M64.build.flash_size=2M
5476+
gen4iod.menu.eesz.2M64.build.flash_size_bytes=0x200000
5477+
gen4iod.menu.eesz.2M64.build.flash_ld=eagle.flash.2m64.ld
5478+
gen4iod.menu.eesz.2M64.build.spiffs_pagesize=256
5479+
gen4iod.menu.eesz.2M64.upload.maximum_size=1044464
5480+
gen4iod.menu.eesz.2M64.build.rfcal_addr=0x1FC000
5481+
gen4iod.menu.eesz.2M64.build.spiffs_start=0x1F0000
5482+
gen4iod.menu.eesz.2M64.build.spiffs_end=0x1FB000
5483+
gen4iod.menu.eesz.2M64.build.spiffs_blocksize=4096
5484+
gen4iod.menu.eesz.2M128=2MB (FS:128KB OTA:~960KB)
5485+
gen4iod.menu.eesz.2M128.build.flash_size=2M
5486+
gen4iod.menu.eesz.2M128.build.flash_size_bytes=0x200000
5487+
gen4iod.menu.eesz.2M128.build.flash_ld=eagle.flash.2m128.ld
5488+
gen4iod.menu.eesz.2M128.build.spiffs_pagesize=256
5489+
gen4iod.menu.eesz.2M128.upload.maximum_size=1044464
5490+
gen4iod.menu.eesz.2M128.build.rfcal_addr=0x1FC000
5491+
gen4iod.menu.eesz.2M128.build.spiffs_start=0x1E0000
5492+
gen4iod.menu.eesz.2M128.build.spiffs_end=0x1FB000
5493+
gen4iod.menu.eesz.2M128.build.spiffs_blocksize=4096
5494+
gen4iod.menu.eesz.2M256=2MB (FS:256KB OTA:~896KB)
5495+
gen4iod.menu.eesz.2M256.build.flash_size=2M
5496+
gen4iod.menu.eesz.2M256.build.flash_size_bytes=0x200000
5497+
gen4iod.menu.eesz.2M256.build.flash_ld=eagle.flash.2m256.ld
5498+
gen4iod.menu.eesz.2M256.build.spiffs_pagesize=256
5499+
gen4iod.menu.eesz.2M256.upload.maximum_size=1044464
5500+
gen4iod.menu.eesz.2M256.build.rfcal_addr=0x1FC000
5501+
gen4iod.menu.eesz.2M256.build.spiffs_start=0x1C0000
5502+
gen4iod.menu.eesz.2M256.build.spiffs_end=0x1FB000
5503+
gen4iod.menu.eesz.2M256.build.spiffs_blocksize=4096
5504+
gen4iod.menu.eesz.2M512=2MB (FS:512KB OTA:~768KB)
5505+
gen4iod.menu.eesz.2M512.build.flash_size=2M
5506+
gen4iod.menu.eesz.2M512.build.flash_size_bytes=0x200000
5507+
gen4iod.menu.eesz.2M512.build.flash_ld=eagle.flash.2m512.ld
5508+
gen4iod.menu.eesz.2M512.build.spiffs_pagesize=256
5509+
gen4iod.menu.eesz.2M512.upload.maximum_size=1044464
5510+
gen4iod.menu.eesz.2M512.build.rfcal_addr=0x1FC000
5511+
gen4iod.menu.eesz.2M512.build.spiffs_start=0x180000
5512+
gen4iod.menu.eesz.2M512.build.spiffs_end=0x1FA000
5513+
gen4iod.menu.eesz.2M512.build.spiffs_blocksize=8192
5514+
gen4iod.menu.eesz.2M1M=2MB (FS:1MB OTA:~512KB)
5515+
gen4iod.menu.eesz.2M1M.build.flash_size=2M
5516+
gen4iod.menu.eesz.2M1M.build.flash_size_bytes=0x200000
5517+
gen4iod.menu.eesz.2M1M.build.flash_ld=eagle.flash.2m1m.ld
5518+
gen4iod.menu.eesz.2M1M.build.spiffs_pagesize=256
5519+
gen4iod.menu.eesz.2M1M.upload.maximum_size=1044464
5520+
gen4iod.menu.eesz.2M1M.build.rfcal_addr=0x1FC000
5521+
gen4iod.menu.eesz.2M1M.build.spiffs_start=0x100000
5522+
gen4iod.menu.eesz.2M1M.build.spiffs_end=0x1FA000
5523+
gen4iod.menu.eesz.2M1M.build.spiffs_blocksize=8192
5524+
gen4iod.menu.eesz.2M=2MB (FS:none OTA:~1019KB)
5525+
gen4iod.menu.eesz.2M.build.flash_size=2M
5526+
gen4iod.menu.eesz.2M.build.flash_size_bytes=0x200000
5527+
gen4iod.menu.eesz.2M.build.flash_ld=eagle.flash.2m.ld
5528+
gen4iod.menu.eesz.2M.build.spiffs_pagesize=256
5529+
gen4iod.menu.eesz.2M.upload.maximum_size=1044464
5530+
gen4iod.menu.eesz.2M.build.rfcal_addr=0x1FC000
54645531
gen4iod.menu.eesz.512K32=512KB (FS:32KB OTA:~230KB)
54655532
gen4iod.menu.eesz.512K32.build.flash_size=512K
54665533
gen4iod.menu.eesz.512K32.build.flash_size_bytes=0x80000

bootloaders/eboot/eboot.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -230,15 +230,17 @@ int main()
230230

231231
ets_putc('0'+res); ets_putc('\n');
232232

233+
/** disabled in 2.7.3
233234
// Verify the copy
234235
ets_putc('c'); ets_putc('m'); ets_putc('p'); ets_putc(':');
235236
if (res == 0) {
236237
ets_wdt_disable();
237238
res = copy_raw(cmd.args[0], cmd.args[1], cmd.args[2], true);
238239
ets_wdt_enable();
239240
}
240-
241241
ets_putc('0'+res); ets_putc('\n');
242+
**/
243+
242244
if (res == 0) {
243245
cmd.action = ACTION_LOAD_APP;
244246
cmd.args[0] = cmd.args[1];

bootloaders/eboot/eboot.elf

-188 Bytes
Binary file not shown.

cores/esp8266/TZ.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
// autogenerated from https://raw.githubusercontent.com/nayarsystems/posix_tz_db/master/zones.csv
33
// by script <esp8266 arduino core>/tools/TZupdate.sh
4-
// Thu May 7 19:02:21 UTC 2020
4+
// Tue Jul 7 07:38:29 UTC 2020
55
//
66
// This database is autogenerated from IANA timezone database
77
// https://www.iana.org/time-zones
@@ -105,7 +105,7 @@
105105
#define TZ_America_Cuiaba PSTR("<-04>4")
106106
#define TZ_America_Curacao PSTR("AST4")
107107
#define TZ_America_Danmarkshavn PSTR("GMT0")
108-
#define TZ_America_Dawson PSTR("PST8PDT,M3.2.0,M11.1.0")
108+
#define TZ_America_Dawson PSTR("MST7")
109109
#define TZ_America_Dawson_Creek PSTR("MST7")
110110
#define TZ_America_Denver PSTR("MST7MDT,M3.2.0,M11.1.0")
111111
#define TZ_America_Detroit PSTR("EST5EDT,M3.2.0,M11.1.0")
@@ -207,7 +207,7 @@
207207
#define TZ_America_Toronto PSTR("EST5EDT,M3.2.0,M11.1.0")
208208
#define TZ_America_Tortola PSTR("AST4")
209209
#define TZ_America_Vancouver PSTR("PST8PDT,M3.2.0,M11.1.0")
210-
#define TZ_America_Whitehorse PSTR("PST8PDT,M3.2.0,M11.1.0")
210+
#define TZ_America_Whitehorse PSTR("MST7")
211211
#define TZ_America_Winnipeg PSTR("CST6CDT,M3.2.0,M11.1.0")
212212
#define TZ_America_Yakutat PSTR("AKST9AKDT,M3.2.0,M11.1.0")
213213
#define TZ_America_Yellowknife PSTR("MST7MDT,M3.2.0,M11.1.0")

doc/boards.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ Datasheet and associated downloads can be found on the 4D Systems product page.
413413

414414
The gen4-IoD range can be programmed using the Arduino IDE and also the 4D Systems Workshop4 IDE, which incorporates many additional graphics benefits. GFX4d library is available, along with a number of demo applications.
415415

416-
- Product page: http://www.4dsystems.com.au/product/gen4-IoD
416+
- Product page: https://4dsystems.com.au/products/iot-display-modules
417417

418418
Digistump Oak
419419
-------------

doc/esp8266wifi/generic-class.rst

+52-7
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,18 @@ mode
5454
.. code:: cpp
5555
5656
WiFi.mode(m)
57-
WiFi.getMode()
5857
5958
- ``WiFi.mode(m)``: set mode to ``WIFI_AP``, ``WIFI_STA``,
6059
``WIFI_AP_STA`` or ``WIFI_OFF``
61-
- ``WiFi.getMode()``: return current Wi-Fi mode (one out of four modes
62-
above)
60+
61+
getMode
62+
~~~~~~~
63+
64+
.. code:: cpp
65+
66+
WiFiMode_t WiFi.getMode()
67+
68+
- ``WiFi.getMode()``: return current Wi-Fi mode (one out of four modes above)
6369

6470
WiFi power management, DTIM
6571
~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -95,17 +101,56 @@ periodic beacon at a frequency specified by the DTIM Interval. Beacons are
95101
packets sent by an access point to synchronize a wireless network.
96102

97103

104+
setOutputPower
105+
~~~~~~~~~~~~~~
106+
107+
.. code:: cpp
108+
109+
void WiFi.setOutputPower(float dBm)
110+
111+
Sets the max transmit power, in dBm. Values range from 0 to 20.5 [dBm] inclusive, and should be multiples of 0.25.
112+
This is essentially a thin wrapper around the SDK's system_phy_set_max_tpw() api call.
113+
114+
If wifi connection issues are encountered due to signal noise, one thing to try is to reduce the Tx power.
115+
This has been found effective in cases where STA mode is in use with 802.11n phy (default). Reducing to
116+
e.g.: 17.5dBm or slightly lower can reduce noise and improve connectivity, although max range will also be reduced.
117+
118+
setPhyMode
119+
~~~~~~~~~~
120+
121+
.. code:: cpp
122+
123+
bool setPhyMode (WiFiPhyMode_t mode)
124+
125+
Sets the WiFi radio phy mode. Argument is an enum of type WiFiPhyMode_t, valid values are:
126+
- ``WIFI_PHY_MODE_11B``: 802.11b mode
127+
- ``WIFI_PHY_MODE_11G``: 802.11g mode
128+
- ``WIFI_PHY_MODE_11N``: 802.11n mode
129+
130+
Per the NONOS SDK API Reference document, the AP mode only supports b/g, see notes in section on wifi_set_phy_mode() api.
131+
Returns true success, false otherwise.
132+
133+
Some experiments have shown that 802.11b mode has longest LOS range, while 802.11n mode has longest indoor range.
134+
135+
It has been observed that some wifi routers may degrade from 802.11n to g/b if an ESP8266 in g/b phy mode connects to them. That
136+
means that the entire wifi connectivity of all devices are impacted.
137+
138+
getPhyMode
139+
~~~~~~~~~~
140+
141+
.. code:: cpp
142+
143+
WiFiPhyMode_t getPhyMode (WiFiPhyMode_t mode)
144+
145+
Gets the WiFi radio phy mode that is currently set.
146+
98147
Other Function Calls
99148
~~~~~~~~~~~~~~~~~~~~
100149

101150
.. code:: cpp
102151
103152
int32_t channel (void)
104153
WiFiSleepType_t getSleepMode ()
105-
bool setPhyMode (WiFiPhyMode_t mode)
106-
WiFiPhyMode_t getPhyMode ()
107-
void setOutputPower (float dBm)
108-
WiFiMode_t getMode ()
109154
bool enableSTA (bool enable)
110155
bool enableAP (bool enable)
111156
bool forceSleepBegin (uint32 sleepUs=0)

libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,8 @@ void WiFiClientSecure::_clearAuthenticationSettings() {
9696
_use_fingerprint = false;
9797
_use_self_signed = false;
9898
_knownkey = nullptr;
99-
_sk = nullptr;
10099
_ta = nullptr;
101100
_axtls_ta = nullptr;
102-
_axtls_chain = nullptr;
103-
_axtls_sk = nullptr;
104101
}
105102

106103

libraries/LittleFS/src/LittleFS.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ FileImplPtr LittleFSImpl::open(const char* path, OpenMode openMode, AccessMode a
8787
// a directory whose name we are carrying around but which cannot be read or written
8888
return std::make_shared<LittleFSFileImpl>(this, path, nullptr, flags, creation);
8989
} else if (rc == 0) {
90+
lfs_file_sync(&_lfs, fd.get());
9091
return std::make_shared<LittleFSFileImpl>(this, path, fd, flags, creation);
9192
} else {
9293
DEBUGV("LittleFSDirImpl::openFile: rc=%d fd=%p path=`%s` openMode=%d accessMode=%d err=%d\n",

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"name": "framework-arduinoespressif8266",
33
"description": "Arduino Wiring-based Framework (ESP8266 Core)",
44
"url": "https://github.com/esp8266/Arduino",
5-
"version": "3.0.0-dev"
5+
"version": "2.7.3"
66
}

platform.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
# For more info:
66
# https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5-3rd-party-Hardware-specification
77

8-
name=ESP8266 Boards (3.0.0-dev)
9-
version=3.0.0-dev
8+
name=ESP8266 Boards (2.7.3)
9+
version=2.7.3
1010

1111
# These will be removed by the packager script when doing a JSON release
1212
runtime.tools.xtensa-lx106-elf-gcc.path={runtime.platform.path}/tools/xtensa-lx106-elf

tests/host/fs/test_fs.inc

+22
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,28 @@ TEST_CASE(TESTPRE "seek() pase EOF returns error (#7323)", TESTPAT)
198198
f.close();
199199
}
200200

201+
TEST_CASE(TESTPRE "Rewriting file frees space immediately (#7426)", TESTPAT)
202+
{
203+
FS_MOCK_DECLARE(64, 8, 512, "");
204+
REQUIRE(FSTYPE.begin());
205+
FSInfo inf;
206+
FSTYPE.info(inf);
207+
// Calculate the size to write per-FS, due to differing overheads
208+
int kbToWrite = (inf.totalBytes - inf.usedBytes - 8192) / 1024;
209+
// Create and overwrite a file >50% of spaceA (48/64K)
210+
for (auto x = 0; x < 2; x++) {
211+
auto f = FSTYPE.open("/file1.bin", "w");
212+
REQUIRE(f);
213+
uint8_t buff[1024];
214+
memset(buff, 0xaa, 1024);
215+
for (auto i = 0; i < kbToWrite; i++) {
216+
REQUIRE(f.write(buff, 1024));
217+
}
218+
f.close();
219+
FSTYPE.info(inf);
220+
}
221+
}
222+
201223
#ifdef FS_HAS_DIRS
202224

203225
#if FSTYPE != SDFS

tools/boards.txt.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -759,8 +759,9 @@
759759
},
760760
'macro': [
761761
'resetmethod_nodemcu',
762-
'flashmode_dio',
762+
'flashmode_menu',
763763
'flashfreq_80',
764+
'2M',
764765
'512K',
765766
],
766767
'desc': [ 'gen4-IoD Range of ESP8266 powered Display Modules by 4D Systems.',
@@ -771,7 +772,7 @@
771772
'',
772773
'The gen4-IoD range can be programmed using the Arduino IDE and also the 4D Systems Workshop4 IDE, which incorporates many additional graphics benefits. GFX4d library is available, along with a number of demo applications.',
773774
'',
774-
'- Product page: http://www.4dsystems.com.au/product/gen4-IoD',
775+
'- Product page: https://4dsystems.com.au/products/iot-display-modules',
775776
],
776777
}),
777778
( 'oak', {

0 commit comments

Comments
 (0)