1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00

Merge igrr/esp8266 into esp8266

remove the need to set programmer, by setting upload tool
  remove trailing whitespace

Conflicts:
	hardware/esp8266com/esp8266/boards.txt
This commit is contained in:
Ivan Grokhotkov 2015-04-01 09:10:49 +03:00
commit d1348264d5

View File

@ -15,6 +15,7 @@ esp01.build.board=ESP8266_ESP01
esp01.build.core=esp8266 esp01.build.core=esp8266
esp01.build.variant=esp01 esp01.build.variant=esp01
esp01.upload.tool=esptool
esp01.menu.UploadSpeed.115200=115200 esp01.menu.UploadSpeed.115200=115200
esp01.menu.UploadSpeed.115200.upload.speed=115200 esp01.menu.UploadSpeed.115200.upload.speed=115200
esp01.menu.UploadSpeed.9600=9600 esp01.menu.UploadSpeed.9600=9600