diff --git a/boards/microbit-v2/Makefile b/boards/microbit-v2/Makefile index c3375d9f76..f4fab1a4ea 100644 --- a/boards/microbit-v2/Makefile +++ b/boards/microbit-v2/Makefile @@ -1,7 +1,7 @@ MODULE = board ifneq (,$(filter microbit,$(USEMODULE))) - DIRS += microbit + DIRS += $(RIOTBOARD)/common/microbit endif include $(RIOTBASE)/Makefile.base diff --git a/boards/microbit-v2/Makefile.include b/boards/microbit-v2/Makefile.include index 8fde308551..40180db7b3 100644 --- a/boards/microbit-v2/Makefile.include +++ b/boards/microbit-v2/Makefile.include @@ -8,5 +8,9 @@ else ifeq (openocd,$(PROGRAMMER)) DEBUG_ADAPTER = dap endif +ifneq (,$(filter microbit,$(USEMODULE))) + INCLUDES += -I$(RIOTBOARD)/common/microbit/include +endif + # include nrf52 boards common configuration include $(RIOTBOARD)/common/nrf52/Makefile.include diff --git a/boards/microbit-v2/include/microbit.h b/boards/microbit-v2/include/microbit.h deleted file mode 100644 index cb69bda14e..0000000000 --- a/boards/microbit-v2/include/microbit.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_microbit - * @{ - * - * @file - * @brief BBC micro:bit specific LED handling - * - * @author Hauke Petersen - */ - -#ifndef MICROBIT_H -#define MICROBIT_H - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @brief Number of rows of the LED matrix - */ -#define MICROBIT_MATRIX_ROWS (5U) - -/** - * @brief Number of columns of the LED matrix - */ -#define MICROBIT_MATRIX_COLS (5U) - -/** - * @brief Initialize the micro:bit's LED matrix - */ -void microbit_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 microbit_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 microbit_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 microbit_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 microbit_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 microbit_matrix_shift_str(const char *str, uint32_t delay); - -#ifdef __cplusplus -} -#endif - -#endif /* MICROBIT_H */ -/** @} */ diff --git a/boards/microbit-v2/microbit/Makefile b/boards/microbit-v2/microbit/Makefile deleted file mode 100644 index 48422e909a..0000000000 --- a/boards/microbit-v2/microbit/Makefile +++ /dev/null @@ -1 +0,0 @@ -include $(RIOTBASE)/Makefile.base diff --git a/boards/microbit-v2/microbit/microbit.c b/boards/microbit-v2/microbit/microbit.c deleted file mode 100644 index 63f3bcaf97..0000000000 --- a/boards/microbit-v2/microbit/microbit.c +++ /dev/null @@ -1,224 +0,0 @@ -/* - * Copyright (C) 2016 Freie Universität Berlin - * 2021 Inria - * - * 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_microbit_v2 - * @{ - * - * @file - * @brief BBC micro:bit v2 specific LED matrix handling - * - * @author Hauke Petersen - * @author Alexandre Abadie - * - * @} - */ - -#include -#include "xtimer.h" - -#include "board.h" -#include "microbit.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 MICROBIT_MATRIX_ROWS -#define COLS MICROBIT_MATRIX_COLS - -/** - * @brief The electrical number of rows and columns - */ -#define ROWS_HW (5U) -#define COLS_HW (5U) - -/** - * @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 * 5 rows -> ~55Hz */ - -/** - * @brief GPIO pins driving the rows - */ -static const gpio_t rows[ROWS_HW] = { - MICROBIT_LED_ROW1, - MICROBIT_LED_ROW2, - MICROBIT_LED_ROW3, - MICROBIT_LED_ROW4, - MICROBIT_LED_ROW5, -}; - -/** - * @brief GPIO pins driving the columns - */ -static const gpio_t cols[COLS_HW] = { - MICROBIT_LED_COL1, - MICROBIT_LED_COL2, - MICROBIT_LED_COL3, - MICROBIT_LED_COL4, - MICROBIT_LED_COL5, -}; - -/** - * @brief Map electrical layout to visible layout - */ -static const uint8_t pixmap[5][5] = { - { 0, 1, 2, 3, 4 }, - { 5, 6, 7, 8, 9 }, - { 10, 11, 12, 13, 14 }, - { 15, 16, 17, 18, 19 }, - { 20, 21, 22, 23, 24 } -}; - -/** - * @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]; - } - microbit_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(1), 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 microbit_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(1), 1000000, refresh, NULL); - timer_set(TIMER_DEV(1), 0, REFRESH); -} - -void microbit_matrix_on(uint8_t row, uint8_t col) -{ - if ((row >= 5) || (col >= 5)) { - return; - } - - framebuf[pixmap[row][col]] = 0x01; -} - -void microbit_matrix_off(uint8_t row, uint8_t col) -{ - if ((row >= 5) || (col >= 5)) { - return; - } - - framebuf[pixmap[row][col]] = 0x00; -} - -void microbit_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 microbit_matrix_set_char(char c) -{ - uint8_t buf[ROWS * COLS]; - - char2buf(c, buf); - microbit_matrix_set_raw(buf); -} - -void microbit_matrix_shift_str(const char *str, uint32_t delay) -{ - uint8_t curbuf[ROWS][COLS]; - uint8_t newbuf[ROWS][COLS]; - - char2buf(' ', (uint8_t *)curbuf); - microbit_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); -}