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.

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

Update Adafruit_GFX library #2799

Merged
merged 1 commit into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions Sming/Libraries/.patches/Adafruit_GFX.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/Adafruit_SPITFT.cpp b/Adafruit_SPITFT.cpp
index b78d5ce..f919595 100644
index eeffce7..94e07f1 100644
--- a/Adafruit_SPITFT.cpp
+++ b/Adafruit_SPITFT.cpp
@@ -35,6 +35,10 @@
Expand Down Expand Up @@ -211,7 +211,7 @@ index b78d5ce..f919595 100644
}

/*!
@@ -1184,150 +1034,6 @@ void Adafruit_SPITFT::writeColor(uint16_t color, uint32_t len) {
@@ -1197,150 +1047,6 @@ void Adafruit_SPITFT::writeColor(uint16_t color, uint32_t len) {

uint8_t hi = color >> 8, lo = color;

Expand Down Expand Up @@ -364,7 +364,7 @@ index b78d5ce..f919595 100644
do {

diff --git a/Adafruit_SPITFT.h b/Adafruit_SPITFT.h
index 7f5d80f..9725e13 100644
index 8064a74..5c119ad 100644
--- a/Adafruit_SPITFT.h
+++ b/Adafruit_SPITFT.h
@@ -138,13 +138,11 @@ public:
Expand All @@ -382,7 +382,7 @@ index 7f5d80f..9725e13 100644

// Parallel constructor: expects width & height (rotation 0), flag
// indicating whether 16-bit (true) or 8-bit (false) interface, 3 signal
@@ -403,7 +401,7 @@ protected:
@@ -404,7 +402,7 @@ protected:
union {
#endif
struct { // Values specific to HARDWARE SPI:
Expand Down
2 changes: 1 addition & 1 deletion Sming/Libraries/Adafruit_GFX
Submodule Adafruit_GFX updated 60 files
+3 −3 .github/workflows/githubci.yml
+39 −42 Adafruit_GFX.cpp
+6 −8 Adafruit_GFX.h
+16 −27 Adafruit_SPITFT.cpp
+1 −0 Adafruit_SPITFT.h
+11 −0 CMakeLists.txt
+3 −0 Fonts/FreeMono12pt7b.h
+3 −0 Fonts/FreeMono18pt7b.h
+3 −0 Fonts/FreeMono24pt7b.h
+3 −0 Fonts/FreeMono9pt7b.h
+3 −0 Fonts/FreeMonoBold12pt7b.h
+3 −0 Fonts/FreeMonoBold18pt7b.h
+3 −0 Fonts/FreeMonoBold24pt7b.h
+3 −0 Fonts/FreeMonoBold9pt7b.h
+3 −0 Fonts/FreeMonoBoldOblique12pt7b.h
+3 −0 Fonts/FreeMonoBoldOblique18pt7b.h
+3 −0 Fonts/FreeMonoBoldOblique24pt7b.h
+3 −0 Fonts/FreeMonoBoldOblique9pt7b.h
+3 −0 Fonts/FreeMonoOblique12pt7b.h
+3 −0 Fonts/FreeMonoOblique18pt7b.h
+3 −0 Fonts/FreeMonoOblique24pt7b.h
+3 −0 Fonts/FreeMonoOblique9pt7b.h
+3 −0 Fonts/FreeSans12pt7b.h
+3 −0 Fonts/FreeSans18pt7b.h
+3 −0 Fonts/FreeSans24pt7b.h
+3 −0 Fonts/FreeSans9pt7b.h
+3 −0 Fonts/FreeSansBold12pt7b.h
+3 −0 Fonts/FreeSansBold18pt7b.h
+3 −0 Fonts/FreeSansBold24pt7b.h
+3 −0 Fonts/FreeSansBold9pt7b.h
+3 −0 Fonts/FreeSansBoldOblique12pt7b.h
+3 −0 Fonts/FreeSansBoldOblique18pt7b.h
+3 −0 Fonts/FreeSansBoldOblique24pt7b.h
+3 −0 Fonts/FreeSansBoldOblique9pt7b.h
+3 −0 Fonts/FreeSansOblique12pt7b.h
+3 −0 Fonts/FreeSansOblique18pt7b.h
+3 −0 Fonts/FreeSansOblique24pt7b.h
+3 −0 Fonts/FreeSansOblique9pt7b.h
+3 −0 Fonts/FreeSerif12pt7b.h
+3 −0 Fonts/FreeSerif18pt7b.h
+3 −0 Fonts/FreeSerif24pt7b.h
+3 −0 Fonts/FreeSerif9pt7b.h
+3 −0 Fonts/FreeSerifBold12pt7b.h
+3 −0 Fonts/FreeSerifBold18pt7b.h
+3 −0 Fonts/FreeSerifBold24pt7b.h
+3 −0 Fonts/FreeSerifBold9pt7b.h
+3 −0 Fonts/FreeSerifBoldItalic12pt7b.h
+3 −0 Fonts/FreeSerifBoldItalic18pt7b.h
+3 −0 Fonts/FreeSerifBoldItalic24pt7b.h
+3 −0 Fonts/FreeSerifBoldItalic9pt7b.h
+3 −0 Fonts/FreeSerifItalic12pt7b.h
+3 −0 Fonts/FreeSerifItalic18pt7b.h
+3 −0 Fonts/FreeSerifItalic24pt7b.h
+3 −0 Fonts/FreeSerifItalic9pt7b.h
+3 −0 Fonts/Org_01.h
+3 −0 Fonts/Picopixel.h
+3 −0 Fonts/Tiny3x3a2pt7b.h
+3 −0 Fonts/TomThumb.h
+1 −0 component.mk
+1 −1 library.properties
Loading