From 7584e325d21e5a72bf3ffd9286980694fae92dfd Mon Sep 17 00:00:00 2001 From: Nanosonde <2073569+nanosonde@users.noreply.github.com> Date: Thu, 15 Oct 2020 16:43:56 +0200 Subject: [PATCH] Remove display code --- examples/knx-cc1310/CC1310_LAUNCHXL.c | 85 --------------------------- 1 file changed, 85 deletions(-) diff --git a/examples/knx-cc1310/CC1310_LAUNCHXL.c b/examples/knx-cc1310/CC1310_LAUNCHXL.c index b0942e2..0486ee4 100644 --- a/examples/knx-cc1310/CC1310_LAUNCHXL.c +++ b/examples/knx-cc1310/CC1310_LAUNCHXL.c @@ -408,91 +408,6 @@ const TRNG_Config TRNG_config[CC1310_LAUNCHXL_TRNGCOUNT] = { const uint_least8_t TRNG_count = CC1310_LAUNCHXL_TRNGCOUNT; -/* - * =============================== Display =============================== - */ -#include -#include -#include - -#ifndef BOARD_DISPLAY_UART_STRBUF_SIZE -#define BOARD_DISPLAY_UART_STRBUF_SIZE 128 -#endif - -/* This value can be changed to 96 for use with the 430BOOST-SHARP96 BoosterPack. */ -#define BOARD_DISPLAY_SHARP_SIZE 128 - -DisplayUart_Object displayUartObject; -DisplaySharp_Object displaySharpObject; - -static char uartStringBuf[BOARD_DISPLAY_UART_STRBUF_SIZE]; -static uint_least8_t sharpDisplayBuf[BOARD_DISPLAY_SHARP_SIZE * BOARD_DISPLAY_SHARP_SIZE / 8]; - -const DisplayUart_HWAttrs displayUartHWAttrs = { - .uartIdx = CC1310_LAUNCHXL_UART0, - .baudRate = 115200, - .mutexTimeout = (unsigned int)(-1), - .strBuf = uartStringBuf, - .strBufLen = BOARD_DISPLAY_UART_STRBUF_SIZE, -}; - -const DisplaySharp_HWAttrsV1 displaySharpHWattrs = { - .spiIndex = CC1310_LAUNCHXL_SPI0, - .csPin = CC1310_LAUNCHXL_GPIO_LCD_CS, - .powerPin = CC1310_LAUNCHXL_GPIO_LCD_POWER, - .enablePin = CC1310_LAUNCHXL_GPIO_LCD_ENABLE, - .pixelWidth = BOARD_DISPLAY_SHARP_SIZE, - .pixelHeight = BOARD_DISPLAY_SHARP_SIZE, - .displayBuf = sharpDisplayBuf, -}; - -#ifndef BOARD_DISPLAY_USE_UART -#define BOARD_DISPLAY_USE_UART 1 -#endif -#ifndef BOARD_DISPLAY_USE_UART_ANSI -#define BOARD_DISPLAY_USE_UART_ANSI 0 -#endif -#ifndef BOARD_DISPLAY_USE_LCD -#define BOARD_DISPLAY_USE_LCD 0 -#endif - -/* - * This #if/#else is needed to workaround a problem with the - * IAR compiler. The IAR compiler doesn't like the empty array - * initialization. (IAR Error[Pe1345]) - */ -#if (BOARD_DISPLAY_USE_UART || BOARD_DISPLAY_USE_LCD) - -const Display_Config Display_config[] = { -#if (BOARD_DISPLAY_USE_UART) - { -# if (BOARD_DISPLAY_USE_UART_ANSI) - .fxnTablePtr = &DisplayUartAnsi_fxnTable, -# else /* Default to minimal UART with no cursor placement */ - .fxnTablePtr = &DisplayUartMin_fxnTable, -# endif - .object = &displayUartObject, - .hwAttrs = &displayUartHWAttrs, - }, -#endif -#if (BOARD_DISPLAY_USE_LCD) - { - .fxnTablePtr = &DisplaySharp_fxnTable, - .object = &displaySharpObject, - .hwAttrs = &displaySharpHWattrs - }, -#endif -}; - -const uint_least8_t Display_count = sizeof(Display_config) / sizeof(Display_Config); - -#else - -const Display_Config *Display_config = NULL; -const uint_least8_t Display_count = 0; - -#endif /* (BOARD_DISPLAY_USE_UART || BOARD_DISPLAY_USE_LCD) */ - /* * =============================== GPIO =============================== */