From ea049753cd7d54f6abf452b52ba938f6b1a7498b Mon Sep 17 00:00:00 2001 From: Dong Heng Date: Fri, 7 Sep 2018 13:38:35 +0800 Subject: [PATCH] feat(esp8266): Add configuration for UART baudrate --- .../bootloader_support/src/bootloader_init.c | 5 ++--- components/esp8266/Kconfig | 9 +++++++-- components/esp8266/lib/VERSION | 2 +- components/esp8266/lib/libcore.a | Bin 74900 -> 74964 bytes components/esp8266/source/phy.h | 2 +- components/esp8266/source/phy_init.c | 2 +- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/components/bootloader_support/src/bootloader_init.c b/components/bootloader_support/src/bootloader_init.c index d757e796..77edb7e7 100644 --- a/components/bootloader_support/src/bootloader_init.c +++ b/components/bootloader_support/src/bootloader_init.c @@ -553,7 +553,6 @@ void __assert_func(const char *file, int line, const char *func, const char *exp #include "esp8266/pin_mux_register.h" #include "esp8266/rom_functions.h" -#define CONFIG_CONSOLE_UART_BAUDRATE 74880 #define BOOTLOADER_CONSOLE_CLK_FREQ 52 * 1000 * 1000 extern int _bss_start; @@ -575,8 +574,6 @@ static void uart_console_configure(void) CLEAR_PERI_REG_MASK(UART_CONF1(CONFIG_CONSOLE_UART_NUM), UART_RX_FLOW_EN); CLEAR_PERI_REG_MASK(UART_CONF0(CONFIG_CONSOLE_UART_NUM), UART_TX_FLOW_EN); - uart_div_modify(CONFIG_CONSOLE_UART_NUM, BOOTLOADER_CONSOLE_CLK_FREQ / CONFIG_CONSOLE_UART_BAUDRATE); - WRITE_PERI_REG(UART_CONF0(CONFIG_CONSOLE_UART_NUM), 0 // None parity | (1 << 4) // 1-bit stop @@ -587,6 +584,8 @@ static void uart_console_configure(void) SET_PERI_REG_MASK(UART_CONF0(CONFIG_CONSOLE_UART_NUM), UART_RXFIFO_RST | UART_TXFIFO_RST); CLEAR_PERI_REG_MASK(UART_CONF0(CONFIG_CONSOLE_UART_NUM), UART_RXFIFO_RST | UART_TXFIFO_RST); #endif + + uart_div_modify(CONFIG_CONSOLE_UART_NUM, BOOTLOADER_CONSOLE_CLK_FREQ / CONFIG_CONSOLE_UART_BAUDRATE); } esp_err_t bootloader_init() diff --git a/components/esp8266/Kconfig b/components/esp8266/Kconfig index 80e23087..bf1a79f8 100644 --- a/components/esp8266/Kconfig +++ b/components/esp8266/Kconfig @@ -35,8 +35,6 @@ config SOC_FULL_ICACHE Enable this option, full 32 KB iram instead of 16 KB iram will be used as icache, so the heap use can use may reduce a lot. -endmenu - choice CONSOLE_UART_NUM prompt "UART peripheral to use for console output (0-1)" default CONSOLE_UART_CUSTOM_NUM_0 @@ -54,6 +52,13 @@ config CONSOLE_UART_NUM default 0 if CONSOLE_UART_CUSTOM_NUM_0 default 1 if CONSOLE_UART_CUSTOM_NUM_1 +config CONSOLE_UART_BAUDRATE + int "UART console baud rate" + default 74880 + range 1200 4000000 + +endmenu + menu WIFI config SCAN_AP_MAX diff --git a/components/esp8266/lib/VERSION b/components/esp8266/lib/VERSION index ea4a09d1..fe050314 100644 --- a/components/esp8266/lib/VERSION +++ b/components/esp8266/lib/VERSION @@ -1,6 +1,6 @@ gwen: crypto: 8943c89 - core: 782e796 + core: 4be8e4a net80211: 5319ba0 pp: 830c0c8 smartconfig:68bd9c5 diff --git a/components/esp8266/lib/libcore.a b/components/esp8266/lib/libcore.a index 029e731c3ad619a34420714ca9895dbc47ea6f32..b32a48d2f16921b594b3bad7d81416e90827473a 100644 GIT binary patch delta 3231 zcmZ8je`r-@82;XSH+Q#lm)pJjrKY=Qo6cd{=FBFj+`()L2Ad3BDtMI%2~jMw45T|( zsD;(=YR4bb)TI9eO<@)h3MR=^RxME(H3cnL!6MQ>v~JIH&U@mp7vArE-sgM1?|kR` zbE8-BEc`Mf1#am~+F zwhx7ZbDG{kkvPr;1QB5>jgJl}2H z5U3!gfSoS#c?`l|4h|>@o=epW=km}vXn(1w=>pGXq=rjJqsCuGYBudf1)?kBy3#1} z*O;QO!A}Lxj&1@^M&#h`2lW14png1{FUZMUIusxHtXR4wgrwj|Rqm4*2I?${OSL4O zjd7{XZNWCn&D=d4caF!UNLrk;V5QBu&2Yw%5@_mkakescf3@s#+DRKIko5IVCIETul zws{kvZ`|{*`w1d*&Vg^t5BLcp^J9*bOQn5b0zEh(zvVPTmi}V`{bWL(r<<8HdoMxG zW$%E;a6}p=)GtNOgYk}AA2zKM>N}D1ARO`P6K2Z_YTP+cA@AmI*s!f@%bQ!bG!B$cK~v|2sq%UH0^@m_0D$DK=@0`7qmHzDpIp5^IzBz?>yOAU=v;$u?69SYkF$CRbrTkK^oA@ANo zoXZIC2{+g?}9OJqbbXCx1^MLlP#OffGYUMl3@1GW|KNh6sT5G@Q~UJ`7; z>3>5pm*r!{yeuv$=F(kO%q88Xv$7MBJC6PEuKz$Wuk;KYr`5geO#+GF@Y7gHKB3rB zzF&EM19*E$90lwYoO*Jnoc8Hbo<5@#t{g*baj9U>z(w&_z-&g2*w@rk!>b#15l#&` zVoUi2z*2?+b^}fgIby2}+lt2Th?Kj~3?ooPj@VLuF|cs&!0y1QAxCT}p9GdEC}5*- zYLbdAZu_|Y$@M{T&7cj z@04oD5nJT>{vB|cfdV!|MdXMrSNyw?1mPv0&e-h8(fw@o6)t z6+C(S;lc|Mc2jwB#Fp|0snJfOdXUHwYo{irJWuir#rz|frFaPXIu~R9nXr;?Nz7ja znd1#&neya_E#=o!GuP9+sv2^{mh!29=55uGBlb0eX{{JWyb-|PE9S4lZQ^S0Vf;mq z`5yk8JO)jU*i!y?Y8pMwW7Uu&wv^`>OLB~HDr~V=RC(f=N=6ZhE#;e)e+jV&F3R)N PuoH5`R@FeSEwS)_r*4K7 delta 3174 zcmZ8je`r-@82;XScio+5YrFSuZfdrB-A{4ZwmWk|)}0wM(AYwy2H~s)N|LVpF-W{) z8XEP7bftqjW0<3&1m}dCVYH0|MNmg#N~4ehm4c*bMWO3?&UsH9_riPL=Y8JiJKuND z_nr6Ls~2((UdTBxcgEtTWaE;@hZ3Cy3Nz*HrNbW<{3ZVURNTJ}p! z^WpOLD*=Bkf6c!ke_q)!e8QIpmn0i9Ee#7~znut6+%jtSe|stu*^){}NAKoEHr$z# z+fyTPv%GrWQfW0|z~`&?<-R?+;b+osRJZPQ$iC{<-2IaR(wKF}!uf&5<8^YAS$>r8 zM?&|SxHeTAm>=ku35Rp9-#gg3CN57ki?rWx2g`NF%`@^#S}t(E#WKml(PTbWi zUk;fHBREJ`EDd!#emCU>Ya$ zo&pE&2j2v~4}R9uC@w)f1|J8{!$Umb(-1FEK7=Pm3&V-aFuyZkp07Ym0dG|0@mPen z9b8Zycy3i6oZCa=qP?x6rVTu|ks59tjT&zosd>2v1w=>0eWg+4?J-54fS&`NHyQ&j zMC9VeeR}UKP(R_*PX;rihho{`h;)lgX7Y|ygno@;UH0mjR7joO9g~_+Jx*CDbMtV_ zJ{glDskcYLN|AksVZe?QLlY0-g~}xQD`bbgfy5%5khVecV)W! zWAJY1s(q8IOFAmmo5K zcUsO9>ly3E?MSJVCq_LEk@Tf$`3<`rvh?rM=zG)hnK-lDH)Qu5ZX-`=%p$D5my_S!k}ar!v4f>~%hSMr#PR}f>J9jK)g zcLHyQlW#`cNL=OWyL`9|6g4yk53{!j4=C&kuz0K8<)u@fV2S3EpuIJ`4Xz3nPesD*guXBm6RI_zTY{ zX5Tokm`~vk#e6yeJT2!ZyB5G245uVs`O&6z@S~V@(TQcp8hGm?W{K{QJtY?Z<&7h70U4ocg$8 zOL;amPcx_*a>SknZO91sj^CKiaOI6i5?gM;)By|oH|z|Y8gj&z^7X*NFB$A>I5p&m zE#;elr4$#~IXE@sh^MYSZ3n_y9TF*9I>T*3Ru{VVL!mB zNh!9JUx8fa;sU$J`6(jF4r6IyC9rTWU_sQWAxCT}zY4j`qXM6B)sQ2$ly5^Wk5GYj zpc-<-7I^3PuK^+Dl;AZ|5jkQ@`K8M9b6yXZ3PTbG}+Jzvew~ zsd2|13SfSUNFp(o7Ism@0|6TXriL7`rF>R-zGl5}VaJ1wDNl~rQhqNrI`(hX>^5lpuok|6%$Jf*C|T6qFX8=cgubz oAx+OF+)5QfagN)Ri7n+@lz$Pi2rkO=Xj4y)*h*x_5)uvm2QfHwrx_gain_dc_table, 4 * 125);