Add application skeleton for st7789_lcd app

config/build/nrf52/st7789_lcd/Makefile.st7789_lcd

@@ -30,6 +30,7 @@ INCLUDES += $(NRF_PATH)components/libraries/log/src/
 NRF_C_SRCS += $(NRF_PATH)components/boards/boards.c
 NRF_C_SRCS += $(NRF_PATH)modules/nrfx/mdk/system_nrf52.c
 NRF_C_SRCS += $(NRF_PATH)components/libraries/util/app_error.c
+NRF_C_SRCS += $(NRF_PATH)components/libraries/util/app_error_handler_gcc.c
 NRF_C_SRCS += $(NRF_PATH)components/libraries/util/app_error_weak.c
 NRF_C_SRCS += $(NRF_PATH)modules/nrfx/drivers/src/nrfx_spim.c
 NRF_C_SRCS += $(NRF_PATH)components/libraries/log/src/nrf_log_frontend.c
@@ -49,6 +50,7 @@ NRF_C_SRCS += $(NRF_PATH)components/libraries/log/src/nrf_log_str_formatter.c
 NRF_C_SRCS += $(NRF_PATH)external/fprintf/nrf_fprintf.c
 NRF_C_SRCS += $(NRF_PATH)external/fprintf/nrf_fprintf_format.c
 NRF_C_SRCS += $(NRF_PATH)components/libraries/ringbuf/nrf_ringbuf.c
+NRF_C_SRCS += $(NRF_PATH)components/libraries/strerror/nrf_strerror.c
 
 
 include config/build/$(PLATFORM)/Makefile.$(PLATFORM)

include/platform/nrf52/nrf52-dk.h

@@ -4,6 +4,7 @@
 #include "driver.h"
 
 #include "gpio.h"
