Skip to content

CPU and APB Frequency support #2220

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 6 commits into from
Dec 20, 2018
Merged

CPU and APB Frequency support #2220

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3d54e6d
Add support to HAL for APB frequencies different than 80MHz
me-no-dev Dec 19, 2018
797aa09
Add support for CPU frequencies in the IDE board menu
me-no-dev Dec 19, 2018
256d006
Switch to fast set_config
me-no-dev Dec 19, 2018
2c8df88
Add method to uart so debug can be reassigned after apb frequency switch
me-no-dev Dec 19, 2018
1e8b9fb
Merge branch 'master' into apb_freq_support
me-no-dev Dec 19, 2018
cccf011
Return real APB frequency
me-no-dev Dec 20, 2018
File filter

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
Add method to uart so debug can be reassigned after apb frequency switch
  • Loading branch information
@me-no-dev
me-no-dev committed Dec 19, 2018
commit 2c8df88546e6675b8e4b2baacae903cf1c24866d
25 changes: 15 additions & 10 deletions cores/esp32/esp32-hal-uart.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,17 +386,8 @@ static void IRAM_ATTR uart2_write_char(char c)
ESP_REG(DR_REG_UART2_BASE) = c;
}

void uartSetDebug(uart_t* uart)
void uart_install_putc()
{
if(uart == NULL || uart->num > 2) {
s_uart_debug_nr = -1;
ets_install_putc1(NULL);
return;
}
if(s_uart_debug_nr == uart->num) {
return;
}
s_uart_debug_nr = uart->num;
switch(s_uart_debug_nr) {
case 0:
ets_install_putc1((void (*)(char)) &uart0_write_char);
Expand All @@ -413,6 +404,20 @@ void uartSetDebug(uart_t* uart)
}
}

void uartSetDebug(uart_t* uart)
{
if(uart == NULL || uart->num > 2) {
s_uart_debug_nr = -1;
//ets_install_putc1(NULL);
//return;
} else
if(s_uart_debug_nr == uart->num) {
return;
} else
s_uart_debug_nr = uart->num;
uart_install_putc();
}

int uartGetDebug()
{
return s_uart_debug_nr;
Expand Down