arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-16 11:21:18 +03:00
Code Activity

Merge remote-tracking branch 'remotes/esp8266/esp8266' into esp8266

Browse Source
This commit is contained in:
Markus Sattler
2015-04-30 09:58:36 +02:00
parent b0dfb539c1 c9b5ddeebc
commit 8cc844f539
11 changed files with 68 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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```. - ```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)``` 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.macAddress(mac)``` is for STA, ```WiFi.softAPmacAddress(mac)``` is for AP.
- ```WiFi.localIP()``` is for STA, ```WiFi.softAPIP()``` is for AP. - ```WiFi.localIP()``` is for STA, ```WiFi.softAPIP()``` is for AP.
- ```WiFi.RSSI()``` doesn't work - ```WiFi.RSSI()``` doesn't work

30
build/build.xml
View File

@ -383,13 +383,13 @@
</antcall> </antcall>
<antcall target="unzip"> <antcall target="unzip">
<param name="archive_file" value="${staging_folder}/esptool-0.4.2-osx.zip" /> <param name="archive_file" value="${staging_folder}/esptool-0.4.3-osx.zip" />
<param name="archive_url" value="https://github.com/igrr/esptool-ck/releases/download/0.4.2/esptool-0.4.2-osx.zip" /> <param name="archive_url" value="https://github.com/igrr/esptool-ck/releases/download/0.4.3/esptool-0.4.3-osx.zip" />
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-osx" /> <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.3-osx" />
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" /> <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
</antcall> </antcall>
<move file="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-osx/esptool" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool" /> <move file="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.3-osx/esptool" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool" />
<delete dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-osx/" /> <delete dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.3-osx/" />
</target> </target>
@ -663,13 +663,13 @@
</antcall> </antcall>
<antcall target="unzip"> <antcall target="unzip">
<param name="archive_file" value="${staging_folder}/esptool-0.4.2-linux64.zip" /> <param name="archive_file" value="${staging_folder}/esptool-0.4.3-linux64.zip" />
<param name="archive_url" value="https://github.com/igrr/esptool-ck/releases/download/0.4.2/esptool-0.4.2-linux64.zip" /> <param name="archive_url" value="https://github.com/igrr/esptool-ck/releases/download/0.4.3/esptool-0.4.3-linux64.zip" />
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-linux64" /> <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.3-linux64" />
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" /> <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
</antcall> </antcall>
<move file="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-linux64/esptool" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool" /> <move file="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.3-linux64/esptool" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool" />
<delete dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-linux64/" /> <delete dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.3-linux64/" />
</target> </target>
@ -898,13 +898,13 @@
<antcall target="unzip"> <antcall target="unzip">
<param name="archive_file" value="${staging_folder}/esptool-0.4.2-win32.zip" /> <param name="archive_file" value="${staging_folder}/esptool-0.4.3-win32.zip" />
<param name="archive_url" value="https://github.com/igrr/esptool-ck/releases/download/0.4.2/esptool-0.4.2-win32.zip" /> <param name="archive_url" value="https://github.com/igrr/esptool-ck/releases/download/0.4.3/esptool-0.4.3-win32.zip" />
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-win32" /> <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.3-win32" />
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" /> <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
</antcall> </antcall>
<move file="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-win32/esptool.exe" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool.exe" /> <move file="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.3-win32/esptool.exe" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool.exe" />
<delete dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-win32/" /> <delete dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.3-win32/" />
</target> </target>

1
build/esptool-0.0.3.tgz.sha
View File

@ -1 +0,0 @@
e8c6df47299348a0233e18647e2ed93c8afe65c2

1
build/linux/esptool-0.4.2-linux64.zip.sha
View File

@ -1 +0,0 @@
b89b50beb56f0f355d8d14104fb01d523140fe91

1
build/linux/esptool-0.4.3-linux64.zip.sha Normal file
View File

@ -0,0 +1 @@
f183d52557a50dd362fcb4d45ffd6612b328e465

1
build/macosx/esptool-0.4.2-osx.zip.sha
View File

@ -1 +0,0 @@
0bc15099eb589dddff3c43f3e8107728a75fcdfb

1
build/macosx/esptool-0.4.3-osx.zip.sha Normal file
View File

@ -0,0 +1 @@
544070e40abd3a81cad554020be86157674f9794

1
build/windows/esptool-0.4.2-win32.zip.sha
View File

@ -1 +0,0 @@
3031f2d590544403f5c1a90dcc7f549b9144b309

1
build/windows/esptool-0.4.3-win32.zip.sha Normal file
View File

@ -0,0 +1 @@
10eb2292bb20accceb7389ab91fa40afd5b1fb70

69
hardware/esp8266com/esp8266/boards.txt
View File

@ -1,5 +1,6 @@
menu.UploadSpeed=Upload Speed menu.UploadSpeed=Upload Speed
menu.CpuFrequency=CPU Frequency menu.CpuFrequency=CPU Frequency
menu.FlashSize=Flash size
############################################################## ##############################################################
generic.name=Generic ESP8266 Module generic.name=Generic ESP8266 Module
@ -16,6 +17,9 @@ generic.build.f_cpu=80000000L
generic.build.board=ESP8266_ESP01 generic.build.board=ESP8266_ESP01
generic.build.core=esp8266 generic.build.core=esp8266
generic.build.variant=generic 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=80 MHz
generic.menu.CpuFrequency.80.build.f_cpu=80000000L 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.9600.upload.speed=9600
generic.menu.UploadSpeed.57600=57600 generic.menu.UploadSpeed.57600=57600
generic.menu.UploadSpeed.57600.upload.speed=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.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=921600
generic.menu.UploadSpeed.921600.upload.speed=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.name=Wifio
#
wifio.upload.tool=esptool # wifio.upload.tool=esptool
wifio.upload.speed=115200 # wifio.upload.speed=115200
wifio.upload.resetmethod=wifio # wifio.upload.resetmethod=wifio
wifio.upload.maximum_size=524288 # wifio.upload.maximum_size=524288
wifio.upload.wait_for_upload_port=true # wifio.upload.wait_for_upload_port=true
#
wifio.build.mcu=esp8266 # wifio.build.mcu=esp8266
wifio.build.f_cpu=80000000L # wifio.build.f_cpu=80000000L
wifio.build.board=ESP8266_WIFIO # wifio.build.board=ESP8266_WIFIO
wifio.build.core=esp8266 # wifio.build.core=esp8266
wifio.build.variant=wifio # wifio.build.variant=wifio
# wifio.build.flash_mode=qio
wifio.menu.CpuFrequency.80=80MHz # wifio.build.flash_size=512K
wifio.menu.CpuFrequency.80.build.f_cpu=80000000L # wifio.build.flash_freq=40
wifio.menu.CpuFrequency.160=160MHz #
wifio.menu.CpuFrequency.160.build.f_cpu=160000000L # wifio.menu.CpuFrequency.80=80MHz
# wifio.menu.CpuFrequency.80.build.f_cpu=80000000L
wifio.upload.tool=esptool # wifio.menu.CpuFrequency.160=160MHz
# wifio.menu.CpuFrequency.160.build.f_cpu=160000000L
#
# wifio.upload.tool=esptool
#

2
hardware/esp8266com/esp8266/platform.txt
View File

@ -74,7 +74,7 @@ recipe.objcopy.eep.pattern=
## Create hex ## 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.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 ## Compute size
recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf" recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf"