Merge branch 'master' into 1.47in

This commit is contained in:
Melissa LeBlanc-Williams 2022-01-21 08:31:53 -08:00 committed by GitHub
commit 8b13848448
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View file

@ -103,7 +103,7 @@ void Adafruit_ST7789::init(uint16_t width, uint16_t height, uint8_t mode) {
commonInit(NULL);
if (width == 174 && height == 320) {
if (width == 172 && height == 320) {
// 1.47" display
_rowstart = _rowstart2 = 0;
_colstart = _colstart2 = 34;
@ -112,7 +112,7 @@ void Adafruit_ST7789::init(uint16_t width, uint16_t height, uint8_t mode) {
_rowstart = 20;
_rowstart2 = 0;
_colstart = _colstart2 = 0;
} else if (width < 240) {
} else if (width == 135 && height == 240) {
// 1.14" display
_rowstart = _rowstart2 = (int)((320 - height) / 2);
_colstart = (int)((240 - width) / 2);

View file

@ -1,5 +1,5 @@
name=Adafruit ST7735 and ST7789 Library
version=1.7.5
version=1.8.1
author=Adafruit
maintainer=Adafruit <info@adafruit.com>
sentence=This is a library for the Adafruit ST7735 and ST7789 SPI displays.