Merge branch 'feature/use_cpu_time_for_tests' into 'master'

Cache compensated timer See merge request espressif/esp-idf!6087
2019-11-20 08:33:27 +08:00
parent 412b202741 c4dc63c4d8
commit bc9267aa24
33 changed files with 1151 additions and 35 deletions
--- a/docs/en/api-reference/system/system.rst
+++ b/docs/en/api-reference/system/system.rst
@@ -139,6 +139,8 @@ To set version in your project manually you need to set ``PROJECT_VER`` variable

 If ``PROJECT_VER`` variable is not set in the project then it will be retrieved from either ``$(PROJECT_PATH)/version.txt`` file (if present) else using git command ``git describe``. If neither is available then ``PROJECT_VER`` will be set to "1". Application can make use of this by calling :cpp:func:`esp_ota_get_app_description` or :cpp:func:`esp_ota_get_partition_description` functions.

+
+
 API Reference
 -------------