From 227f0d6a445c44d713346a2ec8ad912f2348b8ba Mon Sep 17 00:00:00 2001 From: Eric Brombaugh <ebrombaugh1@cox.net> Date: Sun, 7 May 2023 12:56:37 -0700 Subject: [PATCH] Move resolution definition to top-level. --- examples/spi_oled/spi_oled.c | 5 +++++ examples/spi_oled/ssd1306.h | 9 ++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/examples/spi_oled/spi_oled.c b/examples/spi_oled/spi_oled.c index 7359bb2..f5231e8 100644 --- a/examples/spi_oled/spi_oled.c +++ b/examples/spi_oled/spi_oled.c @@ -7,6 +7,11 @@ #define SYSTEM_CORE_CLOCK 48000000 #define APB_CLOCK SYSTEM_CORE_CLOCK +// what type of OLED - uncomment just one +//#define SSD1306_64X32 +//#define SSD1306_128X32 +#define SSD1306_128X64 + #include "ch32v003fun.h" #include <stdio.h> #include "ssd1306_spi.h" diff --git a/examples/spi_oled/ssd1306.h b/examples/spi_oled/ssd1306.h index 74aec8d..19ea88d 100644 --- a/examples/spi_oled/ssd1306.h +++ b/examples/spi_oled/ssd1306.h @@ -13,12 +13,11 @@ // comfortable packet size for this OLED #define SSD1306_PSZ 32 -// what type of OLED - uncomment just one -//#define SSD1306_64X32 -//#define SSD1306_128X32 -#define SSD1306_128X64 - // characteristics of each type +#if !defined (SSD1306_64X32) && !defined (SSD1306_128X32) && !defined (SSD1306_128X64) + #error "Please define the SSD1306_WXH resolution used in your application" +#endif + #ifdef SSD1306_64X32 #define SSD1306_W 64 #define SSD1306_H 32 -- GitLab