djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

esp32/modmachine: Add support for changing the CPU frequency.

Browse Source
This commit is contained in:
Damien George 2019-02-05 23:26:01 +11:00
parent 1669e049de
commit c33f538066
4 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ports/esp32/Makefile
View File

@ -292,6 +292,7 @@ ESPIDF_ESP32_O = $(addprefix $(ESPCOMP)/esp32/,\
hw_random.o \ hw_random.o \
phy_init.o \ phy_init.o \
pm_esp32.o \ pm_esp32.o \
pm_locks.o \
intr_alloc.o \ intr_alloc.o \
dport_access.o \ dport_access.o \
wifi_init.o \ wifi_init.o \

3
ports/esp32/boards/sdkconfig
View File

@ -15,6 +15,9 @@ CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=n CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=n
CONFIG_ESP32_XTAL_FREQ_AUTO=y CONFIG_ESP32_XTAL_FREQ_AUTO=y
# Power Management
CONFIG_PM_ENABLE=y
# FreeRTOS # FreeRTOS
CONFIG_FREERTOS_UNICORE=y CONFIG_FREERTOS_UNICORE=y
CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=2 CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=2

3
ports/esp32/boards/sdkconfig.spiram
View File

@ -18,6 +18,9 @@ CONFIG_SPIRAM_USE_MEMMAP=y
CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=n CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=n
CONFIG_ESP32_XTAL_FREQ_AUTO=y CONFIG_ESP32_XTAL_FREQ_AUTO=y
# Power Management
CONFIG_PM_ENABLE=y
# FreeRTOS # FreeRTOS
CONFIG_FREERTOS_UNICORE=y CONFIG_FREERTOS_UNICORE=y
CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=2 CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=2

23
ports/esp32/modmachine.c
View File

@ -34,7 +34,8 @@
#include "freertos/task.h" #include "freertos/task.h"
#include "rom/ets_sys.h" #include "rom/ets_sys.h"
#include "rom/rtc.h" #include "rom/rtc.h"
#include "esp_system.h" #include "esp_clk.h"
#include "esp_pm.h"
#include "driver/touch_pad.h" #include "driver/touch_pad.h"
#include "py/obj.h" #include "py/obj.h"
@ -60,16 +61,24 @@ typedef enum {
STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) { STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
if (n_args == 0) { if (n_args == 0) {
// get // get
return mp_obj_new_int(ets_get_cpu_frequency() * 1000000); return mp_obj_new_int(esp_clk_cpu_freq());
} else { } else {
// set // set
mp_int_t freq = mp_obj_get_int(args[0]) / 1000000; mp_int_t freq = mp_obj_get_int(args[0]) / 1000000;
if (freq != 80 && freq != 160 && freq != 240) { if (freq != 20 && freq != 40 && freq != 80 && freq != 160 && freq != 240) {
mp_raise_ValueError("frequency can only be either 80Mhz, 160MHz or 240MHz"); mp_raise_ValueError("frequency must be 20MHz, 40MHz, 80Mhz, 160MHz or 240MHz");
}
esp_pm_config_esp32_t pm;
pm.max_freq_mhz = freq;
pm.min_freq_mhz = freq;
pm.light_sleep_enable = false;
esp_err_t ret = esp_pm_configure(&pm);
if (ret != ESP_OK) {
mp_raise_ValueError(NULL);
}
while (esp_clk_cpu_freq() != freq * 1000000) {
vTaskDelay(1);
} }
/*
system_update_cpu_freq(freq);
*/
return mp_const_none; return mp_const_none;
} }
} }