NotificationsYou must be signed in to change notification settings
Fork13.3k
Star16.5k

Commita6e37b8

authored

Merge branch 'master' into convergence

2 parents1a4ceba +cb9734c commita6e37b8Copy full SHA for a6e37b8

File tree

117 files changed

+2675

-863

lines changed

.github/workflows
README.md
boards.txt
bootloaders/eboot
- eboot.c
- eboot.elf
cores/esp8266
doc
- Troubleshooting
  - stack_dump.rst
- esp8266wifi
- faq
  - a02-my-esp-crashes.rst
  - a06-global-build-options.rst
- filesystem.rst
- gdb.rst
- ideoptions.rst
- installing.rst
- ota_updates
  - readme.rst
libraries
- ArduinoOTA
  - ArduinoOTA.cpp
  - ArduinoOTA.h
  - examples
    - OTAEraseConfig
      - OTAEraseConfig.ino
    - OTASdkCheck
      - OTASdkCheck.ino
- DNSServer/examples/CaptivePortalAdvanced
  - CaptivePortalAdvanced.ino
- ESP8266HTTPClient
  - examples/BasicHttpsClient
  - src
    - ESP8266HTTPClient.cpp
    - ESP8266HTTPClient.h
- ESP8266SdFat
- ESP8266WebServer
  - examples
    - HelloServerBearSSL
      - HelloServerBearSSL.ino
    - HelloServer
      - HelloServer.ino
  - src
    - ESP8266WebServer-impl.h
- ESP8266WiFi
  - examples
    - BearSSL_CertStore
      - certs-from-mozilla.py
    - BearSSL_MaxFragmentLength
      - BearSSL_MaxFragmentLength.ino
    - BearSSL_ServerClientCert
      - BearSSL_ServerClientCert.ino
    - BearSSL_Server
    - BearSSL_Validation
      - certs.h
    - HTTPSRequest
      - certs.h
    - WiFiTelnetToSerial
      - WiFiTelnetToSerial.ino
  - src
- ESP8266httpUpdate/src
  - ESP8266httpUpdate.cpp
  - ESP8266httpUpdate.h
- SoftwareSerial
- esp8266/examples
  - GlobalBuildOptions
    - GlobalBuildOptions.ino.globals.h
  - SerialStress
    - SerialStress.ino
- lwIP_Ethernet
  - library.properties
  - src
    - EthernetCompat.h
- lwIP_w5100
  - library.properties
package
- package_esp8266com_index.template.json
platform.txt
tests/host/common
- MockTools.cpp
- MockWiFiServer.cpp
tools

Some content is hidden

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

117 files changed

+2675

-863

lines changed

`‎.github/workflows/build-host.yml‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ jobs:`
`17`	`17`	`run:`
`18`	`18`	`shell:bash`
`19`	`19`	`steps:`
`20`		`- -uses:actions/checkout@v3`
	`20`	`+ -uses:actions/checkout@v4`
`21`	`21`	`with:`
`22`	`22`	`submodules:true`
`23`	`23`	`-run:\|`
`@@ -32,7 +32,7 @@ jobs:`
`32`	`32`	`run:`
`33`	`33`	`shell:bash`
`34`	`34`	`steps:`
`35`		`- -uses:actions/checkout@v3`
	`35`	`+ -uses:actions/checkout@v4`
`36`	`36`	`with:`
`37`	`37`	`submodules:true`
`38`	`38`	`-run:\|`

