Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SSD1331 driver replaced with uDisplay #21177

Merged
merged 1 commit into from
Apr 14, 2024
Merged

SSD1331 driver replaced with uDisplay #21177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,222 changes: 0 additions & 2,222 deletions lib/lib_display/Adafruit_SSD1331-1.2.0/Adafruit_SPITFT_Renderer.cpp
View file
Open in desktop

This file was deleted.

525 changes: 0 additions & 525 deletions lib/lib_display/Adafruit_SSD1331-1.2.0/Adafruit_SPITFT_Renderer.h
View file
Open in desktop

This file was deleted.

190 changes: 0 additions & 190 deletions lib/lib_display/Adafruit_SSD1331-1.2.0/Adafruit_SSD1331.cpp
View file
Open in desktop

This file was deleted.

76 changes: 0 additions & 76 deletions lib/lib_display/Adafruit_SSD1331-1.2.0/Adafruit_SSD1331.h
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions lib/lib_display/Adafruit_SSD1331-1.2.0/README.md
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions lib/lib_display/Adafruit_SSD1331-1.2.0/library.properties
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions lib/lib_display/Adafruit_SSD1331-1.2.0/license.txt
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion tasmota/include/tasmota_configurations.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,6 @@
// #define USE_DISPLAY_SSD1351 // [DisplayModel 9]
// #define USE_DISPLAY_RA8876 // [DisplayModel 10]
// #define USE_DISPLAY_ST7789 // [DisplayModel 12] Enable ST7789 module
// #define USE_DISPLAY_SSD1331 // [DisplayModel 14] Enable SSD1331 module

#define USE_UNIVERSAL_DISPLAY
#define USE_UNIVERSAL_TOUCH
Expand Down
9 changes: 5 additions & 4 deletions tasmota/include/tasmota_template.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,10 +688,11 @@ const uint16_t kGpioNiceList[] PROGMEM = {
AGPIO(GPIO_ST7789_CS),
AGPIO(GPIO_ST7789_DC),
#endif // USE_DISPLAY_ST7789
#ifdef USE_DISPLAY_SSD1331
AGPIO(GPIO_SSD1331_CS),
AGPIO(GPIO_SSD1331_DC),
#endif // USE_DISPLAY_SSD1331
// REMOVED
// #ifdef USE_DISPLAY_SSD1331
// AGPIO(GPIO_SSD1331_CS),
// AGPIO(GPIO_SSD1331_DC),
// #endif // USE_DISPLAY_SSD1331
#ifdef USE_DISPLAY_MAX7219_MATRIX
#undef USE_DISPLAY_MAX7219
#undef USE_DISPLAY_TM1637
Expand Down
2 changes: 1 addition & 1 deletion tasmota/my_user_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,7 +810,7 @@ An online tool to calculate TLS fingerprints is available here at:\n\
// #define USE_DISPLAY_SSD1351 // [DisplayModel 9] Enable SSD1351 module
// #define USE_DISPLAY_RA8876 // [DisplayModel 10] [I2cDriver39] (Touch)
// #define USE_DISPLAY_ST7789 // [DisplayModel 12] Enable ST7789 module
// #define USE_DISPLAY_SSD1331 // [DisplayModel 14] Enable SSD1331 module
// REMOVED -- #define USE_DISPLAY_SSD1331 // [DisplayModel 14] Enable SSD1331 module
// #define USE_RC522 // Add support for MFRC522 13.56Mhz Rfid reader (+6k code)
// #define USE_RC522_DATA_FUNCTION // Add support for reading data block content (+0k4 code)
// #define USE_RC522_TYPE_INFORMATION // Add support for showing card type (+0k4 code)
Expand Down
7 changes: 4 additions & 3 deletions tasmota/tasmota_support/support_features.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,9 +668,10 @@ constexpr uint32_t feature[] = {
#if defined(USE_SPI) && defined(USE_DISPLAY) && defined(USE_DISPLAY_ST7789)
0x00080000 | // xdsp_12_ST7789.ino
#endif
#if defined(USE_SPI) && defined(USE_DISPLAY) && defined(USE_DISPLAY_SSD1331)
0x00100000 | // xdsp_14_SSD1331.ino
#endif
// REMOVED
// #if defined(USE_SPI) && defined(USE_DISPLAY) && defined(USE_DISPLAY_SSD1331)
// 0x00100000 | // xdsp_14_SSD1331.ino
// #endif
#ifdef USE_UFILESYS
0x00200000 | // xdrv_50_filesystem.ino
#endif
Expand Down
Loading