Skip to content

Rework display refresh, add M4SK and add ePaper support #2085

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

Merged
tannewt merged 18 commits into from
Aug 27, 2019
Merged

Rework display refresh, add M4SK and add ePaper support #2085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
8fa8737
Initial ePaper work
tannewt Jul 30, 2019
70680d5
EPaper displays work mostly.
tannewt Aug 2, 2019
d37dd4d
Updated ParallelBus implementation in nrf port
bmeisels Aug 5, 2019
c247e7d
Begin refresh rework.
tannewt Aug 14, 2019
36a23e0
Rework refresh API and factor common display stuff out
tannewt Aug 17, 2019
24b3096
Refresh ePaper displays once code.py is done running
tannewt Aug 21, 2019
3a98de1
Add reset() to display busses to detect whether it works
tannewt Aug 21, 2019
f2a1972
Add refresh_time to use if busy_pin is not given
tannewt Aug 21, 2019
f8e4cca
Fix builds without displayio
tannewt Aug 21, 2019
2497cbe
Fix nrf builds
tannewt Aug 21, 2019
9993a99
Add initial Monster M4SK build
tannewt Aug 22, 2019
8d836fa
Regular display fixes including refresh tweaks
tannewt Aug 22, 2019
d2d27a0
Update translations
tannewt Aug 22, 2019
fd8050b
Turn off features to make room for ePaper
tannewt Aug 22, 2019
72e7ffa
More cleanup
tannewt Aug 22, 2019
b992ca8
Rejigger builds to fit under 50 minute limit
tannewt Aug 23, 2019
7324b70
Rework based on Dan's review
tannewt Aug 23, 2019
bea77c6
Minor renames
tannewt Aug 26, 2019
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
5 changes: 3 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@ env:
- TRAVIS_BOARDS="itsybitsy_m0_express metro_m0_express pirkey_m0 pyruler trinket_m0 trinket_m0_haxpress arduino_mkr1300 arduino_mkrzero arduino_zero bast_pro_mini_m0 catwan_usbstick datum_distance datum_imu datum_weather" TRAVIS_SDK=arm
- TRAVIS_BOARDS="escornabot_makech meowmeow pewpew10 robohatmm1_m0 snekboard sparkfun_lumidrive sparkfun_redboard_turbo sparkfun_samd21_dev sparkfun_samd21_mini uchip ugame10" TRAVIS_SDK=arm
# Adafruit SAMD51 (M4) + Other SAMD51
- TRAVIS_BOARDS="feather_m4_express grandcentral_m4_express itsybitsy_m4_express metro_m4_airlift_lite metro_m4_express pybadge pybadge_airlift pygamer pygamer_advance" TRAVIS_SDK=arm
- TRAVIS_BOARDS="pyportal pyportal_titano trellis_m4_express capablerobot_usbhub cp32-m4 datalore_ip_m4 datum_light kicksat-sprite mini_sam_m4 robohatmm1_m4 sam32" TRAVIS_SDK=arm
- TRAVIS_BOARDS="feather_m4_express grandcentral_m4_express itsybitsy_m4_express metro_m4_airlift_lite metro_m4_express pybadge pybadge_airlift" TRAVIS_SDK=arm
- TRAVIS_BOARDS="pyportal pyportal_titano trellis_m4_express capablerobot_usbhub cp32-m4 datalore_ip_m4 datum_light" TRAVIS_SDK=arm
- TRAVIS_BOARDS="pygamer pygamer_advance monster_m4sk kicksat-sprite mini_sam_m4 robohatmm1_m4 sam32" TRAVIS_SDK=arm


addons:
Expand Down
28 changes: 22 additions & 6 deletions locale/ID.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-08-22 15:20-0400\n"
"POT-Creation-Date: 2019-08-22 14:29-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -301,6 +301,10 @@ msgstr ""
"Auto-reload aktif. Silahkan simpan data-data (files) melalui USB untuk "
"menjalankannya atau masuk ke REPL untukmenonaktifkan.\n"

#: shared-module/displayio/Display.c
msgid "Below minimum frame rate"
msgstr ""

#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
msgid "Bit clock and word select must share a clock unit"
msgstr "Bit clock dan word harus memiliki kesamaan pada clock unit"
Expand Down Expand Up @@ -533,6 +537,7 @@ msgid "Display must have a 16 bit colorspace."
msgstr ""

#: shared-bindings/displayio/Display.c
#: shared-bindings/displayio/EPaperDisplay.c
msgid "Display rotation must be in 90 degree increments"
msgstr ""

Expand Down Expand Up @@ -749,6 +754,7 @@ msgid "Function requires lock"
msgstr ""

