Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion port/ucontroller/nxp/lpc17xx/FreeRTOSConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ licensing and training services.
#define configUSE_IDLE_HOOK 0
#define configMAX_PRIORITIES ( 6 )
#define configUSE_TICK_HOOK 0
#define configCPU_CLOCK_HZ ( ( unsigned long ) 8000000)
#define configCPU_CLOCK_HZ ( ( unsigned long ) 18432000)
#define configTICK_RATE_HZ ( ( portTickType ) 1000 )
#define configMINIMAL_STACK_SIZE ( ( unsigned short ) 80 )
#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 0x4000 ) )
Expand Down
4 changes: 2 additions & 2 deletions port/ucontroller/nxp/lpc17xx/bootloader/src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,9 @@ int main(void)
lp17_pincfg(0, 3, pin_mode_none, pin_func_alt1);

/*
* Initialize UAR0 (19200bps, 8N1)
* Initialize UAR0 (115200bps, 8N1)
*/
lpc17_uart0_init(19200, 72000000);
lpc17_uart0_init(115200, 72000000);

if (fw_header->magic == 0xAAAAAAAA)
{
Expand Down
4 changes: 2 additions & 2 deletions port/ucontroller/nxp/lpc17xx/lpc17_uart.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ void uart_init ( uint8_t id )

Chip_UART_Init( usart_cfg[id].ptr );

/* Standard 19200 baud rate */
uart_set_baud( UART_DEBUG, 19200 );
/* Standard 115200 baud rate */
uart_set_baud( UART_DEBUG, 115200 );

/* Defaults to 8N1, no parity */
uart_config_data( UART_DEBUG, ( UART_LCR_WLEN8 | UART_LCR_SBS_1BIT | UART_LCR_PARITY_DIS ) );
Expand Down
7 changes: 6 additions & 1 deletion port/ucontroller/nxp/lpc17xx/lpcopen/src/sysinit_17xx_40xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,12 @@ void Chip_SetupIrcClocking(void)
Chip_Clock_EnablePLL(SYSCTL_MAIN_PLL, SYSCTL_PLL_CONNECT);
}

#define CLOCK_8MHZ
#define CLOCK_18_432MHZ
#ifdef CLOCK_18_432MHZ
#define PLL_M (144-1)
#define PLL_N (5-1)
#define CLK_DIV (25-1)
#endif
#ifdef CLOCK_100MHZ
#define PLL_M (25-1)
#define PLL_N (2-1)
Expand Down