Skip to content

Commit bfb9f17

Browse files
brentrubrentru
authored
Merge pull request #824 from adafruit/add-spi-tft
Feature: Add TFT and E-Ink Displays
2 parents 9a6a614 + ef261dd commit bfb9f17

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+3737
-2575
lines changed

‎.github/workflows/build-clang-doxy.yml‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818

1919
jobs:
2020
build-esp32sx-esptool:
21-
name: 🏗️ESP32-Sx(lvgl)
21+
name: 🏗️ESP32-Sx
2222
runs-on: ubuntu-latest
2323
strategy:
2424
fail-fast: false
@@ -92,8 +92,6 @@ jobs:
9292
git clone --quiet https://github.com/adafruit/Adafruit-ST7735-Library.git /home/runner/Arduino/libraries/Adafruit-ST7735-Library
9393
git clone --quiet https://github.com/adafruit/Adafruit_TouchScreen.git /home/runner/Arduino/libraries/Adafruit_TouchScreen
9494
git clone --quiet https://github.com/adafruit/Adafruit_TinyUSB_Arduino /home/runner/Arduino/libraries/Adafruit_TinyUSB_Arduino
95-
git clone --depth 1 --branch wippersnapper https://github.com/brentru/lvgl.git /home/runner/Arduino/libraries/lvgl
96-
git clone --depth 1 --branch development https://github.com/brentru/Adafruit_LvGL_Glue.git /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library
9795
- name: Download stable Nanopb
9896
id: download-nanopb
9997
continue-on-error: true
@@ -123,12 +121,6 @@ jobs:
123121
# Copy files to WipperSnapper's src/nanopb directory
124122
cp nanopb/pb_common.* nanopb/pb_encode.* nanopb/pb_decode.* src/nanopb
125123
mv nanopb/pb.h src/nanopb/nanopb.pb.h
126-
- name: List all files in Adafruit_LittlevGL_Glue_Library folder
127-
run: |
128-
ls /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library
129-
- name: Copy lv_conf.h file in Adafruit_LittlevGL_Glue_Library to the arduino library folder
130-
run: |
131-
cp /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library/lv_conf.h /home/runner/Arduino/libraries
132124
- name: Install Dependencies (esptool)
133125
run: |
134126
pip3 install esptool
@@ -311,8 +303,6 @@ jobs:
311303
git clone --quiet https://github.com/adafruit/Adafruit-ST7735-Library.git /home/runner/Arduino/libraries/Adafruit-ST7735-Library
312304
git clone --quiet https://github.com/adafruit/Adafruit_TouchScreen.git /home/runner/Arduino/libraries/Adafruit_TouchScreen
313305
git clone --quiet https://github.com/adafruit/Adafruit_TinyUSB_Arduino /home/runner/Arduino/libraries/Adafruit_TinyUSB_Arduino
314-
git clone --depth 1 --branch wippersnapper https://github.com/brentru/lvgl.git /home/runner/Arduino/libraries/lvgl
315-
git clone --depth 1 --branch development https://github.com/brentru/Adafruit_LvGL_Glue.git /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library
316306
- name: Download stable Nanopb
317307
id: download-nanopb
318308
continue-on-error: true
@@ -342,12 +332,6 @@ jobs:
342332
# Copy files to WipperSnapper's src/nanopb directory
343333
cp nanopb/pb_common.* nanopb/pb_encode.* nanopb/pb_decode.* src/nanopb
344334
mv nanopb/pb.h src/nanopb/nanopb.pb.h
345-
- name: List all files in Adafruit_LittlevGL_Glue_Library folder
346-
run: |
347-
ls /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library
348-
- name: Copy lv_conf.h file in Adafruit_LittlevGL_Glue_Library to the arduino library folder
349-
run: |
350-
cp /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library/lv_conf.h /home/runner/Arduino/libraries
351335
- name: Build for ESP32-SX
352336
run: |
353337
python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000
@@ -865,8 +849,6 @@ jobs:
865849
git clone --quiet https://github.com/adafruit/Adafruit-ST7735-Library.git /home/runner/Arduino/libraries/Adafruit-ST7735-Library
866850
git clone --quiet https://github.com/adafruit/Adafruit_TouchScreen.git /home/runner/Arduino/libraries/Adafruit_TouchScreen
867851
git clone --quiet https://github.com/adafruit/Adafruit_TinyUSB_Arduino /home/runner/Arduino/libraries/Adafruit_TinyUSB_Arduino
868-
git clone --depth 1 --branch wippersnapper https://github.com/brentru/lvgl.git /home/runner/Arduino/libraries/lvgl
869-
git clone --depth 1 --branch development https://github.com/brentru/Adafruit_LvGL_Glue.git /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library
870852
- name: Download stable Nanopb
871853
id: download-nanopb
872854
continue-on-error: true
@@ -896,12 +878,6 @@ jobs:
896878
# Copy files to WipperSnapper's src/nanopb directory
897879
cp nanopb/pb_common.* nanopb/pb_encode.* nanopb/pb_decode.* src/nanopb
898880
mv nanopb/pb.h src/nanopb/nanopb.pb.h
899-
- name: List all files in Adafruit_LittlevGL_Glue_Library folder
900-
run: |
901-
ls /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library
902-
- name: Copy lv_conf.h file in Adafruit_LittlevGL_Glue_Library to the arduino library folder
903-
run: |
904-
cp /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library/lv_conf.h /home/runner/Arduino/libraries
905881
- name: Build for ESP32-SX
906882
run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000
907883
- name: list

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,6 @@ data/
5252

