Skip to content

Commit 5f7adcf

Browse files
committed
Merge branch 'master' into pr-eraseconfig-reset
2 parents eb7aa17 + 01d1c8e commit 5f7adcf

File tree

19 files changed

+235
-63
lines changed

19 files changed

+235
-63
lines changed

README.md

Lines changed: 2 additions & 2 deletions
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/3.1.1/)
6+
- [Latest release documentation](https://arduino-esp8266.readthedocs.io/en/3.1.2/)
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/3.1.1/](https://arduino-esp8266.readthedocs.io/en/3.1.1/)
39+
Documentation: [https://arduino-esp8266.readthedocs.io/en/3.1.2/](https://arduino-esp8266.readthedocs.io/en/3.1.2/)
4040

4141
### Using git version
4242

cores/esp8266/TZ.h

Lines changed: 16 additions & 16 deletions
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-
// Sat Jan 14 10:17:27 PM UTC 2023
4+
// Mon Mar 20 22:00:17 UTC 2023
55
//
66
// This database is autogenerated from IANA timezone database
77
// https://raw.githubusercontent.com/nayarsystems/posix_tz_db/master/zones.csv
@@ -85,7 +85,7 @@
8585
#define TZ_America_Asuncion PSTR("<-04>4<-03>,M10.1.0/0,M3.4.0/0")
8686
#define TZ_America_Atikokan PSTR("EST5")
8787
#define TZ_America_Bahia PSTR("<-03>3")
88-
#define TZ_America_Bahia_Banderas PSTR("CST6CDT,M4.1.0,M10.5.0")
88+
#define TZ_America_Bahia_Banderas PSTR("CST6")
8989
#define TZ_America_Barbados PSTR("AST4")
9090
#define TZ_America_Belem PSTR("<-03>3")
9191
#define TZ_America_Belize PSTR("CST6")
@@ -100,7 +100,7 @@
100100
#define TZ_America_Cayenne PSTR("<-03>3")
101101
#define TZ_America_Cayman PSTR("EST5")
102102
#define TZ_America_Chicago PSTR("CST6CDT,M3.2.0,M11.1.0")
103-
#define TZ_America_Chihuahua PSTR("MST7MDT,M4.1.0,M10.5.0")
103+
#define TZ_America_Chihuahua PSTR("CST6")
104104
#define TZ_America_Costa_Rica PSTR("CST6")
105105
#define TZ_America_Creston PSTR("MST7")
106106
#define TZ_America_Cuiaba PSTR("<-04>4")
@@ -117,7 +117,7 @@
117117
#define TZ_America_Fortaleza PSTR("<-03>3")
118118
#define TZ_America_Fort_Nelson PSTR("MST7")
119119
#define TZ_America_Glace_Bay PSTR("AST4ADT,M3.2.0,M11.1.0")
120-
#define TZ_America_Godthab PSTR("<-03>3<-02>,M3.5.0/-2,M10.5.0/-1")
120+
#define TZ_America_Godthab PSTR("<-02>2")
121121
#define TZ_America_Goose_Bay PSTR("AST4ADT,M3.2.0,M11.1.0")
122122
#define TZ_America_Grand_Turk PSTR("EST5EDT,M3.2.0,M11.1.0")
123123
#define TZ_America_Grenada PSTR("AST4")
@@ -153,14 +153,14 @@
153153
#define TZ_America_Marigot PSTR("AST4")
154154
#define TZ_America_Martinique PSTR("AST4")
155155
#define TZ_America_Matamoros PSTR("CST6CDT,M3.2.0,M11.1.0")
156-
#define TZ_America_Mazatlan PSTR("MST7MDT,M4.1.0,M10.5.0")
156+
#define TZ_America_Mazatlan PSTR("MST7")
157157
#define TZ_America_Menominee PSTR("CST6CDT,M3.2.0,M11.1.0")
158-
#define TZ_America_Merida PSTR("CST6CDT,M4.1.0,M10.5.0")
158+
#define TZ_America_Merida PSTR("CST6")
159159
#define TZ_America_Metlakatla PSTR("AKST9AKDT,M3.2.0,M11.1.0")
160-
#define TZ_America_Mexico_City PSTR("CST6CDT,M4.1.0,M10.5.0")
160+
#define TZ_America_Mexico_City PSTR("CST6")
161161
#define TZ_America_Miquelon PSTR("<-03>3<-02>,M3.2.0,M11.1.0")
162162
#define TZ_America_Moncton PSTR("AST4ADT,M3.2.0,M11.1.0")
163-
#define TZ_America_Monterrey PSTR("CST6CDT,M4.1.0,M10.5.0")
163+
#define TZ_America_Monterrey PSTR("CST6")
164164
#define TZ_America_Montevideo PSTR("<-03>3")
165165
#define TZ_America_Montreal PSTR("EST5EDT,M3.2.0,M11.1.0")
166166
#define TZ_America_Montserrat PSTR("AST4")
@@ -172,8 +172,8 @@
172172
#define TZ_America_North_Dakota_Beulah PSTR("CST6CDT,M3.2.0,M11.1.0")
173173
#define TZ_America_North_Dakota_Center PSTR("CST6CDT,M3.2.0,M11.1.0")
174174
#define TZ_America_North_Dakota_New_Salem PSTR("CST6CDT,M3.2.0,M11.1.0")
175-
#define TZ_America_Nuuk PSTR("<-03>3<-02>,M3.5.0/-2,M10.5.0/-1")
176-
#define TZ_America_Ojinaga PSTR("MST7MDT,M3.2.0,M11.1.0")
175+
#define TZ_America_Nuuk PSTR("<-02>2")
176+
#define TZ_America_Ojinaga PSTR("CST6CDT,M3.2.0,M11.1.0")
177177
#define TZ_America_Panama PSTR("EST5")
178178
#define TZ_America_Pangnirtung PSTR("EST5EDT,M3.2.0,M11.1.0")
179179
#define TZ_America_Paramaribo PSTR("<-03>3")
@@ -227,7 +227,7 @@
227227
#define TZ_Arctic_Longyearbyen PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
228228
#define TZ_Asia_Aden PSTR("<+03>-3")
229229
#define TZ_Asia_Almaty PSTR("<+06>-6")
230-
#define TZ_Asia_Amman PSTR("EET-2EEST,M2.5.4/24,M10.5.5/1")
230+
#define TZ_Asia_Amman PSTR("<+03>-3")
231231
#define TZ_Asia_Anadyr PSTR("<+12>-12")
232232
#define TZ_Asia_Aqtau PSTR("<+05>-5")
233233
#define TZ_Asia_Aqtobe PSTR("<+05>-5")
@@ -244,14 +244,14 @@
244244
#define TZ_Asia_Chita PSTR("<+09>-9")
245245
#define TZ_Asia_Choibalsan PSTR("<+08>-8")
246246
#define TZ_Asia_Colombo PSTR("<+0530>-5:30")
247-
#define TZ_Asia_Damascus PSTR("EET-2EEST,M3.5.5/0,M10.5.5/0")
247+
#define TZ_Asia_Damascus PSTR("<+03>-3")
248248
#define TZ_Asia_Dhaka PSTR("<+06>-6")
249249
#define TZ_Asia_Dili PSTR("<+09>-9")
250250
#define TZ_Asia_Dubai PSTR("<+04>-4")
251251
#define TZ_Asia_Dushanbe PSTR("<+05>-5")
252252
#define TZ_Asia_Famagusta PSTR("EET-2EEST,M3.5.0/3,M10.5.0/4")
253-
#define TZ_Asia_Gaza PSTR("EET-2EEST,M3.4.4/48,M10.5.5/1")
254-
#define TZ_Asia_Hebron PSTR("EET-2EEST,M3.4.4/48,M10.5.5/1")
253+
#define TZ_Asia_Gaza PSTR("EET-2EEST,M3.4.4/50,M10.4.4/50")
254+
#define TZ_Asia_Hebron PSTR("EET-2EEST,M3.4.4/50,M10.4.4/50")
255255
#define TZ_Asia_Ho_Chi_Minh PSTR("<+07>-7")
256256
#define TZ_Asia_Hong_Kong PSTR("HKT-8")
257257
#define TZ_Asia_Hovd PSTR("<+07>-7")
@@ -294,7 +294,7 @@
294294
#define TZ_Asia_Taipei PSTR("CST-8")
295295
#define TZ_Asia_Tashkent PSTR("<+05>-5")
296296
#define TZ_Asia_Tbilisi PSTR("<+04>-4")
297-
#define TZ_Asia_Tehran PSTR("<+0330>-3:30<+0430>,J79/24,J263/24")
297+
#define TZ_Asia_Tehran PSTR("<+0330>-3:30")
298298
#define TZ_Asia_Thimphu PSTR("<+06>-6")
299299
#define TZ_Asia_Tokyo PSTR("JST-9")
300300
#define TZ_Asia_Tomsk PSTR("<+07>-7")
@@ -409,7 +409,7 @@
409409
#define TZ_Pacific_Efate PSTR("<+11>-11")
410410
#define TZ_Pacific_Enderbury PSTR("<+13>-13")
411411
#define TZ_Pacific_Fakaofo PSTR("<+13>-13")
412-
#define TZ_Pacific_Fiji PSTR("<+12>-12<+13>,M11.2.0,M1.2.3/99")
412+
#define TZ_Pacific_Fiji PSTR("<+12>-12")
413413
#define TZ_Pacific_Funafuti PSTR("<+12>-12")
414414
#define TZ_Pacific_Galapagos PSTR("<-06>6")
415415
#define TZ_Pacific_Gambier PSTR("<-09>9")

cores/esp8266/core_esp8266_phy.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,10 +360,7 @@ void user_rf_pre_init()
360360
{
361361
// *((volatile uint32_t*) 0x60000710) = 0;
362362
spoof_init_data = false;
363-
volatile uint32_t* rtc_reg = (volatile uint32_t*) 0x60001000;
364-
rtc_reg[30] = 0;
365363

366-
system_set_os_print(0);
367364
int rf_mode = __get_rf_mode();
368365
if (rf_mode >= 0) {
369366
system_phy_set_rfoption(rf_mode);

cores/esp8266/core_esp8266_postmortem.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,8 @@ static void postmortem_report(uint32_t sp_dump) {
182182
}
183183
else if (rst_info.reason == REASON_SOFT_WDT_RST) {
184184
ets_printf_P(PSTR("\nSoft WDT reset\n"));
185+
ets_printf_P(PSTR("\nException (%d):\nepc1=0x%08x epc2=0x%08x epc3=0x%08x excvaddr=0x%08x depc=0x%08x\n"),
186+
rst_info.exccause, /* Address executing at time of Soft WDT level-1 interrupt */ rst_info.epc1, 0, 0, 0, 0);
185187
}
186188
else if (rst_info.reason == REASON_USER_STACK_SMASH) {
187189
ets_printf_P(PSTR("\nStack smashing detected.\n"));

cores/esp8266/flash_hal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ extern const flash_map_s __flashdesc[];
4343

4444
#define FLASH_MAP_SETUP_CONFIG(conf) FLASH_MAP_SETUP_CONFIG_ATTR(,conf)
4545
#define FLASH_MAP_SETUP_CONFIG_ATTR(attr, conf...) \
46-
const flash_map_s __flashdesc[] PROGMEM = conf; \
46+
extern const flash_map_s __flashdesc[] PROGMEM attr = conf; \
4747
const char *flashinit (void) attr; \
4848
const char *flashinit (void) \
4949
{ \

doc/gdb.rst

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -380,4 +380,33 @@ breakpoint) command in GDB while debugging instead of the more common
380380
``break`` command, since ``thb`` will remove the breakpoint once it is
381381
reached automatically and save you some trouble.
382382
383+
Because of the single hardware breakpoint limitation, you must pay careful
384+
attention to the output from ``gdb`` when you set a breakpoint. If your
385+
breakpoint expression matches multiple locations, as in this example:
383386
387+
.. code:: bash
388+
389+
(gdb) break loop
390+
Breakpoint 1 at 0x40202c84: loop. (2 locations)
391+
392+
Then you will be unable to ``continue``:
393+
394+
.. code:: bash
395+
396+
(gdb) cont
397+
Continuing.
398+
Note: automatically using hardware breakpoints for read-only addresses.
399+
Warning:
400+
Cannot insert hardware breakpoint 1.
401+
Could not insert hardware breakpoints:
402+
You may have requested too many hardware breakpoints/watchpoints.
403+
404+
You can resolve this situation by deleting the previous breakpoint and
405+
using a more specific breakpoint expression:
406+
407+
.. code:: bash
408+
409+
(gdb) delete
410+
Delete all breakpoints? (y or n) y
411+
(gdb) break mysketch.ino:loop
412+
Breakpoint 2 at 0x40202c84: file .../mysketch.ino, line 113.

doc/installing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Prerequisites
4444

4545
- Arduino 1.6.8 (or newer, current working version is 1.8.5)
4646
- git
47-
- Python 3.x (https://python.org)
47+
- Python ≥3.7 (https://python.org)
4848
- terminal, console, or command prompt (depending on your OS)
4949
- Internet connection
5050
- Uninstalling any core version installed via Board Manager

libraries/ESP8266HTTPClient/examples/BasicHttpsClient/BasicHttpsClient.ino

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,15 @@
99

1010
#include <ESP8266WiFi.h>
1111
#include <ESP8266WiFiMulti.h>
12-
1312
#include <ESP8266HTTPClient.h>
14-
1513
#include <WiFiClientSecureBearSSL.h>
16-
// Fingerprint for demo URL, expires on June 2, 2021, needs to be updated well before this date
17-
const uint8_t fingerprint[20] = { 0x40, 0xaf, 0x00, 0x6b, 0xec, 0x90, 0x22, 0x41, 0x8e, 0xa3, 0xad, 0xfa, 0x1a, 0xe8, 0x25, 0x41, 0x1d, 0x1a, 0x54, 0xb3 };
14+
15+
#include "certs.h"
16+
17+
#ifndef STASSID
18+
#define STASSID "your-ssid"
19+
#define STAPSK "your-password"
20+
#endif
1821

1922
ESP8266WiFiMulti WiFiMulti;
2023

@@ -27,14 +30,9 @@ void setup() {
2730
Serial.println();
2831
Serial.println();
2932

30-
for (uint8_t t = 4; t > 0; t--) {
31-
Serial.printf("[SETUP] WAIT %d...\n", t);
32-
Serial.flush();
33-
delay(1000);
34-
}
35-
3633
WiFi.mode(WIFI_STA);
37-
WiFiMulti.addAP("SSID", "PASSWORD");
34+
WiFiMulti.addAP(STASSID, STAPSK);
35+
Serial.println("setup() done connecting to ssid '" STASSID "'");
3836
}
3937

4038
void loop() {
@@ -43,14 +41,14 @@ void loop() {
4341

4442
std::unique_ptr<BearSSL::WiFiClientSecure> client(new BearSSL::WiFiClientSecure);
4543

46-
client->setFingerprint(fingerprint);
44+
client->setFingerprint(fingerprint_sni_cloudflaressl_com);
4745
// Or, if you happy to ignore the SSL certificate, then use the following line instead:
4846
// client->setInsecure();
4947

5048
HTTPClient https;
5149

5250
Serial.print("[HTTPS] begin...\n");
53-
if (https.begin(*client, "https://jigsaw.w3.org/HTTP/connection.html")) { // HTTPS
51+
if (https.begin(*client, jigsaw_host, jigsaw_port)) { // HTTPS
5452

5553
Serial.print("[HTTPS] GET...\n");
5654
// start connection and send HTTP header
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
cd ${0%/*} 2>/dev/null
2+
python3 ../../../../tools/cert.py -s jigsaw.w3.org -n jigsaw > certs.h
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
2+
// this file is autogenerated - any modification will be overwritten
3+
// unused symbols will not be linked in the final binary
4+
// generated on 2023-03-20 23:02:42
5+
// by ['../../../../tools/cert.py', '-s', 'jigsaw.w3.org', '-n', 'jigsaw']
6+
7+
#pragma once
8+
9+
////////////////////////////////////////////////////////////
10+
// certificate chain for jigsaw.w3.org:443
11+
12+
const char* jigsaw_host = "jigsaw.w3.org";
13+
const uint16_t jigsaw_port = 443;
14+
15+
// CN: sni.cloudflaressl.com => name: sni_cloudflaressl_com
16+
// not valid before: 2023-02-14 00:00:00
17+
// not valid after: 2024-02-14 23:59:59
18+
const char fingerprint_sni_cloudflaressl_com [] PROGMEM = "70:7c:82:07:f3:58:18:87:25:42:31:83:45:86:bd:17:86:71:4e:1f";
19+
const char pubkey_sni_cloudflaressl_com [] PROGMEM = R"PUBKEY(
20+
-----BEGIN PUBLIC KEY-----
21+
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE/NU/7vfdymScyhfx81ieO8XiwGqq
22+
TU4tjeWzSosWSpmQwnGmRqiU2h2wyT9uYxRme6uQ0yLedf4nz9ks+4OxtA==
23+
-----END PUBLIC KEY-----
24+
)PUBKEY";
25+
26+
// http://cacerts.digicert.com/CloudflareIncECCCA-3.crt
27+
// CN: Cloudflare Inc ECC CA-3 => name: Cloudflare_Inc_ECC_CA_3
28+
// not valid before: 2020-01-27 12:48:08
29+
// not valid after: 2024-12-31 23:59:59
30+
const char cert_Cloudflare_Inc_ECC_CA_3 [] PROGMEM = R"CERT(
31+
-----BEGIN CERTIFICATE-----
32+
MIIDzTCCArWgAwIBAgIQCjeHZF5ftIwiTv0b7RQMPDANBgkqhkiG9w0BAQsFADBa
33+
MQswCQYDVQQGEwJJRTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJl
34+
clRydXN0MSIwIAYDVQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTIw
35+
MDEyNzEyNDgwOFoXDTI0MTIzMTIzNTk1OVowSjELMAkGA1UEBhMCVVMxGTAXBgNV
36+
BAoTEENsb3VkZmxhcmUsIEluYy4xIDAeBgNVBAMTF0Nsb3VkZmxhcmUgSW5jIEVD
37+
QyBDQS0zMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEua1NZpkUC0bsH4HRKlAe
38+
nQMVLzQSfS2WuIg4m4Vfj7+7Te9hRsTJc9QkT+DuHM5ss1FxL2ruTAUJd9NyYqSb
39+
16OCAWgwggFkMB0GA1UdDgQWBBSlzjfq67B1DpRniLRF+tkkEIeWHzAfBgNVHSME
40+
GDAWgBTlnVkwgkdYzKz6CFQ2hns6tQRN8DAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0l
41+
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBIGA1UdEwEB/wQIMAYBAf8CAQAwNAYI
42+
KwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5j
43+
b20wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybDMuZGlnaWNlcnQuY29tL09t
44+
bmlyb290MjAyNS5jcmwwbQYDVR0gBGYwZDA3BglghkgBhv1sAQEwKjAoBggrBgEF
45+
BQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzALBglghkgBhv1sAQIw
46+
CAYGZ4EMAQIBMAgGBmeBDAECAjAIBgZngQwBAgMwDQYJKoZIhvcNAQELBQADggEB
47+
AAUkHd0bsCrrmNaF4zlNXmtXnYJX/OvoMaJXkGUFvhZEOFp3ArnPEELG4ZKk40Un
48+
+ABHLGioVplTVI+tnkDB0A+21w0LOEhsUCxJkAZbZB2LzEgwLt4I4ptJIsCSDBFe
49+
lpKU1fwg3FZs5ZKTv3ocwDfjhUkV+ivhdDkYD7fa86JXWGBPzI6UAPxGezQxPk1H
50+
goE6y/SJXQ7vTQ1unBuCJN0yJV0ReFEQPaA1IwQvZW+cwdFD19Ae8zFnWSfda9J1
51+
CZMRJCQUzym+5iPDuI9yP+kHyCREU3qzuWFloUwOxkgAyXVjBYdwRVKD05WdRerw
52+
6DEdfgkfCv4+3ao8XnTSrLE=
53+
-----END CERTIFICATE-----
54+
)CERT";
55+
56+
// end of certificate chain for jigsaw.w3.org:443
57+
////////////////////////////////////////////////////////////
58+

libraries/ESP8266WiFi/examples/BearSSL_Validation/certs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
// this file is autogenerated - any modification will be overwritten
33
// unused symbols will not be linked in the final binary
4-
// generated on 2023-01-14 22:23:19
4+
// generated on 2023-03-20 23:02:42
55
// by ['../../../../tools/cert.py', '-s', 'www.example.com', '-n', 'SSL']
66

77
#pragma once

libraries/ESP8266WiFi/examples/HTTPSRequest/certs.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
// this file is autogenerated - any modification will be overwritten
33
// unused symbols will not be linked in the final binary
4-
// generated on 2023-01-14 22:23:20
4+
// generated on 2023-03-20 23:02:43
55
// by ['../../../../tools/cert.py', '-s', 'api.github.com', '-n', 'github']
66

77
#pragma once
@@ -13,13 +13,13 @@ const char* github_host = "api.github.com";
1313
const uint16_t github_port = 443;
1414

1515
// CN: *.github.com => name: __github_com
16-
// not valid before: 2022-03-16 00:00:00
17-
// not valid after: 2023-03-16 23:59:59
18-
const char fingerprint___github_com [] PROGMEM = "29:70:30:74:ca:3c:48:f5:4a:79:c6:2d:11:57:a2:41:2a:2d:7d:5c";
16+
// not valid before: 2023-02-16 00:00:00
17+
// not valid after: 2024-03-15 23:59:59
18+
const char fingerprint___github_com [] PROGMEM = "2d:79:6c:90:2d:ad:8a:2e:4f:d1:e2:99:ed:e8:91:29:36:40:f8:58";
1919
const char pubkey___github_com [] PROGMEM = R"PUBKEY(
2020
-----BEGIN PUBLIC KEY-----
21-
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAESG9YDaGa2BwrfubzcAQFOjMd71wz
22-
8ofipEwn5CN1GAr5/d5T4F8kG07apsv8t5emn5Fufm/uMW1iJXug/96/QQ==
21+
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEVB9Da7ntQj93REi9YoUrTvO/wrkz
22+
xLleXrDjJGe1OI3tsrk+cWbZYAbwL6unbhZsAqbyBcr5BHK5M3vxZVSGRg==
2323
-----END PUBLIC KEY-----
2424
)PUBKEY";
2525

libraries/ESP8266WiFi/examples/WiFiTelnetToSerial/WiFiTelnetToSerial.ino

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
SWAP_PINS:
3232
0: use Serial1 for logging (legacy example)
3333
1: configure Hardware Serial port on RX:GPIO13 TX:GPIO15
34-
and use SoftwareSerial for logging on
34+
and use EspSoftwareSerial for logging on
3535
standard Serial pins RX:GPIO3 and TX:GPIO1
3636
*/
3737

@@ -84,11 +84,11 @@ void setup() {
8484
#if SWAP_PINS
8585
Serial.swap();
8686
// Hardware serial is now on RX:GPIO13 TX:GPIO15
87-
// use SoftwareSerial on regular RX(3)/TX(1) for logging
87+
// use EspSoftwareSerial on regular RX(3)/TX(1) for logging
8888
logger = new SoftwareSerial(3, 1);
8989
logger->begin(BAUD_LOGGER);
9090
logger->enableIntTx(false);
91-
logger->println("\n\nUsing SoftwareSerial for logging");
91+
logger->println("\n\nUsing EspSoftwareSerial for logging");
9292
#else
9393
logger->begin(BAUD_LOGGER);
9494
logger->println("\n\nUsing Serial1 for logging");

libraries/esp8266/examples/SerialStress/SerialStress.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/*
33
Serial read/write/verify/benchmark
44
Using internal loopback
5-
Using SoftwareSerial library for logging
5+
Using EspSoftwareSerial library for logging
66
77
Sketch meant for debugging only
88
Released to public domain

libraries/lwIP_Ethernet/library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name=lwIP-Ethernet
1+
name=lwIP_Ethernet
22
version=1
33
author=esp8266/Arduino
44
maintainer=esp8266/Arduino

0 commit comments

Comments
 (0)