#: shared-bindings/displayio/Display.c
#: shared-bindings/displayio/EPaperDisplay.c
msgid "Group already used"
msgstr ""

Expand Down Expand Up @@ -1026,8 +1032,8 @@ msgstr ""
#: shared-module/displayio/OnDiskBitmap.c
#, c-format
msgid ""
"Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d bpp "
"given"
"Only monochrome, indexed 4bpp or 8bpp, and 16bpp or greater BMPs supported: "
"%d bpp given"
msgstr ""

#: shared-bindings/_pixelbuf/PixelBuf.c
Expand Down Expand Up @@ -1104,6 +1110,10 @@ msgstr "sistem file (filesystem) bersifat Read-only"
msgid "Read-only object"
msgstr "sistem file (filesystem) bersifat Read-only"

#: shared-bindings/displayio/EPaperDisplay.c
msgid "Refresh too soon"
msgstr ""

#: ports/atmel-samd/common-hal/audioio/AudioOut.c
msgid "Right channel unsupported"
msgstr "Channel Kanan tidak didukung"
Expand Down Expand Up @@ -1218,11 +1228,11 @@ msgstr ""
msgid "Tile height must exactly divide bitmap height"
msgstr ""

#: shared-bindings/displayio/TileGrid.c
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
msgid "Tile index out of bounds"
msgstr ""

#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
#: shared-bindings/displayio/TileGrid.c
msgid "Tile value out of bounds"
msgstr ""

Expand All @@ -1244,6 +1254,7 @@ msgid "Too many display busses"
msgstr ""

#: shared-bindings/displayio/Display.c
#: shared-bindings/displayio/EPaperDisplay.c
msgid "Too many displays"
msgstr ""

Expand Down Expand Up @@ -1315,7 +1326,7 @@ msgstr ""
msgid "Unsupported baudrate"
msgstr "Baudrate tidak didukung"

#: shared-module/displayio/Display.c
#: shared-module/displayio/display_core.c
#, fuzzy
msgid "Unsupported display bus type"
msgstr "Baudrate tidak didukung"
Expand Down Expand Up @@ -2198,6 +2209,11 @@ msgstr "tidak ada ikatan/bind pada temuan nonlocal"
msgid "no module named '%q'"
msgstr "tidak ada modul yang bernama '%q'"

#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c
#: shared-bindings/displayio/ParallelBus.c
msgid "no reset pin available"
msgstr ""

#: py/runtime.c shared-bindings/_pixelbuf/__init__.c
msgid "no such attribute"
msgstr ""
Expand Down
28 changes: 22 additions & 6 deletions locale/circuitpython.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-08-22 15:20-0400\n"
"POT-Creation-Date: 2019-08-22 14:29-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -297,6 +297,10 @@ msgid ""
"disable.\n"
msgstr ""

#: shared-module/displayio/Display.c
msgid "Below minimum frame rate"
msgstr ""

#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
msgid "Bit clock and word select must share a clock unit"
msgstr ""
Expand Down Expand Up @@ -522,6 +526,7 @@ msgid "Display must have a 16 bit colorspace."
msgstr ""

#: shared-bindings/displayio/Display.c
#: shared-bindings/displayio/EPaperDisplay.c
msgid "Display rotation must be in 90 degree increments"
msgstr ""

Expand Down Expand Up @@ -734,6 +739,7 @@ msgid "Function requires lock"
msgstr ""

#: shared-bindings/displayio/Display.c
#: shared-bindings/displayio/EPaperDisplay.c
msgid "Group already used"
msgstr ""

Expand Down Expand Up @@ -1010,8 +1016,8 @@ msgstr ""
#: shared-module/displayio/OnDiskBitmap.c
#, c-format
msgid ""
"Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d bpp "
"given"
"Only monochrome, indexed 4bpp or 8bpp, and 16bpp or greater BMPs supported: "
"%d bpp given"
msgstr ""

#: shared-bindings/_pixelbuf/PixelBuf.c
Expand Down Expand Up @@ -1085,6 +1091,10 @@ msgstr ""
msgid "Read-only object"
msgstr ""

#: shared-bindings/displayio/EPaperDisplay.c
msgid "Refresh too soon"
msgstr ""

#: ports/atmel-samd/common-hal/audioio/AudioOut.c
msgid "Right channel unsupported"
msgstr ""
Expand Down Expand Up @@ -1195,11 +1205,11 @@ msgstr ""
msgid "Tile height must exactly divide bitmap height"
msgstr ""

#: shared-bindings/displayio/TileGrid.c
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
msgid "Tile index out of bounds"
msgstr ""

#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
#: shared-bindings/displayio/TileGrid.c
msgid "Tile value out of bounds"
msgstr ""

Expand All @@ -1221,6 +1231,7 @@ msgid "Too many display busses"
msgstr ""

