Skip to content

[WIP] Handle APB frequency change #2250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Jan 9, 2019
Merged

[WIP] Handle APB frequency change #2250

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
daea578
Add APB change callbacks and move cpu code to own file
me-no-dev Dec 28, 2018
f7c56e3
Properly set esp_timer and FreeRTOS tick dividers
me-no-dev Dec 30, 2018
67d5ebc
Improve updated devisors
me-no-dev Dec 31, 2018
55c725f
No need to update REF_TICK yet
me-no-dev Dec 31, 2018
344c76d
Add initial handling for UART baud change
me-no-dev Dec 31, 2018
0532c88
fix uartWriteBuf and uartDetectBaudrate
me-no-dev Dec 31, 2018
7443fe2
trigger callbacks even when APB did not change
me-no-dev Dec 31, 2018
c31ea22
toggle UART ISR on CPU change
me-no-dev Jan 3, 2019
8b6483d
add XTAL freq getter and add cpu freq validation
me-no-dev Jan 7, 2019
28dd812
Support CPU frequency changes in I2C (#2287)
stickbreaker Jan 8, 2019
7cda07e
Implement clock change for the other peripherals
me-no-dev Jan 8, 2019
30f4fdc
remove bad CPU clock values from the menu
me-no-dev Jan 8, 2019
25a2d94
Add note to CPU freqs that support WiFi and BT
me-no-dev Jan 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
trigger callbacks even when APB did not change
  • Loading branch information
@me-no-dev
me-no-dev committed Dec 31, 2018
commit 7443fe2b18c97debfe497db383769ee83a45ec2b
4 changes: 2 additions & 2 deletions cores/esp32/esp32-hal-cpu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ bool setCpuFrequency(uint32_t cpu_freq_mhz){
apb = calculateApb(&conf);
log_i("%s: %u / %u = %u Mhz, APB: %u Hz", (conf.source == RTC_CPU_FREQ_SRC_PLL)?"PLL":((conf.source == RTC_CPU_FREQ_SRC_APLL)?"APLL":((conf.source == RTC_CPU_FREQ_SRC_XTAL)?"XTAL":"8M")), conf.source_freq_mhz, conf.div, conf.freq_mhz, apb);
//Call peripheral functions before the APB change
if(capb != apb && apb_change_callbacks){
if(apb_change_callbacks){
triggerApbChangeCallback(APB_BEFORE_CHANGE, capb, apb);
}
//Make the frequency change
Expand All @@ -164,7 +164,7 @@ bool setCpuFrequency(uint32_t cpu_freq_mhz){
uint32_t fcpu = (conf.freq_mhz >= 80)?(conf.freq_mhz * MHZ):(apb);
_xt_tick_divisor = fcpu / XT_TICK_PER_SEC;
//Call peripheral functions after the APB change
if(capb != apb && apb_change_callbacks){
if(apb_change_callbacks){
triggerApbChangeCallback(APB_AFTER_CHANGE, capb, apb);
}
return true;
Expand Down
4 changes: 0 additions & 4 deletions cores/esp32/esp32-hal-uart.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,6 @@ void uartEnd(uart_t* uart)

UART_MUTEX_LOCK();
if(uart->queue != NULL) {
uint8_t c;
while(xQueueReceive(uart->queue, &c, 0));
vQueueDelete(uart->queue);
uart->queue = NULL;
}
Expand All @@ -252,8 +250,6 @@ size_t uartResizeRxBuffer(uart_t * uart, size_t new_size) {

UART_MUTEX_LOCK();
if(uart->queue != NULL) {
uint8_t c;
while(xQueueReceive(uart->queue, &c, 0));
vQueueDelete(uart->queue);
uart->queue = xQueueCreate(new_size, sizeof(uint8_t));
if(uart->queue == NULL) {
Expand Down