CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change SSD1306_OLED_I2C_CONTROLLER to HAS_SSD1306_OLED_I2C (#13223)

Browse Source
This commit is contained in:
kwalters3 2019-02-22 20:08:36 -05:00 committed by Scott Lahteine
parent 109e67169c
commit 5eb82ca6a8
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Marlin/src/inc/Conditionals_LCD.h
View File

@ -158,10 +158,11 @@
#define ENCODER_STEPS_PER_MENU_ITEM 2 #define ENCODER_STEPS_PER_MENU_ITEM 2
#endif #endif
// Generic support for SSD1306 / SSD1309 / SH1106 OLED based LCDs. // 128x64 I2C OLED LCDs - SSD1306/SSD1309/SH1106
#if ENABLED(U8GLIB_SSD1306) || ENABLED(U8GLIB_SSD1309) || ENABLED(U8GLIB_SH1106) #define HAS_SSD1306_OLED_I2C (ENABLED(U8GLIB_SSD1306) || ENABLED(U8GLIB_SSD1309) || ENABLED(U8GLIB_SH1106))
#define ULTRA_LCD //general LCD support, also 16x2 #if HAS_SSD1306_OLED_I2C
#define DOGLCD // Support for I2C LCD 128x64 (Controller SSD1306 / SSD1309 / SH1106 graphic Display Family) #define ULTRA_LCD
#define DOGLCD
#endif #endif
#if ENABLED(PANEL_ONE) || ENABLED(U8GLIB_SH1106) #if ENABLED(PANEL_ONE) || ENABLED(U8GLIB_SH1106)

2
Marlin/src/pins/pins_DUE3DOM.h
View File

@ -146,7 +146,7 @@
#define SDSS 4 #define SDSS 4
#define SD_DETECT_PIN 14 #define SD_DETECT_PIN 14
#elif ENABLED(SSD1306_OLED_I2C_CONTROLLER) #elif HAS_SSD1306_OLED_I2C
#define BTN_EN1 50 #define BTN_EN1 50
#define BTN_EN2 52 #define BTN_EN2 52

2
Marlin/src/pins/pins_DUE3DOM_MINI.h
View File

@ -138,7 +138,7 @@
#define SDSS 4 #define SDSS 4
#define SD_DETECT_PIN 14 #define SD_DETECT_PIN 14
#elif ENABLED(SSD1306_OLED_I2C_CONTROLLER) #elif HAS_SSD1306_OLED_I2C
#define BTN_EN1 50 #define BTN_EN1 50
#define BTN_EN2 52 #define BTN_EN2 52

2
Marlin/src/pins/pins_RADDS.h
View File

@ -247,7 +247,7 @@
#define SDSS 10 #define SDSS 10
#define SD_DETECT_PIN 14 #define SD_DETECT_PIN 14
#elif ENABLED(SSD1306_OLED_I2C_CONTROLLER) #elif HAS_SSD1306_OLED_I2C
#define BTN_EN1 50 #define BTN_EN1 50
#define BTN_EN2 52 #define BTN_EN2 52

2
Marlin/src/pins/pins_RURAMPS4D_11.h
View File

@ -228,7 +228,7 @@
#define SD_DETECT_PIN 51 #define SD_DETECT_PIN 51
#elif ENABLED(SSD1306_OLED_I2C_CONTROLLER) #elif HAS_SSD1306_OLED_I2C
#define BEEPER_PIN 62 #define BEEPER_PIN 62
#define LCD_SDSS 10 #define LCD_SDSS 10

2
Marlin/src/pins/pins_RURAMPS4D_13.h
View File

@ -214,7 +214,7 @@
#define SD_DETECT_PIN 51 #define SD_DETECT_PIN 51
#elif ENABLED(SSD1306_OLED_I2C_CONTROLLER) #elif HAS_SSD1306_OLED_I2C
#define BEEPER_PIN 62 #define BEEPER_PIN 62
#define LCD_SDSS 10 #define LCD_SDSS 10