#: shared-bindings/displayio/Display.c
#: shared-bindings/displayio/EPaperDisplay.c
msgid "Too many displays"
msgstr ""

Expand Down Expand Up @@ -1292,7 +1303,7 @@ msgstr ""
msgid "Unsupported baudrate"
msgstr ""

#: shared-module/displayio/Display.c
#: shared-module/displayio/display_core.c
msgid "Unsupported display bus type"
msgstr ""

Expand Down Expand Up @@ -2163,6 +2174,11 @@ msgstr ""
msgid "no module named '%q'"
msgstr ""

#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c
#: shared-bindings/displayio/ParallelBus.c
msgid "no reset pin available"
msgstr ""

#: py/runtime.c shared-bindings/_pixelbuf/__init__.c
msgid "no such attribute"
msgstr ""
Expand Down
28 changes: 22 additions & 6 deletions locale/de_DE.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-08-22 15:20-0400\n"
"POT-Creation-Date: 2019-08-22 14:29-0700\n"
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
"Last-Translator: Pascal Deneaux\n"
"Language-Team: Sebastian Plamauer, Pascal Deneaux\n"
Expand Down Expand Up @@ -301,6 +301,10 @@ msgstr ""
"Automatisches Neuladen ist aktiv. Speichere Dateien über USB um sie "
"auszuführen oder verbinde dich mit der REPL zum Deaktivieren.\n"

#: shared-module/displayio/Display.c
msgid "Below minimum frame rate"
msgstr ""

#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
msgid "Bit clock and word select must share a clock unit"
msgstr "Bit clock und word select müssen eine clock unit teilen"
Expand Down Expand Up @@ -526,6 +530,7 @@ msgid "Display must have a 16 bit colorspace."
msgstr ""

#: shared-bindings/displayio/Display.c
#: shared-bindings/displayio/EPaperDisplay.c
msgid "Display rotation must be in 90 degree increments"
msgstr "Die Rotation der Anzeige muss in 90-Grad-Schritten erfolgen"

Expand Down Expand Up @@ -738,6 +743,7 @@ msgid "Function requires lock"
msgstr "Die Funktion erwartet, dass der 'lock'-Befehl zuvor ausgeführt wurde"

#: shared-bindings/displayio/Display.c
#: shared-bindings/displayio/EPaperDisplay.c
msgid "Group already used"
msgstr ""

Expand Down Expand Up @@ -1025,8 +1031,8 @@ msgstr ""
#: shared-module/displayio/OnDiskBitmap.c
#, c-format
msgid ""
"Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d bpp "
"given"
"Only monochrome, indexed 4bpp or 8bpp, and 16bpp or greater BMPs supported: "
"%d bpp given"
msgstr ""

#: shared-bindings/_pixelbuf/PixelBuf.c
Expand Down Expand Up @@ -1102,6 +1108,10 @@ msgstr "Schreibgeschützte Dateisystem"
msgid "Read-only object"
msgstr "Schreibgeschützte Objekt"

#: shared-bindings/displayio/EPaperDisplay.c
msgid "Refresh too soon"
msgstr ""

#: ports/atmel-samd/common-hal/audioio/AudioOut.c
msgid "Right channel unsupported"
msgstr "Rechter Kanal wird nicht unterstützt"
Expand Down Expand Up @@ -1224,11 +1234,11 @@ msgstr ""
msgid "Tile height must exactly divide bitmap height"
msgstr ""

#: shared-bindings/displayio/TileGrid.c
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
msgid "Tile index out of bounds"
msgstr ""

#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
#: shared-bindings/displayio/TileGrid.c
msgid "Tile value out of bounds"
msgstr ""

Expand All @@ -1250,6 +1260,7 @@ msgid "Too many display busses"
msgstr ""

#: shared-bindings/displayio/Display.c
#: shared-bindings/displayio/EPaperDisplay.c
msgid "Too many displays"
msgstr "Zu viele displays"

Expand Down Expand Up @@ -1323,7 +1334,7 @@ msgstr ""
msgid "Unsupported baudrate"
msgstr "Baudrate wird nicht unterstützt"

#: shared-module/displayio/Display.c
#: shared-module/displayio/display_core.c
msgid "Unsupported display bus type"
msgstr "Nicht unterstützter display bus type"

Expand Down Expand Up @@ -2210,6 +2221,11 @@ msgstr ""
msgid "no module named '%q'"
msgstr "Kein Modul mit dem Namen '%q'"

#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c
#: shared-bindings/displayio/ParallelBus.c
msgid "no reset pin available"
msgstr ""

#: py/runtime.c shared-bindings/_pixelbuf/__init__.c
msgid "no such attribute"
msgstr ""
Expand Down
Loading