5353
# Misc. Data
5454
tests/
55-
venv/
55+
venv/
56+
57+
Doxyfile

‎.vscode/settings.json‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
11
{
22
"files.associations": {
33
"limits": "c",
4-
"type_traits": "c"
4+
"type_traits": "c",
5+
"array": "cpp",
6+
"deque": "cpp",
7+
"list": "cpp",
8+
"string": "cpp",
9+
"unordered_map": "cpp",
10+
"unordered_set": "cpp",
11+
"vector": "cpp",
12+
"string_view": "cpp",
13+
"format": "cpp",
14+
"initializer_list": "cpp",
15+
"span": "cpp"
516
},
617
"C_Cpp.dimInactiveRegions": true,
718
"dotnet.defaultSolution": "disable",

‎Doxyfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2451,4 +2451,4 @@ GENERATE_LEGEND = YES
24512451
# plantuml temporary files.
24522452
# The default value is: YES.
24532453

2454-
DOT_CLEANUP = YES
2454+
DOT_CLEANUP = YES

‎library.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name=Adafruit WipperSnapper
2-
version=1.0.0-beta.117
2+
version=1.0.0-beta.118
33
author=Adafruit
44
maintainer=Adafruit <adafruitio@adafruit.com>
55
sentence=Arduino application for Adafruit.io WipperSnapper
66
paragraph=Arduino application for Adafruit.io WipperSnapper
77
category=Communication
88
url=https://github.com/adafruit/Adafruit_Wippersnapper_Arduino
99
architectures=*
10-
depends=OmronD6T - Community Fork, SdFat - Adafruit Fork, Adafruit NeoPixel, Adafruit SPA06_003, Adafruit SPIFlash, ArduinoJson, Adafruit DotStar, Adafruit HDC302x, Adafruit INA219, Adafruit INA260 Library, Adafruit INA237 and INA238 Library, Adafruit LTR329 and LTR303, Adafruit LTR390 Library, Adafruit MCP3421, Adafruit MLX90632 Library, Adafruit NAU7802 Library, Adafruit SleepyDog Library, Adafruit TMP117, Adafruit TinyUSB Library, Adafruit AHTX0, Adafruit AS5600 Library, Adafruit BME280 Library, Adafruit BMP280 Library, Adafruit BMP3XX Library, Adafruit BMP5xx Library, Adafruit DPS310, Adafruit DS248x, Adafruit SCD30, Adafruit SGP30 Sensor, Adafruit SGP40 Sensor, Sensirion I2C SCD4x, Sensirion I2C SEN5X, Sensirion I2C SEN66, arduino-sht, Adafruit Si7021 Library, Adafruit MQTT Library, Adafruit MS8607, Adafruit MCP9808 Library, Adafruit MCP9600 Library, Adafruit MPL115A2, Adafruit MPRLS Library, Adafruit TSL2591 Library, Adafruit_VL53L0X, Adafruit VL53L1X, STM32duino VL53L4CD, STM32duino VL53L4CX, Adafruit_VL6180X, Adafruit PM25 AQI Sensor, Adafruit QMC5883P Library, Adafruit VCNL4020 Library, Adafruit VCNL4040, Adafruit VCNL4200 Library, Adafruit VEML7700 Library, Adafruit LC709203F, Adafruit LPS2X, Adafruit LPS28, Adafruit LPS35HW, Adafruit seesaw Library, Adafruit BME680 Library, Adafruit MAX1704X, Adafruit ADT7410 Library, Adafruit HTS221, Adafruit HTU21DF Library, Adafruit HTU31D Library, Adafruit PCT2075, hp_BH1750, ENS160 - Adafruit Fork, Adafruit BusIO, Adafruit Unified Sensor, Sensirion Core, Adafruit GFX Library, Adafruit LED Backpack Library, Adafruit LiquidCrystal, Adafruit SH110X, Adafruit SSD1306
10+
depends=OmronD6T - Community Fork, SdFat - Adafruit Fork, Adafruit NeoPixel, Adafruit SPA06_003, Adafruit SPIFlash, ArduinoJson, Adafruit DotStar, Adafruit HDC302x, Adafruit INA219, Adafruit INA260 Library, Adafruit INA237 and INA238 Library, Adafruit LTR329 and LTR303, Adafruit LTR390 Library, Adafruit MCP3421, Adafruit MLX90632 Library, Adafruit NAU7802 Library, Adafruit SleepyDog Library, Adafruit TMP117, Adafruit TinyUSB Library, Adafruit AHTX0, Adafruit AS5600 Library, Adafruit BME280 Library, Adafruit BMP280 Library, Adafruit BMP3XX Library, Adafruit BMP5xx Library, Adafruit DPS310, Adafruit DS248x, Adafruit SCD30, Adafruit SGP30 Sensor, Adafruit SGP40 Sensor, Sensirion I2C SCD4x, Sensirion I2C SEN5X, Sensirion I2C SEN66, arduino-sht, Adafruit Si7021 Library, Adafruit MQTT Library, Adafruit MS8607, Adafruit MCP9808 Library, Adafruit MCP9600 Library, Adafruit MPL115A2, Adafruit MPRLS Library, Adafruit TSL2591 Library, Adafruit_VL53L0X, Adafruit VL53L1X, STM32duino VL53L4CD, STM32duino VL53L4CX, Adafruit_VL6180X, Adafruit PM25 AQI Sensor, Adafruit QMC5883P Library, Adafruit VCNL4020 Library, Adafruit VCNL4040, Adafruit VCNL4200 Library, Adafruit VEML7700 Library, Adafruit LC709203F, Adafruit LPS2X, Adafruit LPS28, Adafruit LPS35HW, Adafruit seesaw Library, Adafruit BME680 Library, Adafruit MAX1704X, Adafruit ADT7410 Library, Adafruit HTS221, Adafruit HTU21DF Library, Adafruit HTU31D Library, Adafruit PCT2075, hp_BH1750, ENS160 - Adafruit Fork, Adafruit BusIO, Adafruit Unified Sensor, Sensirion Core, Adafruit GFX Library, Adafruit LED Backpack Library, Adafruit LiquidCrystal, Adafruit SH110X, Adafruit SSD1306, Adafruit EPD, Adafruit ST7735 and ST7789 Library

‎platformio.ini‎

Lines changed: 4 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,6 @@ framework = arduino
1616
monitor_speed = 115200
1717
lib_compat_mode = strict
1818
lib_deps =
19-
;;;;;;;;;;; FunHouse / LVGL Boards uncomment these ;;;;;;;;;;;;;;
20-
; https://github.com/adafruit/Adafruit_HX8357_Library.git
21-
; https://github.com/adafruit/Adafruit_ILI9341.git
22-
; https://github.com/adafruit/Adafruit_STMPE610.git
23-
; https://github.com/adafruit/Adafruit-ST7735-Library.git
24-
; https://github.com/adafruit/Adafruit_TouchScreen.git
25-
; https://github.com/brentru/lvgl.git#wippersnapper
26-
; https://github.com/brentru/Adafruit_LvGL_Glue.git#development
27-
;;;;;;;;;;; All Boards need these libraries included ;;;;;;;;;;;;;;
2819
adafruit/Adafruit Zero DMA Library
2920
adafruit/Adafruit NeoPixel
3021
adafruit/Adafruit SPIFlash
@@ -92,12 +83,14 @@ lib_deps =
9283
adafruit/Adafruit PM25 AQI Sensor
9384
adafruit/Adafruit SH110X
9485
adafruit/Adafruit SSD1306
86+
adafruit/Adafruit EPD
87+
adafruit/Adafruit ST7735 and ST7789 Library
9588
https://github.com/tyeth/omron-devhub_d6t-arduino.git
9689
https://github.com/pstolarz/OneWireNg.git
9790
; COMMENT OUT FOR RP2040/RP2350 BOARDS
98-
https://github.com/milesburton/Arduino-Temperature-Control-Library.git
91+
;https://github.com/milesburton/Arduino-Temperature-Control-Library.git
9992
; AND UNCOMMENT FOR RP2040/RP2350 BOARDS
100-
; https://github.com/pstolarz/Arduino-Temperature-Control-Library.git
93+
https://github.com/pstolarz/Arduino-Temperature-Control-Library.git
10194
https://github.com/Sensirion/arduino-sht.git
10295
https://github.com/Sensirion/arduino-i2c-scd4x.git
10396
https://github.com/Sensirion/arduino-i2c-sen5x.git
@@ -106,8 +99,6 @@ lib_deps =
10699
https://github.com/Starmbi/hp_BH1750.git
107100
https://github.com/adafruit/Adafruit_TinyUSB_Arduino.git
108101

109-
110-
111102
; Common build environment for ESP32 platform
112103
[common:esp32]
113104
platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.13/platform-espressif32.zip
@@ -217,7 +208,6 @@ extra_scripts = pre:rename_usb_config.py
217208
extends = common:esp32
218209
board = adafruit_feather_esp32s2_tft
219210
build_flags = -DARDUINO_ADAFRUIT_FEATHER_ESP32S2_TFT -DBOARD_HAS_PSRAM
220-
;set partition to tinyuf2-partitions-4MB-noota.csv as of CPY 10
221211
board_build.partitions = tinyuf2-partitions-4MB-noota.csv
222212
extra_scripts = pre:rename_usb_config.py
223213

@@ -307,35 +297,6 @@ build_flags = -DARDUINO_FUNHOUSE -DBOARD_HAS_PSRAM
307297
board_build.partitions = tinyuf2-partitions-4MB-noota.csv
308298
extra_scripts = pre:rename_usb_config.py
309299

310-
; Adafruit Funhouse ESP32-S2
311-
[env:adafruit_funhouse_esp32s2_debug]
312-
extends = common:esp32
313-
board = adafruit_funhouse_esp32s2
314-
;lib_extra_dirs =
315-
build_type = debug
316-
build_flags =
317-
-DARDUINO_FUNHOUSE
318-
-DBOARD_HAS_PSRAM
319-
-DCFG_TUSB_DEBUG=1
320-
-DDEBUG=1
321-
-DESP_LOG_LEVEL=ESP_LOG_VERBOSE
322-
-DARDUINO_CORE_DEBUG_LEVEL=5
323-
-DCORE_DEBUG_LEVEL=5
324-
-DARDUHAL_LOG_LEVEL=5
325-
; USB Configuration
326-
; Uncomment if USB CDC on boot is needed
327-
; -DARDUINO_USB_CDC_ON_BOOT=1
328-
; -DARDUINO_USB_MODE=0 ; 0 for CDC + TinyUSB, 1 for Hardware CDC + JTAG
329-
; LVGL Debugging
330-
-DLV_USE_DEBUG=1
331-
-DLV_USE_LOG=1
332-
-DLV_LOG_PRINTF=1
333-
-DLV_LOG_COLOR=1
334-
-DLV_LOG_LEVEL=LV_LOG_LEVEL_TRACE
335-
;set partition to tinyuf2-partitions-4MB-noota.csv as of CPY 10
336-
board_build.partitions = tinyuf2-partitions-4MB-noota.csv
337-
extra_scripts = pre:rename_usb_config.py
338-
339300
; Adafruit QT Py ESP32 Pico
340301
[env:adafruit_qtpy_esp32]
341302
extends = common:esp32

0 commit comments

Comments
 (0)