|
|
@@ -25,7 +25,8 @@
|
|
|
*/
|
|
|
|
|
|
#include "chip.h"
|
|
|
-#include "../board.h"
|
|
|
+#include "bsp/board.h"
|
|
|
+#include "board.h"
|
|
|
|
|
|
//--------------------------------------------------------------------+
|
|
|
// Forward USB interrupt events to TinyUSB IRQ Handler
|
|
|
@@ -38,33 +39,21 @@ void USB_IRQHandler(void)
|
|
|
//--------------------------------------------------------------------+
|
|
|
// MACRO TYPEDEF CONSTANT ENUM
|
|
|
//--------------------------------------------------------------------+
|
|
|
-#define LED_PORT 0
|
|
|
-#define LED_PIN 25
|
|
|
-
|
|
|
-// Wake Switch
|
|
|
-#define BUTTON_PORT 0
|
|
|
-#define BUTTON_PIN 17
|
|
|
|
|
|
/* System oscillator rate and RTC oscillator rate */
|
|
|
-const uint32_t OscRateIn = 12000000;
|
|
|
-const uint32_t RTCOscRateIn = 32768;
|
|
|
-
|
|
|
-/* Pin muxing table, only items that need changing from their default pin
|
|
|
- state are in this table. */
|
|
|
-static const PINMUX_GRP_T pinmuxing[] =
|
|
|
-{
|
|
|
- {1, 11, (IOCON_MODE_PULLDOWN | IOCON_DIGMODE_EN)}, /* PIO1_11-ISP_1 (VBUS) */
|
|
|
-};
|
|
|
+const uint32_t OscRateIn = XTAL_OscRateIn;
|
|
|
+const uint32_t RTCOscRateIn = XTAL_RTCOscRateIn;
|
|
|
|
|
|
// Invoked by startup code
|
|
|
void SystemInit(void)
|
|
|
{
|
|
|
+ Chip_Clock_EnablePeriphClock(SYSCTL_CLOCK_SRAM1);
|
|
|
+ Chip_Clock_EnablePeriphClock(SYSCTL_CLOCK_SRAM2);
|
|
|
Chip_Clock_EnablePeriphClock(SYSCTL_CLOCK_IOCON);
|
|
|
Chip_Clock_EnablePeriphClock(SYSCTL_CLOCK_SWM);
|
|
|
Chip_SYSCTL_PeriphReset(RESET_IOCON);
|
|
|
|
|
|
- // Pin Mux
|
|
|
- Chip_IOCON_SetPinMuxing(LPC_IOCON, pinmuxing, sizeof(pinmuxing) / sizeof(PINMUX_GRP_T));
|
|
|
+ board_lpc15_pinmux_swm_init();
|
|
|
|
|
|
Chip_SetupXtalClocking();
|
|
|
}
|
|
|
@@ -73,10 +62,10 @@ void board_init(void)
|
|
|
{
|
|
|
SystemCoreClockUpdate();
|
|
|
|
|
|
-#if CFG_TUSB_OS == OPT_OS_NONE
|
|
|
// 1ms tick timer
|
|
|
SysTick_Config(SystemCoreClock / 1000);
|
|
|
-#elif CFG_TUSB_OS == OPT_OS_FREERTOS
|
|
|
+
|
|
|
+#if CFG_TUSB_OS == OPT_OS_FREERTOS
|
|
|
// If freeRTOS is used, IRQ priority is limit by max syscall ( smaller is higher )
|
|
|
NVIC_SetPriority(USB0_IRQn, configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY );
|
|
|
#endif
|
|
|
@@ -89,8 +78,15 @@ void board_init(void)
|
|
|
// Button
|
|
|
Chip_GPIO_SetPinDIRInput(LPC_GPIO, BUTTON_PORT, BUTTON_PIN);
|
|
|
|
|
|
+ // UART
|
|
|
+ Chip_Clock_SetUARTBaseClockRate(Chip_Clock_GetMainClockRate(), false);
|
|
|
+ Chip_UART_Init(UART_PORT);
|
|
|
+ Chip_UART_ConfigData(UART_PORT, UART_CFG_DATALEN_8 | UART_CFG_PARITY_NONE | UART_CFG_STOPLEN_1);
|
|
|
+ Chip_UART_SetBaud(UART_PORT, CFG_BOARD_UART_BAUDRATE);
|
|
|
+ Chip_UART_Enable(UART_PORT);
|
|
|
+ Chip_UART_TXEnable(UART_PORT);
|
|
|
+
|
|
|
// USB: Setup PLL clock, and power
|
|
|
- Chip_SWM_MovablePortPinAssign(SWM_USB_VBUS_I, 1, 11);
|
|
|
Chip_USB_Init();
|
|
|
}
|
|
|
|
|
|
@@ -98,19 +94,6 @@ void board_init(void)
|
|
|
// Board porting API
|
|
|
//--------------------------------------------------------------------+
|
|
|
|
|
|
-#if CFG_TUSB_OS == OPT_OS_NONE
|
|
|
-volatile uint32_t system_ticks = 0;
|
|
|
-void SysTick_Handler (void)
|
|
|
-{
|
|
|
- system_ticks++;
|
|
|
-}
|
|
|
-
|
|
|
-uint32_t board_millis(void)
|
|
|
-{
|
|
|
- return system_ticks;
|
|
|
-}
|
|
|
-#endif
|
|
|
-
|
|
|
void board_led_write(bool state)
|
|
|
{
|
|
|
Chip_GPIO_SetPinState(LPC_GPIO, LED_PORT, LED_PIN, state);
|
|
|
@@ -130,6 +113,18 @@ int board_uart_read(uint8_t* buf, int len)
|
|
|
|
|
|
int board_uart_write(void const * buf, int len)
|
|
|
{
|
|
|
- (void) buf; (void) len;
|
|
|
- return 0;
|
|
|
+ return Chip_UART_SendBlocking(UART_PORT, buf, len);
|
|
|
}
|
|
|
+
|
|
|
+#if CFG_TUSB_OS == OPT_OS_NONE
|
|
|
+volatile uint32_t system_ticks = 0;
|
|
|
+void SysTick_Handler (void)
|
|
|
+{
|
|
|
+ system_ticks++;
|
|
|
+}
|
|
|
+
|
|
|
+uint32_t board_millis(void)
|
|
|
+{
|
|
|
+ return system_ticks;
|
|
|
+}
|
|
|
+#endif
|