+#include "spi.h"
 
 // LED 1
 const struct gpio nrf_led_1 = {
@@ -49,4 +50,17 @@ const struct driver led_4 = {
     .dev = &nrf_led_4
 };
 
+// SPI 0
+const struct spi nrf_spi_0 = {
+    .sck_pin = 2,
+    .mosi_pin = 3,
+    .miso_pin = 0xff,
+    .ss_pin = 25
+};
+const struct driver spi_0 = {
+    .name = "SPI0",
+    .fp = &spi_fp,
+    .dev = &nrf_spi_0
+};
+
 #endif

include/spi.h

@@ -0,0 +1,29 @@
+#ifndef __NRF52_SPI_H__
+#define __NRF52_SPI_H__
+
+#include <stdint.h>
+
+#include "driver.h"
+
+int spi_open(const struct driver *drv);
+int spi_close(const struct driver *drv);
+
+int spi_read(const struct driver *drv, char *buffer, unsigned int len);
+int spi_write(const struct driver *drv, const char *buffer, unsigned int len);
+
+struct spi {
+    uint8_t sck_pin;
+    uint8_t mosi_pin;
+    uint8_t miso_pin;
+    uint8_t ss_pin;
+};
+
+static const struct driver_fp spi_fp = {
+    .open = spi_open,
+    .close = spi_close,
+    .read = spi_read,
+    .write = spi_write,
+    .ioctl = NULL
+};
+
+#endif

src/application/st7789_lcd/main.c

@@ -1,110 +1,30 @@
-/**
- * Copyright (c) 2015 - 2019, Nordic Semiconductor ASA
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form, except as embedded into a Nordic
- *    Semiconductor ASA integrated circuit in a product or a software update for
- *    such product, must reproduce the above copyright notice, this list of
- *    conditions and the following disclaimer in the documentation and/or other
- *    materials provided with the distribution.
- *
- * 3. Neither the name of Nordic Semiconductor ASA nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * 4. This software, with or without modification, must only be used with a
- *    Nordic Semiconductor ASA integrated circuit.
- *
- * 5. Any software provided in binary form under this license must not be reverse
- *    engineered, decompiled, modified and/or disassembled.
- *
- * THIS SOFTWARE IS PROVIDED BY NORDIC SEMICONDUCTOR ASA "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY, NONINFRINGEMENT, AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL NORDIC SEMICONDUCTOR ASA OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-#include "nrf_drv_spi.h"
-#include "app_util_platform.h"
-#include "nrf_gpio.h"
-#include "nrf_delay.h"
-#include "boards.h"
-#include "app_error.h"
 #include <string.h>
-#include "nrf_log.h"
-#include "nrf_log_ctrl.h"
-#include "nrf_log_default_backends.h"
 
-#define SPI_INSTANCE  0 /**< SPI instance index. */
-static const nrf_drv_spi_t spi = NRF_DRV_SPI_INSTANCE(SPI_INSTANCE);  /**< SPI instance. */
-static volatile bool spi_xfer_done;  /**< Flag used to indicate that SPI instance completed the transfer. */
+#include "app_util_platform.h"
+#include "board.h"
+#include "app_error.h"
 
-#define TEST_STRING "Nordic"
-static uint8_t       m_tx_buf[] = TEST_STRING;           /**< TX buffer. */
-static uint8_t       m_rx_buf[sizeof(TEST_STRING) + 1];    /**< RX buffer. */
-static const uint8_t m_length = sizeof(m_tx_buf);        /**< Transfer length. */
-
-/**
- * @brief SPI user event handler.
- * @param event
- */
-void spi_event_handler(nrf_drv_spi_evt_t const * p_event,
-                       void *                    p_context)
-{
-    spi_xfer_done = true;
-    NRF_LOG_INFO("Transfer completed.");
-    if (m_rx_buf[0] != 0)
-    {
-        NRF_LOG_INFO(" Received:");
-        NRF_LOG_HEXDUMP_INFO(m_rx_buf, strlen((const char *)m_rx_buf));
-    }
-}
+#include "driver.h"
+#include "delay.h"
 
+const char buffer[] = "Hello world!\r\n";
 int main(void)
 {
-    bsp_board_init(BSP_INIT_LEDS);
+    unsigned int i = 0;
+    drv_open(&led_1);
+    drv_write(&led_1, "1", 1);
+    drv_open(&spi_0);
 
-    APP_ERROR_CHECK(NRF_LOG_INIT(NULL));
-    NRF_LOG_DEFAULT_BACKENDS_INIT();
+    // APP_ERROR_CHECK(NRF_LOG_INIT(NULL));
+    // NRF_LOG_DEFAULT_BACKENDS_INIT();
 
-    nrf_drv_spi_config_t spi_config = NRF_DRV_SPI_DEFAULT_CONFIG;
-    spi_config.ss_pin   = SPI_SS_PIN;
-    spi_config.miso_pin = SPI_MISO_PIN;
-    spi_config.mosi_pin = SPI_MOSI_PIN;
-    spi_config.sck_pin  = SPI_SCK_PIN;
-    APP_ERROR_CHECK(nrf_drv_spi_init(&spi, &spi_config, spi_event_handler, NULL));
+    // NRF_LOG_INFO("SPI example started.");
 
-    NRF_LOG_INFO("SPI example started.");
-
-    while (1)
-    {
-        // Reset rx buffer and transfer done flag
-        memset(m_rx_buf, 0, m_length);
-        spi_xfer_done = false;
-
-        APP_ERROR_CHECK(nrf_drv_spi_transfer(&spi, m_tx_buf, m_length, m_rx_buf, m_length));
-
-        while (!spi_xfer_done)
-        {
-            __WFE();
-        }
-
-        NRF_LOG_FLUSH();
-
-        bsp_board_led_invert(BSP_BOARD_LED_0);
-        nrf_delay_ms(200);
+    while(1) {
+        drv_write(&spi_0, buffer, sizeof(buffer));
+        // NRF_LOG_FLUSH();
+        char c = (i++ % 2) + 0x30;
+        drv_write(&led_1, &c, 1);
+        delay_ms(200);
     }
 }

src/platform/nrf52/spi.c

@@ -0,0 +1,86 @@
+#include <assert.h>
+
+#include "nrf_drv_spi.h"
+#include "nrf_log.h"
+#include "nrf_log_ctrl.h"
+#include "nrf_log_default_backends.h"
+
+#include "driver.h"
+#include "spi.h"
+
+#define SPI_INSTANCE    0
+static const nrf_drv_spi_t spi = NRF_DRV_SPI_INSTANCE(SPI_INSTANCE);
+static volatile bool spi_xfer_done;
+
+struct spi_object {
+    uint8_t *rx_buf;
+    uint8_t *tx_buf;
+    uint32_t rx_len;
+    uint32_t tx_len;
+};
+
+uint8_t rx_buffer[1];
+uint8_t tx_buffer[20];
+static struct spi_object spi_obj = {
+    .rx_buf = rx_buffer,
+    .tx_buf = tx_buffer,
+    .rx_len = sizeof(rx_buffer),
+    .tx_len = sizeof(tx_buffer)
+};
+
+void spi_event_handler(nrf_drv_spi_evt_t const * p_event, void * p_context)
+{
+    spi_xfer_done = true;
+    NRF_LOG_INFO("Transfer completed.");
+}
+
+int spi_open(const struct driver *drv)
+{
+    assert(NULL != drv);
+
+    struct spi *this = (struct spi *)(drv->dev);
+
+    nrf_drv_spi_config_t spi_config = NRF_DRV_SPI_DEFAULT_CONFIG;
+    spi_config.ss_pin = this->ss_pin;
+    spi_config.miso_pin = this->miso_pin;
+    spi_config.mosi_pin = this->mosi_pin;
+    spi_config.sck_pin  = this->sck_pin;
+    APP_ERROR_CHECK(nrf_drv_spi_init(&spi, &spi_config, spi_event_handler, NULL));
+
+    return 0;
+}
+
+int spi_close(const struct driver *drv)
+{
+    assert(NULL != drv);
+
+    return 0;
+}
+
+int spi_read(const struct driver *drv, char *buffer, unsigned int len)
+{
+    assert((NULL != drv) && (NULL != buffer));
+
+    NRF_LOG_INFO("spi read not implemented yet.");
+
+    return 0;
+}
+
+int spi_write(const struct driver *drv, const char *buffer, unsigned int len)
+{
+    if(len > spi_obj.tx_len) {
+        NRF_LOG_ERROR("buffer too small");
+        return 0;
+    }
+    memcpy(spi_obj.tx_buf, buffer, len);
+
+    // Reset transfer done flag
+    spi_xfer_done = false;
+
+    APP_ERROR_CHECK(nrf_drv_spi_transfer(&spi, spi_obj.tx_buf, spi_obj.tx_len, spi_obj.rx_buf, spi_obj.rx_len));
+
+    while(!spi_xfer_done) {
+        __WFE();
+    }
+    return (int)len;
+}