]> granicus.if.org Git - esp-idf/commitdiff
Merge branch 'feature/dfs' into 'master'
authorIvan Grokhotkov <ivan@espressif.com>
Sun, 22 Oct 2017 04:34:11 +0000 (12:34 +0800)
committerIvan Grokhotkov <ivan@espressif.com>
Sun, 22 Oct 2017 04:34:11 +0000 (12:34 +0800)
Dynamic frequency scaling

See merge request !1189

1  2 
components/esp32/cpu_start.c
components/freertos/include/freertos/FreeRTOSConfig.h
components/soc/esp32/include/soc/soc.h
components/spi_flash/flash_ops.c
docs/Doxyfile
docs/api-reference/system/index.rst
tools/unit-test-app/components/unity/unity_platform.c

Simple merge
Simple merge
diff --cc docs/Doxyfile
Simple merge
index e5f457f619f408476b1094aa79454981ee35282b,d4f08528d8e864da5bff2a4b7bf44af45e8f5087..a4c348170b320647d33753dbc04b0ffcfe56bd17
@@@ -8,9 -8,9 +8,10 @@@ System AP
     Heap Memory Debugging <heap_debug>
     Interrupt Allocation <intr_alloc>
     Watchdogs <wdts>
 +   Hooks <hooks>
     Over The Air Updates (OTA) <ota>
     Sleep Modes <sleep_modes>
+    Power Management <power_management>
     Logging <log>
     Base MAC address <base_mac_address>
     Application Level Tracing <app_trace>