From 6812a65e033815871da13523e26f4c8f7ae219b0 Mon Sep 17 00:00:00 2001 From: Geert Roumen Date: Wed, 29 Apr 2015 16:56:08 +0200 Subject: [PATCH 1/2] Update README.md Added the 8 characters limit, and changed the paraphrase in password (because the libraries use password as term) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 52187ff99..4af1e524e 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ This is mostly similar to WiFi shield library. Differences include: - ```WiFi.mode(m)```: set mode to ```WIFI_AP```, ```WIFI_STA```, or ```WIFI_AP_STA```. - call ```WiFi.softAP(ssid)``` to set up an open network -- call ```WiFi.softAP(ssid, passphrase)``` to set up a WPA2-PSK network +- call ```WiFi.softAP(ssid, password)``` to set up a WPA2-PSK network (password should be at least 8 characters) - ```WiFi.macAddress(mac)``` is for STA, ```WiFi.softAPmacAddress(mac)``` is for AP. - ```WiFi.localIP()``` is for STA, ```WiFi.softAPIP()``` is for AP. - ```WiFi.RSSI()``` doesn't work From 21629fb7235794ac6298449c897e82d8f8c6332e Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Thu, 30 Apr 2015 13:10:13 +0800 Subject: [PATCH 2/2] Add flash chip size selection to the menu, show baud rates depending on the platform. --- boards.txt | 69 ++++++++++++++++++++++++++++++++++++---------------- platform.txt | 2 +- 2 files changed, 49 insertions(+), 22 deletions(-) diff --git a/boards.txt b/boards.txt index fbbcd6ca8..5fbd7bdd7 100644 --- a/boards.txt +++ b/boards.txt @@ -1,5 +1,6 @@ menu.UploadSpeed=Upload Speed menu.CpuFrequency=CPU Frequency +menu.FlashSize=Flash size ############################################################## generic.name=Generic ESP8266 Module @@ -16,6 +17,9 @@ generic.build.f_cpu=80000000L generic.build.board=ESP8266_ESP01 generic.build.core=esp8266 generic.build.variant=generic +generic.build.flash_mode=qio +generic.build.flash_size=512K +generic.build.flash_freq=40 generic.menu.CpuFrequency.80=80 MHz generic.menu.CpuFrequency.80.build.f_cpu=80000000L @@ -28,29 +32,52 @@ generic.menu.UploadSpeed.9600=9600 generic.menu.UploadSpeed.9600.upload.speed=9600 generic.menu.UploadSpeed.57600=57600 generic.menu.UploadSpeed.57600.upload.speed=57600 -generic.menu.UploadSpeed.256000=256000 +generic.menu.UploadSpeed.256000.windows=256000 generic.menu.UploadSpeed.256000.upload.speed=256000 +generic.menu.UploadSpeed.230400.linux=230400 +generic.menu.UploadSpeed.230400.macosx=230400 +generic.menu.UploadSpeed.230400.upload.speed=230400 +generic.menu.UploadSpeed.460800.linux=460800 +generic.menu.UploadSpeed.460800.macosx=460800 +generic.menu.UploadSpeed.460800.upload.speed=460800 +generic.menu.UploadSpeed.512000.windows=512000 +generic.menu.UploadSpeed.512000.upload.speed=512000 generic.menu.UploadSpeed.921600=921600 generic.menu.UploadSpeed.921600.upload.speed=921600 +generic.menu.FlashSize.512K=512K +generic.menu.FlashSize.512K.build.flash_size=512K +generic.menu.FlashSize.256K=256K +generic.menu.FlashSize.256K.build.flash_size=256K +generic.menu.FlashSize.1M=1M +generic.menu.FlashSize.1M.build.flash_size=1M +generic.menu.FlashSize.2M=2M +generic.menu.FlashSize.2M.build.flash_size=2M +generic.menu.FlashSize.4M=4M +generic.menu.FlashSize.4M.build.flash_size=4M + ############################################################## -wifio.name=Wifio - -wifio.upload.tool=esptool -wifio.upload.speed=115200 -wifio.upload.resetmethod=wifio -wifio.upload.maximum_size=524288 -wifio.upload.wait_for_upload_port=true - -wifio.build.mcu=esp8266 -wifio.build.f_cpu=80000000L -wifio.build.board=ESP8266_WIFIO -wifio.build.core=esp8266 -wifio.build.variant=wifio - -wifio.menu.CpuFrequency.80=80MHz -wifio.menu.CpuFrequency.80.build.f_cpu=80000000L -wifio.menu.CpuFrequency.160=160MHz -wifio.menu.CpuFrequency.160.build.f_cpu=160000000L - -wifio.upload.tool=esptool +# wifio.name=Wifio +# +# wifio.upload.tool=esptool +# wifio.upload.speed=115200 +# wifio.upload.resetmethod=wifio +# wifio.upload.maximum_size=524288 +# wifio.upload.wait_for_upload_port=true +# +# wifio.build.mcu=esp8266 +# wifio.build.f_cpu=80000000L +# wifio.build.board=ESP8266_WIFIO +# wifio.build.core=esp8266 +# wifio.build.variant=wifio +# wifio.build.flash_mode=qio +# wifio.build.flash_size=512K +# wifio.build.flash_freq=40 +# +# wifio.menu.CpuFrequency.80=80MHz +# wifio.menu.CpuFrequency.80.build.f_cpu=80000000L +# wifio.menu.CpuFrequency.160=160MHz +# wifio.menu.CpuFrequency.160.build.f_cpu=160000000L +# +# wifio.upload.tool=esptool +# diff --git a/platform.txt b/platform.txt index 3490ef416..0b5b090da 100644 --- a/platform.txt +++ b/platform.txt @@ -74,7 +74,7 @@ recipe.objcopy.eep.pattern= ## Create hex #recipe.objcopy.hex.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.flags} {compiler.elf2hex.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.hex" -recipe.objcopy.hex.pattern="{compiler.tools.path}{compiler.esptool.cmd}" -eo "{build.path}/{build.project_name}.elf" -bo "{build.path}/{build.project_name}_00000.bin" -bs .text -bs .data -bs .rodata -bc -ec -eo "{build.path}/{build.project_name}.elf" -es .irom0.text "{build.path}/{build.project_name}_40000.bin" -ec +recipe.objcopy.hex.pattern="{compiler.tools.path}{compiler.esptool.cmd}" -eo "{build.path}/{build.project_name}.elf" -bo "{build.path}/{build.project_name}_00000.bin" -bm {build.flash_mode} -bf {build.flash_freq} -bz {build.flash_size} -bs .text -bs .data -bs .rodata -bc -ec -eo "{build.path}/{build.project_name}.elf" -es .irom0.text "{build.path}/{build.project_name}_40000.bin" -ec ## Compute size recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf"