Michel2/Adafruit_ILI9341
1
0 Fork 0
mirror of https://github.com/adafruit/Adafruit_ILI9341.git synced 2026-10-26 22:10:38 +00:00
Code Issues Releases Activity

Merge branch 'master' into merge-feathers3

Browse Source
This commit is contained in:
Ryan M. Lederman committed 2026-08-19 15:47:12 -06:00
2 parents 392d22473f dbb447afc9
commit bf5c8e8f18
5 files changed
+29 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Adafruit_ILI9341.cpp
Executable → Regular
+2 -1
View File
@@ -49,7 +49,8 @@
#include "Adafruit_ILI9341.h" #include "Adafruit_ILI9341.h"
#ifndef ARDUINO_STM32_FEATHER #ifndef ARDUINO_STM32_FEATHER
#include "pins_arduino.h" #include "pins_arduino.h"
#ifndef RASPI #if !defined(RASPI) && !defined(ARDUINO_UNOR4_MINIMA) && \
!defined(ARDUINO_UNOR4_WIFI)
#include "wiring_private.h" #include "wiring_private.h"
#endif #endif
#endif #endif
Adafruit_ILI9341.h
Executable → Regular
+1 -1
View File
@@ -101,7 +101,7 @@
#define ILI9341_GMCTRP1 0xE0 ///< Positive Gamma Correction #define ILI9341_GMCTRP1 0xE0 ///< Positive Gamma Correction
#define ILI9341_GMCTRN1 0xE1 ///< Negative Gamma Correction #define ILI9341_GMCTRN1 0xE1 ///< Negative Gamma Correction
//#define ILI9341_PWCTR6 0xFC // #define ILI9341_PWCTR6 0xFC
// Color definitions // Color definitions
#define ILI9341_BLACK 0x0000 ///< 0, 0, 0 #define ILI9341_BLACK 0x0000 ///< 0, 0, 0
examples/graphicstest_featherwing/graphicstest_featherwing.ino
+12 -2
View File
@@ -26,8 +26,18 @@
#define TFT_CS 7 #define TFT_CS 7
#define TFT_DC 8 #define TFT_DC 8
#define SD_CS 5 #define SD_CS 5
#elif defined(ESP32) && !defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2) && \ #elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2) || \
!defined(ARDUINO_FEATHERS3) defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_REVTFT) || \
defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_TFT) || \
defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3) || \
defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_NOPSRAM) || \
defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_REVTFT) || \
defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_TFT)
#define STMPE_CS 6
#define TFT_CS 9
#define TFT_DC 10
#define SD_CS 5
#elif defined(ESP32)
#define STMPE_CS 32 #define STMPE_CS 32
#define TFT_CS 15 #define TFT_CS 15
#define TFT_DC 33 #define TFT_DC 33
examples/touchpaint_featherwing/touchpaint_featherwing.ino
+13 -2
View File
@@ -30,7 +30,18 @@
#define TFT_CS 7 #define TFT_CS 7
#define TFT_DC 8 #define TFT_DC 8
#define SD_CS 5 #define SD_CS 5
#elif defined(ESP32) && !defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2) #elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2) || \
defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_REVTFT) || \
defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_TFT) || \
defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3) || \
defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_NOPSRAM) || \
defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_REVTFT) || \
defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_TFT)
#define STMPE_CS 6
#define TFT_CS 9
#define TFT_DC 10
#define SD_CS 5
#elif defined(ESP32)
#define STMPE_CS 32 #define STMPE_CS 32
#define TFT_CS 15 #define TFT_CS 15
#define TFT_DC 33 #define TFT_DC 33
@@ -200,4 +211,4 @@ void loop() {
if (((p.y-PENRADIUS) > 0) && ((p.y+PENRADIUS) < tft.height())) { if (((p.y-PENRADIUS) > 0) && ((p.y+PENRADIUS) < tft.height())) {
tft.fillCircle(p.x, p.y, PENRADIUS, currentcolor); tft.fillCircle(p.x, p.y, PENRADIUS, currentcolor);
} }
} }
library.properties
+1 -1
View File
@@ -1,5 +1,5 @@
name=Adafruit ILI9341 name=Adafruit ILI9341
version=1.6.1 version=1.6.3
author=Adafruit author=Adafruit
maintainer=Adafruit <info@adafruit.com> maintainer=Adafruit <info@adafruit.com>
sentence=Library for Adafruit ILI9341 displays sentence=Library for Adafruit ILI9341 displays