Skip to content
Snippets Groups Projects
Commit e6560754 authored by schneider's avatar schneider
Browse files

fix(sdk): Update card10 board configuration

parent 8daedc35
No related branches found
No related tags found
No related merge requests found
...@@ -51,19 +51,18 @@ extern "C" { ...@@ -51,19 +51,18 @@ extern "C" {
#endif #endif
#ifndef CONSOLE_UART #ifndef CONSOLE_UART
#define CONSOLE_UART 1 /// UART instance to use for console #define CONSOLE_UART 0 /// UART instance to use for console
#endif #endif
#ifndef CONSOLE_BAUD #ifndef CONSOLE_BAUD
#define CONSOLE_BAUD 115200 /// Console baud rate #define CONSOLE_BAUD 115200 /// Console baud rate
#endif #endif
#define LED_OFF 1 /// Inactive state of LEDs #define LED_OFF 0 /// Inactive state of LEDs
#define LED_ON 0 /// Active state of LEDs #define LED_ON 1 /// Active state of LEDs
#define MX25_SPI MXC_SPIXFC #define MX25_SPI MXC_SPIXFC
#define MX25_SSEL 0 #define MX25_SSEL 0
// #define SPI_CHAR_BITS 8
/** /**
......
...@@ -51,14 +51,14 @@ mxc_uart_regs_t * ConsoleUart = MXC_UART_GET_UART(CONSOLE_UART); ...@@ -51,14 +51,14 @@ mxc_uart_regs_t * ConsoleUart = MXC_UART_GET_UART(CONSOLE_UART);
extern uint32_t SystemCoreClock; extern uint32_t SystemCoreClock;
const gpio_cfg_t pb_pin[] = { const gpio_cfg_t pb_pin[] = {
{PORT_1, PIN_6, GPIO_FUNC_IN, GPIO_PAD_PULL_UP}, {PORT_0, PIN_23, GPIO_FUNC_IN, GPIO_PAD_PULL_UP}, // TOP GPIO3 / Button 1
{PORT_1, PIN_7, GPIO_FUNC_IN, GPIO_PAD_PULL_UP}, {PORT_0, PIN_20, GPIO_FUNC_IN, GPIO_PAD_PULL_UP}, // Wristband GPIO1
}; };
const unsigned int num_pbs = (sizeof(pb_pin) / sizeof(gpio_cfg_t)); const unsigned int num_pbs = (sizeof(pb_pin) / sizeof(gpio_cfg_t));
const gpio_cfg_t led_pin[] = { const gpio_cfg_t led_pin[] = {
{PORT_1, PIN_14, GPIO_FUNC_OUT, GPIO_PAD_NONE}, {PORT_0, PIN_21, GPIO_FUNC_OUT, GPIO_PAD_NONE}, // Wristband GPIO2
{PORT_1, PIN_15, GPIO_FUNC_OUT, GPIO_PAD_NONE}, {PORT_0, PIN_22, GPIO_FUNC_OUT, GPIO_PAD_NONE}, // Wristband GPIO3
}; };
const unsigned int num_leds = (sizeof(led_pin) / sizeof(gpio_cfg_t)); const unsigned int num_leds = (sizeof(led_pin) / sizeof(gpio_cfg_t));
...@@ -112,7 +112,7 @@ int Board_Init(void) ...@@ -112,7 +112,7 @@ int Board_Init(void)
MXC_ASSERT_FAIL(); MXC_ASSERT_FAIL();
return err; return err;
} }
return E_NO_ERROR; return E_NO_ERROR;
} }
...@@ -132,11 +132,11 @@ int Console_Init(void) ...@@ -132,11 +132,11 @@ int Console_Init(void)
int Console_Shutdown(void) int Console_Shutdown(void)
{ {
int err; int err;
if ((err = UART_Shutdown(ConsoleUart)) != E_NO_ERROR) { if ((err = UART_Shutdown(ConsoleUart)) != E_NO_ERROR) {
return err; return err;
} }
return E_NO_ERROR; return E_NO_ERROR;
} }
...@@ -159,16 +159,16 @@ int MX25_Board_Read(uint8_t* read, unsigned len, unsigned deassert, spixfc_width ...@@ -159,16 +159,16 @@ int MX25_Board_Read(uint8_t* read, unsigned len, unsigned deassert, spixfc_width
{ {
spixfc_req_t req = {MX25_SSEL,deassert,0,NULL,read, width,len,0,0,NULL}; spixfc_req_t req = {MX25_SSEL,deassert,0,NULL,read, width,len,0,0,NULL};
return SPIXFC_Trans(MX25_SPI, &req); return SPIXFC_Trans(MX25_SPI, &req);
} }
/******************************************************************************/ /******************************************************************************/
int MX25_Board_Write(const uint8_t* write, unsigned len, unsigned deassert, spixfc_width_t width) int MX25_Board_Write(const uint8_t* write, unsigned len, unsigned deassert, spixfc_width_t width)
{ {
spixfc_req_t req = {MX25_SSEL,deassert,0,write,NULL, width,len,0,0,NULL}; spixfc_req_t req = {MX25_SSEL,deassert,0,write,NULL, width,len,0,0,NULL};
return SPIXFC_Trans(MX25_SPI, &req); return SPIXFC_Trans(MX25_SPI, &req);
} }
......
OLIMEX-ARM-USB-OCD-H SWD, interface/ftdi/olimex-arm-usb-ocd-h.cfg -f interface/ftdi/olimex-arm-jtag-swd.cfg
OLIMEX-ARM-USB-TINY-H SWD, interface/ftdi/olimex-arm-usb-tiny-h.cfg -f interface/ftdi/olimex-arm-jtag-swd.cfg
MAX32625_PICO, interface/cmsis-dap.cfg
CMSIS-DAP, interface/cmsis-dap.cfg
\ No newline at end of file
ADC
AES
BLE_beacon
BLE_datc
BLE_dats
BLE_fit
BLE_scanner
CRC
DES
DMA
DualCore
Flash
FreeRTOSDemo
GPIO
Hello_World
HTMR
I2C
ICC
LCD
LP
MAA
OWM
Pulse_Train
RTC
SDHC_FAT
SDHC_Raw
Semaphore
SPI
SPIXF
SPIXR
TMR
TRNG
UART
USB_CDCACM
USB_CompositeDevice
USB_HIDKeyboard
USB_MassStorage
Watchdog
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment