Ivan Grokhotkov
88dc626fd7
Merge branch 'feature/example_defconfig_ci' into 'master'
...
ci, examples: use sdkconfig.ci as an extra defaults file, if present
See merge request idf/esp-idf!3934
2018-12-21 12:14:57 +08:00
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
16854e1f40
Merge branch 'bugfix/cmake_list_component_config_alphabetically' into 'master'
...
List menuconfig component config items alphabetically via component name
See merge request idf/esp-idf!3939
2018-12-21 07:50:31 +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
Angus Gratton
aafaf155a8
Merge branch 'bugfix/py_imp_deprecated' into 'master'
...
Fix Python3 deprecation warning for the imp module & run multi-device tests only under Python 2
See merge request idf/esp-idf!3972
2018-12-21 07:44:22 +08:00
Renz Christian Bagaporo
7254476acb
docs: list kconfig components alphabetically via component name
2018-12-20 19:57:46 +08:00
Roland Dobai
0ad452e7b7
ci: Multi-device tests cannot run under Python 3
2018-12-20 12:44:33 +01:00
Roland Dobai
4ca2b149e5
examples, tools: Fix Python3 deprecation warning for the imp module
2018-12-20 12:44:33 +01:00
Renz Christian Bagaporo
16c88bf320
cmake: list items in component config via alphabetical component name
2018-12-20 19:08:00 +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
Ivan Grokhotkov
e2fbee9f9f
Merge branch 'docs/watchpoints_config_gdbinit' into 'master'
...
docs: Adds watchpoints limit configuration to example gdbinit
See merge request idf/esp-idf!3502
2018-12-20 15:13:56 +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
Alexey Gerenkov
3dcc0ae908
docs: Adds watchpoints limit configuration to example gdbinit
...
Closes https://github.com/espressif/esp-idf/issues/2335
2018-12-20 06:09:23 +00: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
7b13308549
Merge branch 'feature/pystyle_tools' into 'master'
...
tools: Fix the Python coding style
See merge request idf/esp-idf!3901
2018-12-20 10:36:01 +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
Angus Gratton
ee7b660163
Merge branch 'bugfix/windows_install_prerequisites_idf_path' into 'master'
...
windows_install_prerequisites: Fix bug if IDF_PATH is not set
See merge request idf/esp-idf!3874
2018-12-20 09:19:03 +08: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
Roland Dobai
bfa9610f58
tools: Fix the Python coding style
2018-12-19 11:56:24 +01: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
fe71ec413d
Merge branch 'feature/app_rollback_example' into 'master'
...
example: App rollback example
See merge request idf/esp-idf!3561
2018-12-19 14:41:54 +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
ca3641cdd5
Merge branch 'bugfix/fix_aws_iot_example_root_ca' into 'master'
...
examples: update default root-ca for aws_iot demos
See merge request idf/esp-idf!3929
2018-12-18 14:47:44 +08:00
Mahavir Jain
9a9a319207
examples: update default root-ca for aws_iot demos
2018-12-18 11:05:16 +05:30
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
b3249d56f3
unit tests: Fix retrying with a new baud rate in IDFDUT.start_app()
2018-12-18 14:09:29 +11: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
0a27cfa850
unit_test.py: Allow importing tiny-test-fw from IDF_PATH as well as TEST_FW_PATH
2018-12-18 14:09:05 +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
Angus Gratton
b240a181b7
docs: Add option to redirect documentation pages which have moved
2018-12-18 14:07:43 +11:00
Angus Gratton
d8b625a32c
Merge branch 'feature/pystyle_components' into 'master'
...
components: Correct the Python coding style
See merge request idf/esp-idf!3882
2018-12-18 11:03:03 +08:00
Angus Gratton
15a7ad78f7
Merge branch 'feature/rename_main_instructions' into 'master'
...
Add instructions on how to rename main component
See merge request idf/esp-idf!3933
2018-12-18 08:08:20 +08:00