Ivan Grokhotkov
71c90ac456
Merge branch 'feature/freemodbus_move_rs485_mode_control' into 'master'
...
examples: freemodbus port serial slave move uart mode settings into example
See merge request idf/esp-idf!3870
2018-12-21 12:13:28 +08:00
Ivan Grokhotkov
1cb65b3e5f
Merge branch 'bugfix/bbpll_wakeup_reset_2' into 'master'
...
soc/rtc: reset another BBPLL related register
See merge request idf/esp-idf!3947
2018-12-21 12:09:18 +08:00
Ivan Grokhotkov
75ef4b2242
Merge branch 'bugfix/ext_ram_bss_align' into 'master'
...
Fix crash if ext_ram_bss is unaligned length
See merge request idf/esp-idf!4000
2018-12-21 12:06:58 +08:00
Ivan Grokhotkov
cd29cffa20
Merge branch 'bugfix/mdns_crash_when_query' into 'master'
...
mdns issues when query
See merge request idf/esp-idf!3910
2018-12-21 11:57:56 +08:00
Angus Gratton
78487123bf
Merge branch 'feature/cut_len_for_header_struct' into 'master'
...
build: Add trimming PROJECT_VER and PROJECT_NAME vars
See merge request idf/esp-idf!3927
2018-12-21 07:45:22 +08:00
Jiang Jiang Jian
65142bc59e
Merge branch 'bugfix/btdm_configure_ssp_in_menuconfig' into 'master'
...
components/bt: Configure SSP in menuconfig and fix two bugs
See merge request idf/esp-idf!3892
2018-12-20 15:31:08 +08:00
Jiang Jiang Jian
f8910cecce
Merge branch 'bugfix/btdm_fix_crash_adv_scan_coex' into 'master'
...
component/bt: fix crash when adv and scan coex and optimize duplicate scan
See merge request idf/esp-idf!3975
2018-12-20 14:59:20 +08:00
baohongde
d601ed8023
components/bt: Fix two bugs about pairing
...
1. Fix Legacy Pairing failed without remote device name
2. Fix discovery no device after disabling SSP
2018-12-20 11:10:52 +08:00
baohongde
9c48528fcc
components/bt: Configure SSP in menuconfig
2018-12-20 11:10:27 +08:00
Angus Gratton
e1a1c7f17c
psram: Use 8-bit type for _ext_ram_bss_start/_ext_ram_bss_end
...
Fixes pointer arithmetic when printing size of remaining heap
2018-12-20 01:40:05 +00:00
Angus Gratton
b1f3586f7e
multi_heap: Fix bug when start of heap is unaligned
...
Alignment was accounted for in one place only.
TW27954
2018-12-20 01:40:05 +00:00
Angus Gratton
db243d092c
linker external bss: Align end of ext bss to word boundary
...
TW27954
2018-12-20 01:40:05 +00:00
Jiang Jiang Jian
14d7a63459
Merge branch 'bugfix/wifi_rx_fail' into 'master'
...
wifi: fix wifi rx fails
See merge request idf/esp-idf!3976
2018-12-19 19:12:36 +08:00
aleks
5379c941b8
examples: freemodbus port serial slave move uart mode settings into example
...
Update freemodbus component file esp-idf/components/freemodbus/port/portserial.c to remove UART mode settings;
Move UART mode settings into esp-idf/examples/protocols/modbus_slave/main/freemodbus.c
Move UART pin settings from Component config into example Kconfig.projbuild file
Move setup of UART port pins from freemodbus component into example file
TW#27721
Closes https://github.com/espressif/esp-idf/issues/2784#issuecomment-443600157
2018-12-19 08:03:18 +00:00
Angus Gratton
d453cce1b3
Merge branch 'bugfix/individual_custom_sections' into 'master'
...
linker: When using section type attributes, create unique sections
See merge request idf/esp-idf!3920
2018-12-19 15:18:26 +08:00
Angus Gratton
ad200227d2
Merge branch 'feature/add_rollback_flags' into 'master'
...
bootloader/app_update: Add a support of an app rollback.
See merge request idf/esp-idf!3547
2018-12-19 14:28:11 +08:00
Angus Gratton
769bd4a4af
linker: When using section type attributes, create unique sections
...
* Prevents section type conflict errors if (say) const & non-const data
is put into the same section (ie with DRAM_ATTR)
* Allows linker --gc-sections to remove unused custom sections
2018-12-19 04:42:04 +00:00
Angus Gratton
6dba472678
Merge branch 'bugfix/unit_test_keep_serial_port_open' into 'master'
...
unit test: Keep serial port open when running esptool
See merge request idf/esp-idf!3889
2018-12-19 07:06:17 +08:00
qiyueixa
2b83460814
wifi: fix wifi rx fails
...
1. add MAC reset.
2. update libphy.a from 4000 to 4006.
2018-12-18 23:39:54 +08:00
Konstantin Kondrashov
51133083f6
app_update: Add EXCLUDE option
...
Added two options for PROJECT_NAME and PROJECT_VER variables to exclude them from the firmware image.
Closes: https://github.com/espressif/esp-idf/issues/2803
2018-12-18 15:58:47 +08:00
Konstantin Kondrashov
7b68e346fa
build: Fix a warning from git describe
...
Fixed a fatal message when run `git describe`.
2018-12-18 15:58:22 +08:00
Wang Jia Lin
f58f39e2f0
Merge branch 'bugfix/clear_intr_status_when_init_hwtimer' into 'master'
...
bugfix(timer_group): fixed bug that init hw_timer caused cresh after system soft reset
See merge request idf/esp-idf!3945
2018-12-18 15:21:23 +08:00
Angus Gratton
42dcdecce2
Merge branch 'doc/network' into 'master'
...
docs: Rearrange wifi & ethernet docs under "Networking", add tcpip_adapter docs
See merge request idf/esp-idf!3890
2018-12-18 13:15:05 +08:00
kooho
e22c0cce45
driver(timer_group): fixed bug that init hw_timer caused cresh after system soft reset
...
closes https://github.com/espressif/esp-idf/issues/2756
2018-12-18 13:10:15 +08:00
Jiang Jiang Jian
1607812fef
Merge branch 'bugfix/btdm_fix_receive_adv_pkt_when_duplicate_scan_enabled' into 'master'
...
Component/bt: fix receive adv pkt when enable duplicate scan
See merge request idf/esp-idf!3783
2018-12-18 11:44:38 +08:00
Jiang Jiang Jian
fd520a94d7
Merge branch 'bugfix/tw27963_fix_wifi_stop_bug' into 'master'
...
esp32: fix WiFi stop bug in WiFi/BT coexist mode
See merge request idf/esp-idf!3979
2018-12-18 11:40:28 +08:00
Jiang Jiang Jian
9eb2287729
Merge branch 'bugfix/btdm_prevent_light_sleep' into 'master'
...
bugfix/btdm_prevent_light_sleep
See merge request idf/esp-idf!3980
2018-12-18 11:34:50 +08:00
Angus Gratton
f6e857c2b9
unit tests: Keep serial port open when running esptool
...
* Call esptool directly not via subprocess
* Use the same serial port instance for listener thread and esptool
* Includes some refactoring for encapsulation of App vs DUT members
2018-12-18 14:09:29 +11:00
Angus Gratton
9a08e49ca9
tcpip_adapter: Rename DHCP option types to include DHCP in the type name
2018-12-18 14:07:43 +11:00
Angus Gratton
ede47ed33a
tcpip_adapter: Update header descriptions, constify some parameters
2018-12-18 14:07:43 +11:00
Liu Zhi Fu
b3380b79d1
esp32: fix WiFi stop bug in WiFi/BT coexist mode
...
This fix includes following changes:
1. Fix the bug that esp_restart()/esp_wifi_stop() sometimes fails in WiFi/BT coexist mode.
2. Add a timer for WiFi stop and stop WiFi forcibly once the timer expires.
2018-12-17 20:33:31 +08:00
wangmengyang
561021e7f7
component/bt: use a pm_lock to prevent light sleep when bluetooth is enabled due to current imcompatibility
2018-12-17 19:54:57 +08:00
David Cermak
6bb68a5a75
mdns: fixed static memory leak
2018-12-17 12:09:23 +01:00
David Cermak
c8cb4cd3c8
mdns: check all mallocs for failure and add default hook to log error with free heap
...
solves crash about _mdns_result_txt_create when stress test
2018-12-17 12:09:11 +01:00
zhiweijian
05e84cad1e
Component/bt: fix receive adv pkt when enable duplicate scan
2018-12-17 15:49:04 +08:00
Roland Dobai
e1e6c1ae0a
components: Correct the Python coding style
2018-12-17 07:52:38 +01:00
Angus Gratton
c69907a54b
Merge branch 'bugfix/ota_magic_byte_issue' into 'master'
...
bugfix/ota_magic_byte_issue: Fixes OTA magic byte error
See merge request idf/esp-idf!3936
2018-12-17 13:19:44 +08:00
Supreet Deshpande
1d4bb7cc4d
bugfix/ota_magic_byte_issue: Fix indent and replace constant by macro
...
Replace 0xE9 by ESP_IMAGE_HEADER_MAGIC.
2018-12-17 09:56:18 +05:30
zwj
90a451c181
fix crash when adv and scan coex and optimize duplicate scan
2018-12-17 11:40:50 +08:00
Jiang Jiang Jian
5436be94b6
Merge branch 'bugfix/btdm_assert_ble_65536' into 'master'
...
fix bug that there's very low ratio to cause BLE assert(65536, 0) in rwble.c at line 222
See merge request idf/esp-idf!3966
2018-12-14 20:29:04 +08:00
Ivan Grokhotkov
da2116f55c
Merge branch 'bugfix/build_system_test_fixes_windows' into 'master'
...
Various fixes for build tests on Windows
See merge request idf/esp-idf!3944
2018-12-14 20:19:51 +08:00
Tian Hao
1a4fa06125
fix bug that there's very low ratio to cause BLE assert(65536, 0) in rwble.c at line 222
2018-12-14 17:38:52 +08:00
Jiang Jiang Jian
6cb37ecc57
Merge branch 'bugfix/btdm_modem_sleep_cowork_with_DFS' into 'master'
...
bugfix/btdm_modem_sleep_cowork_with_DFS
See merge request idf/esp-idf!3797
2018-12-14 14:03:56 +08:00
wangmengyang
b4299433bd
component/bt: add DRAM_ATTR attribute to global variables(bss segment) in bt.c which can be accessed in ISR
2018-12-14 11:29:00 +08:00
Jiang Jiang Jian
bc30569842
Merge branch 'bufix/btdm_fix_save_key_when_auth_mode_without_bond' into 'master'
...
Component/bt: fix save keys when auth mode without bond
See merge request idf/esp-idf!3782
2018-12-14 10:35:14 +08:00
Renz Christian Bagaporo
72cd1ac43f
mbedtls: fix issue with non idf.py build on windows
2018-12-13 20:44:29 +08:00
Jiang Jiang Jian
58a200e70c
Merge branch 'bugfix/btdm_fix_auth_mode_error_when_reconnection_in_smp' into 'master'
...
Component/bt: fix auth_mode error when reconnection in SMP
See merge request idf/esp-idf!3856
2018-12-13 17:04:12 +08:00
zhiweijian
7c6211fe45
Component/bt: fix save keys when auth mode without bond
2018-12-13 15:43:31 +08:00
Jiang Jiang Jian
d75ab3208f
Merge branch 'test/add_case_to_detect_ds2ds_issue' into 'master'
...
test: add case to detect ds2ds issue
See merge request idf/esp-idf!3834
2018-12-13 14:49:30 +08:00
Jiang Jiang Jian
bfd22a24da
Merge branch 'bugfix/btdm_fix_accept_specified_sec_auth' into 'master'
...
Component/bt: fix accept specified sec auth error
See merge request idf/esp-idf!3770
2018-12-13 11:19:53 +08:00