Angus Gratton
99a58e5839
Merge branch 'doc/cbor_copyright' into 'master'
...
docs: Add TinyCBOR copyright line
See merge request espressif/esp-idf!5880
2019-08-23 15:49:10 +08:00
zhangyanjiao
ff96965a91
wifi: fix the bug for softAP set authmode
2019-08-23 14:37:08 +08:00
Mahavir Jain
141a287c8a
Merge branch 'bugfix/fix_code_snippet_in_http_server_docs' into 'master'
...
Fixed syntax error in esp_http_server.rst
See merge request espressif/esp-idf!5844
2019-08-23 14:26:03 +08:00
Mahavir Jain
8e7c71a1a0
Merge branch 'bugfix/cmake_src_exclude_issue' into 'master'
...
cmake: fix issue with handling of EXCLUDE_SRCS
See merge request espressif/esp-idf!5869
2019-08-23 14:21:16 +08:00
Angus Gratton
ba647b9710
Merge branch 'bugfix/flash_encryption_regressions' into 'master'
...
fix flash encryption regressions, add tests
Closes IDFGH-1538, IDFGH-1661, and IDF-770
See merge request espressif/esp-idf!5634
2019-08-23 12:37:55 +08:00
Ivan Grokhotkov
12c9d9a564
spi_flash: remove duplicate definition of spi_flash_unlock
...
The other (static) definition is in flash_ops.c, all references are
also in flash_ops.c.
2019-08-23 12:37:55 +08:00
Angus Gratton
2f557d1a59
Merge branch 'bugfix/openocd_ulp_install_instructions' into 'master'
...
docs: ulp: update for IDF Tools installation method
Closes IDF-825
See merge request espressif/esp-idf!5860
2019-08-23 09:38:47 +08:00
wangmengyang
76b6902e96
components/bt: set the minimum encryption key size to be 7 octects for BR/EDR link for preventing KNOB attack
...
This patch is to address the CVE-2019-9506 vulnerability.
2019-08-23 08:26:15 +08:00
Angus Gratton
e28b6e59b6
docs: Add TinyCBOR copyright line
2019-08-23 09:20:08 +10:00
Angus Gratton
f4d03fe965
Merge branch 'feature/add_tinycbor_library' into 'master'
...
add tinycbor library and example
See merge request espressif/esp-idf!5794
2019-08-23 07:14:19 +08:00
Roland Dobai
8bf1ef2bfe
Tools: Add OpenOCD for the ARM architecture
2019-08-22 16:51:04 +02:00
Ivan Grokhotkov
0d188c8917
Merge branch 'doc/update_ulp_install_translation' into 'bugfix/openocd_ulp_install_instructions'
...
update translation of ulp install instuctions
See merge request espressif/esp-idf!5862
2019-08-22 19:45:02 +08:00
Roland Dobai
8b8b2f12e4
Fix sdkconfig.rename paths for confgen.py in MSYS
...
Closes https://github.com/espressif/esp-idf/issues/3950
2019-08-22 11:48:19 +02:00
suda-morris
5a09de8245
cbor: add tinycbor library and example
2019-08-22 17:44:29 +08:00
Mahavir Jain
1248f17749
cmake: fix issue with handling of EXCLUDE_SRCS
2019-08-22 13:17:44 +05:30
Angus Gratton
f85ba3516f
Merge branch 'bugfix/fix_project_ver_issue' into 'master'
...
CMake: fix retrieving PROJECT_VER
See merge request espressif/esp-idf!5842
2019-08-22 10:47:06 +08:00
Renz Christian Bagaporo
72ddc940e0
cmake: hide internal targets
...
Use imported library, which does not create additional rules, but still
allows attaching arbitraty properties instead of custom targets. This
allows the targets to not appear in the target list of IDEs such as
CLion.
2019-08-22 09:39:24 +08:00
suda-morris
43b29e4f4d
doc: update translation of ulp install instuctions
2019-08-21 21:52:48 +08:00
Jiang Jiang Jian
0a30468945
Merge branch 'feature/wifi_use_new_event_api' into 'master'
...
esp_wifi/event: wifi use new event api
Closes WIFI-696
See merge request espressif/esp-idf!5454
2019-08-21 21:12:28 +08:00
Ivan Grokhotkov
5ba9be9c2e
docs: ulp: update for IDF Tools installation method
...
binutils-esp32ulp is installed automatically by install.sh/install.bat
or the IDF Tools Installer for Windows.
2019-08-21 14:45:33 +02:00
KonstantinKondrashov
c543aac91e
bootloader: API for the fast wakeup and custom using RTC mem
...
Added "Reserve RTC FAST memory for custom purposes" option.
Added a boot counter.
2019-08-21 11:44:37 +00:00
KonstantinKondrashov
abffc3b11d
docs: Add a description of the fast wakeup
2019-08-21 11:44:37 +00:00
KonstantinKondrashov
83db8d402b
examples: Add the fast wakeup option for deep sleep examples
...
The CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP option is enabled
by default for the following examples:
- system/deep_sleep,
- system/ulp,
- system/ulp_adc.
2019-08-21 11:44:37 +00:00
Tim Nordell
43393cf4d1
bootloader: Support for skipping validation upon wake from deep sleep
...
This saves time when waking up from deep sleep, but potentially decreases
the security of the system. If the application able to modify itself
(especially areas that are loaded into RAM) in flash while running
without crashing or is modifies the cached bits of information about
what was last booted from the bootloader, this could cause security
issues if the user does a "deep sleep reset" since the full validation
is skipped.
Signed-off-by: Tim Nordell <tim.nordell@nimbelink.com>
2019-08-21 11:44:37 +00:00
Tim Nordell
82984f0539
bootloader: Do not obfuscate RAM if we are not doing image validation
...
No need to take this step if we are not doing image validation. The
obfuscation only buys us a tiny bit of "security" anyways since the
main parts of flash are memory mapped, too. This saves a little bit of
wake-up time when waking up from deep sleep when the
BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP option is set.
Signed-off-by: Tim Nordell <tim.nordell@nimbelink.com>
2019-08-21 11:44:37 +00:00
Tim Nordell
1e32fa2cf7
bootloader: Remove extraneous newlines from some debug statements
...
ESP_LOGD(...) provides its own new lines so remove these from these
debug strings.
Signed-off-by: Tim Nordell <tim.nordell@nimbelink.com>
2019-08-21 11:44:37 +00:00
Mahavir Jain
d9c02bc36c
Merge branch 'nimble/misc_menuconfig_options' into 'master'
...
NimBLE: Add misc menuconfig options
See merge request espressif/esp-idf!5843
2019-08-21 19:28:47 +08:00
Prasad Alatkar
393eb1700d
NimBLE: Add misc menuconfig options
...
- Add option to configure stack size of NimBLE host task, update NimBLE
submodule for the same.
- Change max concurrent connections supported to 9 inline with controller.
2019-08-21 19:28:47 +08:00
Jiang Jiang Jian
14608cc0fb
Merge branch 'Bugfix/nonblocking_udp_is_zero' into 'master'
...
fix bug for nonblocking udp is zero
Closes WIFI-756
See merge request espressif/esp-idf!5792
2019-08-21 16:44:11 +08:00
Angus Gratton
3aef62527a
Merge branch 'update/cjson_v1_7_12' into 'master'
...
Update cJSON to v1.7.12
See merge request espressif/esp-idf!5776
2019-08-21 16:40:35 +08:00
Angus Gratton
fe376f9f04
Merge branch 'bugfix_kconfig_deps_missing' into 'master'
...
kconfig: Add -MP option so .d files include empty targets
See merge request espressif/esp-idf!5820
2019-08-21 16:19:59 +08:00
Angus Gratton
5a3bad6119
Merge branch 'feature/freebsd_build_system' into 'master'
...
build systems: Changes to work on FreeBSD
Closes IDFGH-1657
See merge request espressif/esp-idf!5821
2019-08-21 16:18:47 +08:00
Angus Gratton
319d44b1a6
Merge branch 'bugfix/esp_timer_null_checks' into 'master'
...
esp_timer: Add parameter NULL checks to public API
See merge request espressif/esp-idf!5804
2019-08-21 16:17:15 +08:00
Michael
b7e73025fe
Fixed syntax error in esp_http_server.rst
...
Changed the "const char[] name" into "const char name[]", so now the code doesn't produce the "expected identifier or '(' before '[' token" error.
Closes https://github.com/espressif/esp-idf/pull/3940
2019-08-21 12:31:46 +05:30
Renz Christian Bagaporo
4690152eca
cmake: make default version 1
2019-08-21 12:46:38 +08:00
Renz Christian Bagaporo
3eecd43b31
cmake: fix issue with checking build process args
2019-08-21 12:20:46 +08:00
xueyunfei
36920b4062
fix bug for nonblocking udp is zero
2019-08-21 11:25:17 +08:00
Renz Christian Bagaporo
a1a2f33459
esptool_py: add missing phony build targets for CMake
...
Adds targets erase_flash and monitor for users not using idf.py.
Closes https://github.com/espressif/esp-idf/issues/2420 .
2019-08-21 10:01:00 +08:00
Sergei Silnov
58418c790a
idf.py: Add support for deprecation of command/options
2019-08-20 16:10:25 +02:00
Ivan Grokhotkov
02c7c3885e
Merge branch 'bugfix/openocd_ulp_install_instructions' into 'master'
...
docs: jtag-debugging: update for IDF Tools installation method
Closes IDF-824
See merge request espressif/esp-idf!5803
2019-08-20 21:34:45 +08:00
suda-morris
7237e6fab7
docs: jtag-debugging: update translation
2019-08-20 14:49:48 +02:00
Ivan Grokhotkov
209fdc1e05
docs: jtag-debugging: update for IDF Tools installation method
...
- rely on OPENOCD_SCRIPTS variable in all cases, remove -s flags
- replace installation section with a reference to the Getting Started
guides
- add Windows-specific commands in a few cases
2019-08-20 14:49:48 +02:00
Ivan Grokhotkov
636c6a9a30
Merge branch 'feature/ulp_macro_updates' into 'master'
...
ulp: updates for ULP macros (PRs from Github)
Closes IDFGH-1492
See merge request espressif/esp-idf!5801
2019-08-20 20:40:09 +08:00
Nachiket Kukade
19a1af88a5
wps: Relax the check on older config methods in case of WPS2.0
...
Some APs incorrectly advertize newer WPS2.0 config method bits
without setting bits for the corresponding older methods. This
results in failures during 8-way handshake. Add a workaround to
relax this check so that WPS handshake can proceed.
2019-08-20 09:58:41 +00:00
liu zhifu
003a9872b7
esp_wifi: wifi support new event mechanism
...
1. WiFi support new event mechanism
2. Update examples to use new event mechanism
2019-08-20 09:39:51 +00:00
Ivan Grokhotkov
5944f575cf
Merge branch 'bugfix/newlib_time_test' into 'master'
...
newlib: Fix UT - test time adjustment happens linearly
See merge request espressif/esp-idf!5712
2019-08-20 16:24:30 +08:00
Angus Gratton
60eec0e969
Merge branch 'bugfix/set_mconf_idf_build_dir' into 'master'
...
cmake: set build dir for mconf-idf
See merge request espressif/esp-idf!5819
2019-08-20 13:10:36 +08:00
Angus Gratton
60d46f9795
Merge branch 'feat/idf_py_set_target' into 'master'
...
idf_py: support new command set-target
See merge request espressif/esp-idf!5785
2019-08-20 12:30:50 +08:00
Krzysztof Budzynski
691b81ec25
Merge branch 'doc/bootloader_zh_CN' into 'master'
...
zh_CN translation of bootloader document
See merge request espressif/esp-idf!4746
2019-08-20 05:14:17 +08:00
Jiang Jiang Jian
23aef7d8d8
Merge branch 'cleanup/make_supp_headers_private' into 'master'
...
wpa_supplicant: Make internally used crypto headers private
Closes IDF-476
See merge request espressif/esp-idf!5666
2019-08-19 17:11:34 +08:00