From 4c24d3912261dd750a7297f515f52c37431605c7 Mon Sep 17 00:00:00 2001 From: Glenn Ruben Bakke Date: Thu, 5 Jan 2017 19:56:09 +0100 Subject: [PATCH] nrf5: Trimming down display configurations in mpconfigport.h --- nrf5/mpconfigport.h | 38 +++----------------------------------- 1 file changed, 3 insertions(+), 35 deletions(-) diff --git a/nrf5/mpconfigport.h b/nrf5/mpconfigport.h index daa5a64aee..d37ed6b0be 100644 --- a/nrf5/mpconfigport.h +++ b/nrf5/mpconfigport.h @@ -134,11 +134,8 @@ #ifndef MICROPY_PY_DISPLAY #define MICROPY_PY_DISPLAY (0) -#define MICROPY_PY_DISPLAY_EPAPER (0) #define MICROPY_PY_DISPLAY_EPAPER_SLD00200P (0) -#define MICROPY_PY_DISPLAY_LCD (0) -#define MICROPY_PY_DISPLAY_LCD_SLD10261P (0) -#define MICROPY_PY_DISPLAY_OLED (0) +#define MICROPY_PY_DISPLAY_LCD_ILI9341 (0) #define MICROPY_PY_DISPLAY_OLED_SSD1306 (0) #define MICROPY_PY_DISPLAY_OLED_SSD1305 (0) @@ -152,51 +149,22 @@ #ifndef MICROPY_PY_DISPLAY_EPAPER_SLD00200P #define MICROPY_PY_DISPLAY_EPAPER_SLD00200P (0) -#else -#if MICROPY_PY_DISPLAY_EPAPER_SLD00200P -#define MICROPY_PY_DISPLAY_EPAPER (1) #endif -#endif // MICROPY_PY_DISPLAY_EPAPER_SLD0020P -#ifndef MICROPY_PY_DISPLAY_LCD_SLD10261P -#define MICROPY_PY_DISPLAY_LCD_SLD10261P (0) -#else -#if MICROPY_PY_DISPLAY_LCD_SLD10261P -#define MICROPY_PY_DISPLAY_LCD (1) +#ifndef MICROPY_PY_DISPLAY_LCD_ILI9341 +#define MICROPY_PY_DISPLAY_LCD_ILI9341 (0) #endif -#endif // MICROPY_PY_DISPLAY_LCD_SLD10261P #ifndef MICROPY_PY_DISPLAY_OLED_SSD1305 #define MICROPY_PY_DISPLAY_OLED_SSD1305 (0) -#else -#if MICROPY_PY_DISPLAY_OLED_SSD1305 -#define MICROPY_PY_DISPLAY_OLED (1) #endif -#endif // MICROPY_PY_DISPLAY_OLED_SSD1305 #ifndef MICROPY_PY_DISPLAY_OLED_SSD1306 #define MICROPY_PY_DISPLAY_OLED_SSD1306 (0) -#else -#if MICROPY_PY_DISPLAY_OLED_SSD1306 -#define MICROPY_PY_DISPLAY_OLED (1) #endif -#endif // MICROPY_PY_DISPLAY_OLED_SSD1306 - #endif // MICROPY_PY_DISPLAY -#ifndef MICROPY_PY_DISPLAY_EPAPER -#define MICROPY_PY_DISPLAY_EPAPER (0) -#endif - -#ifndef MICROPY_PY_DISPLAY_LCD -#define MICROPY_PY_DISPLAY_LCD (0) -#endif - -#ifndef MICROPY_PY_DISPLAY_OLED -#define MICROPY_PY_DISPLAY_OLED (0) -#endif - #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1) #define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE (0)