`‎.github/workflows/build-ide.yml‎`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ jobs:`
`17`	`17`	`run:`
`18`	`18`	`shell:bash`
`19`	`19`	`steps:`
`20`		`- -uses:actions/checkout@v3`
	`20`	`+ -uses:actions/checkout@v4`
`21`	`21`	`with:`
`22`	`22`	`submodules:false`
`23`	`23`	`-uses:actions/cache@v3`
`@@ -39,7 +39,7 @@ jobs:`
`39`	`39`	`lwip:["default", "IPv6"]`
`40`	`40`	`chunk:[0, 1, 2, 3, 4, 5, 6, 7]`
`41`	`41`	`steps:`
`42`		`- -uses:actions/checkout@v3`
	`42`	`+ -uses:actions/checkout@v4`
`43`	`43`	`with:`
`44`	`44`	`submodules:true`
`45`	`45`	`-uses:actions/setup-python@v4`
`@@ -63,7 +63,7 @@ jobs:`
`63`	`63`	`name:Windows`
`64`	`64`	`runs-on:windows-latest`
`65`	`65`	`steps:`
`66`		`- -uses:actions/checkout@v3`
	`66`	`+ -uses:actions/checkout@v4`
`67`	`67`	`with:`
`68`	`68`	`submodules:false`
`69`	`69`	`-uses:actions/setup-python@v4`
`@@ -88,7 +88,7 @@ jobs:`
`88`	`88`	`run:`
`89`	`89`	`shell:bash`
`90`	`90`	`steps:`
`91`		`- -uses:actions/checkout@v3`
	`91`	`+ -uses:actions/checkout@v4`
`92`	`92`	`with:`
`93`	`93`	`submodules:false`
`94`	`94`	`-uses:actions/setup-python@v4`

`‎.github/workflows/build-platformio.yml‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ jobs:`
`18`	`18`	`run:`
`19`	`19`	`shell:bash`
`20`	`20`	`steps:`
`21`		`- -uses:actions/checkout@v3`
	`21`	`+ -uses:actions/checkout@v4`
`22`	`22`	`with:`
`23`	`23`	`submodules:true`
`24`	`24`	`-uses:actions/setup-python@v4`

`‎.github/workflows/check-autogenerated.yml‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ jobs:`
`16`	`16`	`run:`
`17`	`17`	`shell:bash`
`18`	`18`	`steps:`
`19`		`- -uses:actions/checkout@v3`
	`19`	`+ -uses:actions/checkout@v4`
`20`	`20`	`with:`
`21`	`21`	`submodules:false`
`22`	`22`	`-run:\|`
`@@ -29,7 +29,7 @@ jobs:`
`29`	`29`	`run:`
`30`	`30`	`shell:bash`
`31`	`31`	`steps:`
`32`		`- -uses:actions/checkout@v3`
	`32`	`+ -uses:actions/checkout@v4`
`33`	`33`	`with:`
`34`	`34`	`submodules:false`
`35`	`35`	`-uses:actions/setup-python@v4`
`@@ -51,7 +51,7 @@ jobs:`
`51`	`51`	`run:`
`52`	`52`	`shell:bash`
`53`	`53`	`steps:`
`54`		`- -uses:actions/checkout@v3`
	`54`	`+ -uses:actions/checkout@v4`
`55`	`55`	`with:`
`56`	`56`	`submodules:false`
`57`	`57`	`-uses:actions/setup-python@v4`

`‎.github/workflows/documentation.yml‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ jobs:`
`16`	`16`	`run:`
`17`	`17`	`shell:bash`
`18`	`18`	`steps:`
`19`		`- -uses:actions/checkout@v3`
	`19`	`+ -uses:actions/checkout@v4`
`20`	`20`	`with:`
`21`	`21`	`submodules:true`
`22`	`22`	`-uses:actions/setup-python@v4`

`‎.github/workflows/release-to-publish.yml‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ jobs:`
`36`	`36`	`name:Update master JSON file`
`37`	`37`	`runs-on:ubuntu-latest`
`38`	`38`	`steps:`
`39`		`- -uses:actions/checkout@v3`
	`39`	`+ -uses:actions/checkout@v4`
`40`	`40`	`with:`
`41`	`41`	`submodules:false`
`42`	`42`	`fetch-depth:0`

`‎.github/workflows/style-check.yml‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ jobs:`
`17`	`17`	`run:`
`18`	`18`	`shell:bash`
`19`	`19`	`steps:`
`20`		`- -uses:actions/checkout@v3`
	`20`	`+ -uses:actions/checkout@v4`
`21`	`21`	`with:`
`22`	`22`	`submodules:true`
`23`	`23`	`-uses:actions/setup-python@v4`
`@@ -46,7 +46,7 @@ jobs:`
`46`	`46`	`name:codespell`
`47`	`47`	`runs-on:ubuntu-latest`
`48`	`48`	`steps:`
`49`		`- -uses:actions/checkout@v3`
	`49`	`+ -uses:actions/checkout@v4`
`50`	`50`	`with:`
`51`	`51`	`submodules:false`
`52`	`52`	`-name:Run codespell`

`‎.github/workflows/tag-to-draft-release.yml‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ jobs:`
`18`	`18`	`run:`
`19`	`19`	`shell:bash`
`20`	`20`	`steps:`
`21`		`- -uses:actions/checkout@v3`
	`21`	`+ -uses:actions/checkout@v4`
`22`	`22`	`with:`
`23`	`23`	`submodules:true`
`24`	`24`	`fetch-depth:0`

`‎README.md‎`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ Arduino core for ESP8266 WiFi chip`
`3`	`3`
`4`	`4`	`#Quick links`
`5`	`5`
`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/)`
`7`	`7`	`-[Current "git version" documentation](https://arduino-esp8266.readthedocs.io/en/latest/)`
`8`	`8`	`-[Install git version](https://arduino-esp8266.readthedocs.io/en/latest/installing.html#using-git-version) ([sources](doc/installing.rst#using-git-version))`
`9`	`9`
`@@ -28,15 +28,15 @@ ESP8266 Arduino core comes with libraries to communicate over WiFi using TCP and`
`28`	`28`
`29`	`29`	`Starting with 1.6.4, Arduino allows installation of third-party platform packages using Boards Manager. We have packages available for Windows, Mac OS, and Linux (32 and 64 bit).`
`30`	`30`
`31`		`--Install the current upstreamArduino IDEat the 1.8.9 levelorlater. The current version is on the[Arduino website](https://www.arduino.cc/en/software).`
`32`		`-- Start Arduino and open the Preferences window.`
`33`		-- Enter```https://arduino.esp8266.com/stable/package_esp8266com_index.json``` into theFile>Preferences>Additional Boards Manager URLs field of the Arduino IDE. You can add multiple URLs, separating them with commas.
	`31`	`+-[Download and installArduino IDE1.xor2.x](https://www.arduino.cc/en/software)`
	`32`	`+- Start Arduino and open the Preferences window`
	`33`	+- Enter`https://arduino.esp8266.com/stable/package_esp8266com_index.json` into theFile>Preferences>Additional Boards Manager URLs field of the Arduino IDE. You can add multiple URLs, separating them with commas.
`34`	`34`	`- Open Boards Manager from Tools > Board menu and installesp8266 platform (and don't forget to select your ESP8266 board from Tools > Board menu after installation).`
`35`	`35`
`36`	`36`	`####Latest release[![Latest release](https://img.shields.io/github/release/esp8266/Arduino.svg)](https://github.com/esp8266/Arduino/releases/latest/)`
`37`	`37`	Boards manager link:`https://arduino.esp8266.com/stable/package_esp8266com_index.json`
`38`	`38`
`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/)`
`40`	`40`
`41`	`41`	`###Using git version`
`42`	`42`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commita6e37b8

File tree

117 files changed

Some content is hidden

117 files changed

`‎.github/workflows/build-host.yml‎`

`‎.github/workflows/build-ide.yml‎`

`‎.github/workflows/build-platformio.yml‎`

`‎.github/workflows/check-autogenerated.yml‎`

`‎.github/workflows/documentation.yml‎`

`‎.github/workflows/release-to-publish.yml‎`

`‎.github/workflows/style-check.yml‎`

`‎.github/workflows/tag-to-draft-release.yml‎`

`‎README.md‎`

0 commit comments