From e6560754a5d41ddc01815ee06f10367d39af2367 Mon Sep 17 00:00:00 2001
From: schneider <schneider@blinkenlichts.net>
Date: Mon, 6 May 2019 10:41:54 +0200
Subject: [PATCH] fix(sdk): Update card10 board configuration
---
sdk/Libraries/Boards/card10/Include/board.h | 7 ++--
sdk/Libraries/Boards/card10/Source/board.c | 20 +++++------
sdk/Libraries/Boards/card10/adapters.txt | 4 ---
sdk/Libraries/Boards/card10/examples.txt | 38 ---------------------
4 files changed, 13 insertions(+), 56 deletions(-)
delete mode 100644 sdk/Libraries/Boards/card10/adapters.txt
delete mode 100644 sdk/Libraries/Boards/card10/examples.txt
diff --git a/sdk/Libraries/Boards/card10/Include/board.h b/sdk/Libraries/Boards/card10/Include/board.h
index 82f5ff8a..6209a35e 100644
--- a/sdk/Libraries/Boards/card10/Include/board.h
+++ b/sdk/Libraries/Boards/card10/Include/board.h
@@ -51,19 +51,18 @@ extern "C" {
#endif
#ifndef CONSOLE_UART
-#define CONSOLE_UART 1 /// UART instance to use for console
+#define CONSOLE_UART 0 /// UART instance to use for console
#endif
#ifndef CONSOLE_BAUD
#define CONSOLE_BAUD 115200 /// Console baud rate
#endif
-#define LED_OFF 1 /// Inactive state of LEDs
-#define LED_ON 0 /// Active state of LEDs
+#define LED_OFF 0 /// Inactive state of LEDs
+#define LED_ON 1 /// Active state of LEDs
#define MX25_SPI MXC_SPIXFC
#define MX25_SSEL 0
-// #define SPI_CHAR_BITS 8
/**
diff --git a/sdk/Libraries/Boards/card10/Source/board.c b/sdk/Libraries/Boards/card10/Source/board.c
index 647c579d..73bd52fa 100644
--- a/sdk/Libraries/Boards/card10/Source/board.c
+++ b/sdk/Libraries/Boards/card10/Source/board.c
@@ -51,14 +51,14 @@ mxc_uart_regs_t * ConsoleUart = MXC_UART_GET_UART(CONSOLE_UART);
extern uint32_t SystemCoreClock;
const gpio_cfg_t pb_pin[] = {
- {PORT_1, PIN_6, GPIO_FUNC_IN, GPIO_PAD_PULL_UP},
- {PORT_1, PIN_7, GPIO_FUNC_IN, GPIO_PAD_PULL_UP},
+ {PORT_0, PIN_23, GPIO_FUNC_IN, GPIO_PAD_PULL_UP}, // TOP GPIO3 / Button 1
+ {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 gpio_cfg_t led_pin[] = {
- {PORT_1, PIN_14, GPIO_FUNC_OUT, GPIO_PAD_NONE},
- {PORT_1, PIN_15, GPIO_FUNC_OUT, GPIO_PAD_NONE},
+ {PORT_0, PIN_21, GPIO_FUNC_OUT, GPIO_PAD_NONE}, // Wristband GPIO2
+ {PORT_0, PIN_22, GPIO_FUNC_OUT, GPIO_PAD_NONE}, // Wristband GPIO3
};
const unsigned int num_leds = (sizeof(led_pin) / sizeof(gpio_cfg_t));
@@ -112,7 +112,7 @@ int Board_Init(void)
MXC_ASSERT_FAIL();
return err;
}
-
+
return E_NO_ERROR;
}
@@ -132,11 +132,11 @@ int Console_Init(void)
int Console_Shutdown(void)
{
int err;
-
+
if ((err = UART_Shutdown(ConsoleUart)) != E_NO_ERROR) {
return err;
}
-
+
return E_NO_ERROR;
}
@@ -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};
-
+
return SPIXFC_Trans(MX25_SPI, &req);
}
/******************************************************************************/
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};
-
+
return SPIXFC_Trans(MX25_SPI, &req);
}
diff --git a/sdk/Libraries/Boards/card10/adapters.txt b/sdk/Libraries/Boards/card10/adapters.txt
deleted file mode 100644
index 269a39d8..00000000
--- a/sdk/Libraries/Boards/card10/adapters.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/sdk/Libraries/Boards/card10/examples.txt b/sdk/Libraries/Boards/card10/examples.txt
deleted file mode 100644
index 559344b4..00000000
--- a/sdk/Libraries/Boards/card10/examples.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-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
--
GitLab