diff --git a/boards/calliope-mini/Makefile b/boards/calliope-mini/Makefile index ed5e3a66ac..f4fab1a4ea 100644 --- a/boards/calliope-mini/Makefile +++ b/boards/calliope-mini/Makefile @@ -1,7 +1,7 @@ MODULE = board -ifneq (,$(filter mini,$(USEMODULE))) - DIRS += mini +ifneq (,$(filter microbit,$(USEMODULE))) + DIRS += $(RIOTBOARD)/common/microbit endif include $(RIOTBASE)/Makefile.base diff --git a/boards/calliope-mini/Makefile.dep b/boards/calliope-mini/Makefile.dep index f50ce488e9..32bd25340e 100644 --- a/boards/calliope-mini/Makefile.dep +++ b/boards/calliope-mini/Makefile.dep @@ -1,9 +1,6 @@ -ifneq (,$(filter mini,$(USEMODULE))) - USEMODULE += xtimer - USEMODULE += mineplex -endif - ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio USEMODULE += bmx055 endif + +include $(RIOTBOARD)/common/microbit/Makefile.dep diff --git a/boards/calliope-mini/Makefile.include b/boards/calliope-mini/Makefile.include index 7261ddd8a4..4b57b0f9d7 100644 --- a/boards/calliope-mini/Makefile.include +++ b/boards/calliope-mini/Makefile.include @@ -9,5 +9,9 @@ OPENOCD_DEBUG_ADAPTER = dap # be passed explicitly PYOCD_FLASH_TARGET_TYPE ?= -t nrf51 +ifneq (,$(filter microbit,$(USEMODULE))) + INCLUDES += -I$(RIOTBOARD)/common/microbit/include +endif + # include nrf51 boards common configuration include $(RIOTBOARD)/common/nrf51/Makefile.include diff --git a/boards/calliope-mini/include/board.h b/boards/calliope-mini/include/board.h index 099284158d..793b7d82a6 100644 --- a/boards/calliope-mini/include/board.h +++ b/boards/calliope-mini/include/board.h @@ -32,18 +32,18 @@ extern "C" { * @name LED matrix pin configuration * @{ */ -#define MINI_LED_COL1 GPIO_PIN(0, 4) -#define MINI_LED_COL2 GPIO_PIN(0, 5) -#define MINI_LED_COL3 GPIO_PIN(0, 6) -#define MINI_LED_COL4 GPIO_PIN(0, 7) -#define MINI_LED_COL5 GPIO_PIN(0, 8) -#define MINI_LED_COL6 GPIO_PIN(0, 9) -#define MINI_LED_COL7 GPIO_PIN(0, 10) -#define MINI_LED_COL8 GPIO_PIN(0, 11) -#define MINI_LED_COL9 GPIO_PIN(0, 12) -#define MINI_LED_ROW1 GPIO_PIN(0, 13) -#define MINI_LED_ROW2 GPIO_PIN(0, 14) -#define MINI_LED_ROW3 GPIO_PIN(0, 15) +#define MICROBIT_LED_COL1 GPIO_PIN(0, 4) /**< LED Column 1 */ +#define MICROBIT_LED_COL2 GPIO_PIN(0, 5) /**< LED Column 2 */ +#define MICROBIT_LED_COL3 GPIO_PIN(0, 6) /**< LED Column 3 */ +#define MICROBIT_LED_COL4 GPIO_PIN(0, 7) /**< LED Column 4 */ +#define MICROBIT_LED_COL5 GPIO_PIN(0, 8) /**< LED Column 5 */ +#define MICROBIT_LED_COL6 GPIO_PIN(0, 9) /**< LED Column 6 */ +#define MICROBIT_LED_COL7 GPIO_PIN(0, 10) /**< LED Column 7 */ +#define MICROBIT_LED_COL8 GPIO_PIN(0, 11) /**< LED Column 8 */ +#define MICROBIT_LED_COL9 GPIO_PIN(0, 12) /**< LED Column 9 */ +#define MICROBIT_LED_ROW1 GPIO_PIN(0, 13) /**< LED Row 1 */ +#define MICROBIT_LED_ROW2 GPIO_PIN(0, 14) /**< LED Row 2 */ +#define MICROBIT_LED_ROW3 GPIO_PIN(0, 15) /**< LED Row 3 */ /** @} */ /** diff --git a/boards/calliope-mini/include/mini.h b/boards/calliope-mini/include/mini.h deleted file mode 100644 index 33a5570265..0000000000 --- a/boards/calliope-mini/include/mini.h +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (C) 2016 Freie Universität Berlin - * - * This file is subject to the terms and conditions of the GNU Lesser - * General Public License v2.1. See the file LICENSE in the top level - * directory for more details. - */ - -/** - * @ingroup boards_calliope-mini - * @{ - * - * @file - * @brief Calliope mini specific LED handling - * - * @author Hauke Petersen - */ - -#ifndef MINI_H -#define MINI_H - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @brief Number of rows of the LED matrix - */ -#define MINI_MATRIX_ROWS (5U) - -/** - * @brief Number of columns of the LED matrix - */ -#define MINI_MATRIX_COLS (5U) - -/** - * @brief Initialize the Calliope mini's LED matrix - */ -void mini_matrix_init(void); - -/** - * @brief Turn on a single LED in the LED matrix - * - * @param[in] row row of the LED - * @param[in] col column of the LED - */ -void mini_matrix_on(uint8_t row, uint8_t col); - -/** - * @brief Turn off a single LED in the LED matrix - * - * @param[in] row row of the LED - * @param[in] col column of the LED - */ -void mini_matrix_off(uint8_t row, uint8_t col); - -/** - * @brief Write the given 'image' to the LED matrix - * - * In the given buffer, each byte represents one LED in the matrix, hence the - * buffer MUST be at least 25 byte wide. A byte value of `0` turns an LED off, - * while any other value turns it on. - * - * @param[in] buf new data to display, MUST be at least 25 byte - */ -void mini_matrix_set_raw(const uint8_t *buf); - -/** - * @brief Write the given character to the matrix, using the Mineplex font - * - * @param[in] c character to display - */ -void mini_matrix_set_char(char c); - -/** - * @brief Shift the given string through the LED matrix - * - * @param[in] str string do display - * @param[in] delay delay between each step [in us] - */ -void mini_matrix_shift_str(const char *str, uint32_t delay); - -#ifdef __cplusplus -} -#endif - -#endif /* MINI_H */ -/** @} */ diff --git a/boards/calliope-mini/mini/Makefile b/boards/calliope-mini/mini/Makefile deleted file mode 100644 index 48422e909a..0000000000 --- a/boards/calliope-mini/mini/Makefile +++ /dev/null @@ -1 +0,0 @@ -include $(RIOTBASE)/Makefile.base diff --git a/boards/calliope-mini/mini/mini.c b/boards/calliope-mini/mini/mini.c deleted file mode 100644 index f7a8c3206d..0000000000 --- a/boards/calliope-mini/mini/mini.c +++ /dev/null @@ -1,228 +0,0 @@ -/* - * Copyright (C) 2016 Freie Universität Berlin - * - * This file is subject to the terms and conditions of the GNU Lesser - * General Public License v2.1. See the file LICENSE in the top level - * directory for more details. - */ - -/** - * @ingroup boards_calliope-mini - * @{ - * - * @file - * @brief Calliope mini specific LED matrix handling - * - * @author Hauke Petersen - * - * @} - */ - -#include -#include "xtimer.h" - -#include "board.h" -#include "mini.h" -#include "mineplex.h" -#include "periph/gpio.h" -#include "periph/timer.h" - -#define ENABLE_DEBUG 0 -#include "debug.h" - -/** - * @brief The visible number of rows and columns of the LED matrix - */ -#define ROWS MINI_MATRIX_ROWS -#define COLS MINI_MATRIX_COLS - -/** - * @brief The electrical number of rows and columns - */ -#define ROWS_HW (3U) -#define COLS_HW (9U) - -/** - * @brief The refresh rate used for drawing the contents - * - * We want a refresh rate of at least 50Hz (->20ms), so the LEDs do not flicker. - */ -#define REFRESH (6000) /* 6ms * 3 rows -> ~55Hz */ - -/** - * @brief GPIO pins driving the rows - */ -static const gpio_t rows[ROWS_HW] = { - MINI_LED_ROW1, - MINI_LED_ROW2, - MINI_LED_ROW3 -}; - -/** - * @brief GPIO pins driving the columns - */ -static const gpio_t cols[COLS_HW] = { - MINI_LED_COL1, - MINI_LED_COL2, - MINI_LED_COL3, - MINI_LED_COL4, - MINI_LED_COL5, - MINI_LED_COL6, - MINI_LED_COL7, - MINI_LED_COL8, - MINI_LED_COL9, -}; - -/** - * @brief Map electrical layout to visible layout - * - * The electrical layout of the matrix is different than the visible layout - * (3x9 -> 5x5). This array maps from the visible 5 by 5 layout to the actual - * 3 by 9 layout used by the hardware. - */ -static const uint8_t pixmap[5][5] = { - { 0, 12, 1, 13, 2 }, - { 21, 22, 23, 24, 25 }, - { 10, 8, 11, 26, 9 }, - { 7, 6, 5, 4, 3 }, - { 20, 15, 18, 14, 19 } -}; - -/** - * @brief Buffer holding the current 'image' that is displayed - */ -static uint8_t framebuf[ROWS_HW * COLS_HW] = { 0 }; - -/** - * @brief Internal counter to keep track of which row needs to be refreshed - * next - */ -static unsigned cur_row = 0; - -/** - * @brief Write a Mineplex encoded character into the given buffer - * - * @param[in] c character to write - * @param[out] buf buffer to write the encoded character into, MUST be able to - * hold 25 byte - */ -static void char2buf(char c, uint8_t *buf) -{ - const uint8_t *raw = mineplex_char(c); - - /* set each row */ - for (unsigned row = 0; row < ROWS; row++) { - for (unsigned col = 0; col < COLS; col++) { - buf[(row * COLS) + col] = (raw[row] & (1 << col)); - } - } -} - -/** - * @brief Shift out and replace an image with the next, column by column - * - * @param[in|out] cur current 'image', will be overwritten - * @param[in] next image to shift in - * @param[in] delay delay between each column - */ -static void shift_next(uint8_t *cur, const uint8_t *next, uint32_t delay) -{ - for (unsigned i = 0; i < COLS; i++) { - for (unsigned r = 0; r < ROWS; r++) { - for (unsigned c = 0; c < (COLS - 1); c++) { - cur[(r * COLS) + c] = cur[(r * COLS) + c + 1]; - } - cur[(r * COLS) + COLS - 1] = next[(r * COLS) + i]; - } - mini_matrix_set_raw((uint8_t *)cur); - xtimer_usleep(delay); - } -} - -static void refresh(void *arg, int channel) -{ - (void)arg; - (void)channel; - - /* set next refresh */ - timer_set(TIMER_DEV(2), 0, REFRESH); - - /* disable current row */ - gpio_clear(rows[cur_row]); - /* goto next row */ - cur_row = ((++cur_row) < ROWS_HW) ? cur_row : 0; - /* setup columns */ - unsigned base = (COLS_HW * cur_row); - for (unsigned i = 0; i < COLS_HW; i++) { - gpio_write(cols[i], !(framebuf[base + i])); - } - /* and finally enable the new row */ - gpio_set(rows[cur_row]); -} - -void mini_matrix_init(void) -{ - /* initialize rows */ - for (unsigned i = 0; i < ROWS_HW; i++) { - gpio_init(rows[i], GPIO_OUT); - gpio_clear(rows[i]); - } - /* initialize columns */ - for (unsigned i = 0; i < COLS_HW; i++) { - gpio_init(cols[i], GPIO_OUT); - gpio_set(cols[i]); - } - /* and finally initialize and start the refresh timer */ - timer_init(TIMER_DEV(2), 1000000, refresh, NULL); - timer_set(TIMER_DEV(2), 0, REFRESH); -} - -void mini_matrix_on(uint8_t row, uint8_t col) -{ - if ((row >= 5) || (col >= 5)) { - return; - } - - framebuf[pixmap[row][col]] = 0x01; -} - -void mini_matrix_off(uint8_t row, uint8_t col) -{ - if ((row >= 5) || (col >= 5)) { - return; - } - - framebuf[pixmap[row][col]] = 0x00; -} - -void mini_matrix_set_raw(const uint8_t *buf) -{ - for (unsigned row = 0; row < ROWS; row++) { - for (unsigned col = 0; col < COLS; col++) { - framebuf[pixmap[row][col]] = buf[(row * COLS) + col]; - } - } -} - -void mini_matrix_set_char(char c) -{ - uint8_t buf[ROWS * COLS]; - - char2buf(c, buf); - mini_matrix_set_raw(buf); -} - -void mini_matrix_shift_str(const char *str, uint32_t delay) -{ - uint8_t curbuf[ROWS][COLS]; - uint8_t newbuf[ROWS][COLS]; - - char2buf(' ', (uint8_t *)curbuf); - mini_matrix_set_raw((uint8_t *)curbuf); - while (*str) { - char2buf(*str++, (uint8_t *)newbuf); - shift_next((uint8_t *)curbuf, (uint8_t *)newbuf, delay); - } - char2buf(' ', (uint8_t *)newbuf); - shift_next((uint8_t *)curbuf, (uint8_t *)newbuf, delay); -} diff --git a/boards/common/microbit/microbit.c b/boards/common/microbit/microbit.c index df2bc9d92e..497fe473e2 100644 --- a/boards/common/microbit/microbit.c +++ b/boards/common/microbit/microbit.c @@ -43,7 +43,7 @@ */ #define REFRESH (6000) /* 6ms * 3 rows -> ~55Hz */ -#if defined(BOARD_MICROBIT) +#if defined(BOARD_MICROBIT) || defined(BOARD_CALLIOPE_MINI) /** * @brief The electrical number of rows and columns */