Skip to content

Commit 40a511f

Browse files
committed
Merge branch 'master' of https://github.com/krzychb/Arduino into krzychb-master
Conflicts: doc/ota_updates/ota_updates.md
2 parents 92069e6 + 421206f commit 40a511f

11 files changed

+223
-156
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Documentation for latest development version:
5050
- [Reference](doc/reference.md)
5151
- [Supported boards](doc/boards.md)
5252
- [Change log](doc/changes.md)
53-
- [OTA Update](doc/ota_updates.md)
53+
- [OTA Update](doc/ota_updates/ota_updates.md)
5454

5555
### Issues and support ###
5656

boards.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,8 @@ nodemcuv2.menu.CpuFrequency.160.build.f_cpu=160000000L
301301
nodemcuv2.menu.UploadTool.esptool=Serial
302302
nodemcuv2.menu.UploadTool.esptool.upload.tool=esptool
303303
nodemcuv2.menu.UploadTool.esptool.upload.verbose=-vv
304+
nodemcuv2.menu.UploadTool.espota=OTA
305+
nodemcuv2.menu.UploadTool.espota.upload.tool=espota
304306

305307
nodemcuv2.menu.UploadSpeed.115200=115200
306308
nodemcuv2.menu.UploadSpeed.115200.upload.speed=115200
34.3 KB
Loading
105 KB
Loading
63.5 KB
Loading
Loading
75.5 KB
Loading
Loading
69.5 KB
Loading
25.3 KB
Loading

0 commit comments

Comments
 (0)