Skip to content
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: 7 additions & 1 deletion .github/workflows/run-zephyr-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,13 @@ jobs:
include:
- shard: native_sim
boards: native_native_sim
pytest_args: tests/ --ignore=tests/bsim -k 'not native_native_sim_asan and not native_native_sim_lfs' -n $(nproc) --dist loadfile
pytest_args: tests/ --ignore=tests/bsim -k 'not native_native_sim_asan and not native_native_sim_lfs and not native_native_sim_lvgl' -n $(nproc) --dist loadfile
- shard: native_sim_lvgl
boards: native_native_sim_lvgl
pytest_args: tests/ --ignore=tests/bsim -k 'native_native_sim_lvgl and not native_native_sim_lvgl_asan' -n $(nproc) --dist loadfile
- shard: native_sim_lvgl_asan
boards: native_native_sim_lvgl_asan
pytest_args: tests/ --ignore=tests/bsim -k native_native_sim_lvgl_asan -n $(nproc) --dist loadfile
- shard: native_sim_asan
boards: native_native_sim_asan
pytest_args: tests/ --ignore=tests/bsim -k native_native_sim_asan -n $(nproc) --dist loadfile
Expand Down
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -427,3 +427,7 @@
[submodule "ports/espressif/esp-adf-libs"]
path = ports/espressif/esp-adf-libs
url = https://github.com/espressif/esp-adf-libs.git
[submodule "lib/lvgl"]
path = lib/lvgl
url = https://github.com/adafruit/lvgl.git
branch = circuitpython-v9.6
1 change: 1 addition & 0 deletions lib/lvgl
Submodule lvgl added at c99ebe
143 changes: 100 additions & 43 deletions locale/circuitpython.pot
Original file line number Diff line number Diff line change
Expand Up @@ -837,9 +837,9 @@ msgid "soft reboot\n"
msgstr ""

#: ports/analog/common-hal/busio/SPI.c ports/analog/common-hal/busio/UART.c
#: ports/stm/common-hal/audioio/AudioOut.c
#: ports/cxd56/common-hal/busio/SPI.c ports/stm/common-hal/audioio/AudioOut.c
#: shared-bindings/digitalio/DigitalInOutProtocol.c
#: shared-module/busdisplay/BusDisplay.c shared-module/ssl/SSLContext.c
#: shared-module/displayio/bus_core.c shared-module/ssl/SSLContext.c
msgid "%q init failed"
msgstr ""

Expand Down Expand Up @@ -876,7 +876,7 @@ msgstr ""
msgid "RS485"
msgstr ""

#: ports/analog/common-hal/busio/UART.c
#: ports/analog/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c
msgid "UART needs TX & RX"
msgstr ""

Expand Down Expand Up @@ -967,6 +967,7 @@ msgstr ""
#: ports/nordic/common-hal/pulseio/PulseIn.c
#: ports/nordic/peripherals/nrf/timers.c
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
#: ports/stm/common-hal/pulseio/PulseOut.c
msgid "All timers in use"
msgstr ""

Expand Down Expand Up @@ -1026,6 +1027,7 @@ msgid "Too many channels in sample"
msgstr ""

#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
#: ports/raspberrypi/common-hal/audiobusio/I2SOut.c
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
Expand Down Expand Up @@ -1214,6 +1216,9 @@ msgstr ""
#: ports/cxd56/common-hal/camera/Camera.c
#: ports/espressif/common-hal/jpegio/JpegDecoder.c
#: shared-module/audiocore/WaveFile.c
#: shared-module/busdisplay/lvgl/BusDisplay.c
#: shared-module/displayio/lvgl/TileGrid.c
#: shared-module/framebufferio/lvgl/FramebufferDisplay.c
msgid "Format not supported"
msgstr ""

Expand Down Expand Up @@ -1689,6 +1694,8 @@ msgstr ""
#: ports/espressif/common-hal/espidf/__init__.c
#: ports/espressif/common-hal/jpegio/JpegDecoder.c
#: ports/raspberrypi/common-hal/usb_host_bulk/InStream.c
#: shared-bindings/busdisplay/BusDisplay.c
#: shared-bindings/framebufferio/FramebufferDisplay.c
#: shared-bindings/picogame/Canvas.c shared-bindings/picogame/__init__.c
#: shared-module/jpegio/JpegDecoder.c shared-module/picogame/Display.c
msgid "Operation or feature not supported"
Expand Down Expand Up @@ -1935,7 +1942,8 @@ msgid "Must provide MISO or MOSI pin"
msgstr ""

#: ports/mimxrt10xx/common-hal/busio/SPI.c
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/I2C.c
#: ports/mimxrt10xx/common-hal/busio/UART.c
#: ports/mimxrt10xx/common-hal/canio/CAN.c ports/stm/common-hal/busio/I2C.c
#: ports/stm/common-hal/busio/SPI.c ports/stm/common-hal/busio/UART.c
#: ports/stm/common-hal/canio/CAN.c ports/stm/common-hal/sdioio/SDCard.c
#: shared-bindings/emmcio/EMMC.c
Expand Down Expand Up @@ -2043,8 +2051,8 @@ msgstr ""
#: shared-bindings/bitmapfilter/__init__.c shared-bindings/canio/CAN.c
#: shared-bindings/digitalio/Pull.c shared-bindings/picogame/Sprite.c
#: shared-bindings/supervisor/__init__.c shared-module/audiofilters/__init__.c
#: shared-module/displayio/__init__.c shared-module/synthio/Synthesizer.c
#: shared-module/videocore/VideoBuffer.c
#: shared-module/displayio/legacy/__init__.c
#: shared-module/synthio/Synthesizer.c shared-module/videocore/VideoBuffer.c
msgid "%q must be of type %q or %q, not %q"
msgstr ""

Expand Down Expand Up @@ -2185,10 +2193,6 @@ msgstr ""
msgid "Invalid %q and %q"
msgstr ""

#: ports/raspberrypi/common-hal/mdns/Server.c
msgid "Failed to add service TXT record"
msgstr ""

#: ports/raspberrypi/common-hal/mdns/Server.c
msgid "Out of MDNS service slots"
msgstr ""
Expand Down Expand Up @@ -2452,6 +2456,14 @@ msgstr ""
msgid "SDIO GetCardInfo Error %d"
msgstr ""

#: ports/zephyr-cp/bindings/zephyr_display/Display.c
#: shared-bindings/busdisplay/BusDisplay.c
#: shared-bindings/epaperdisplay/EPaperDisplay.c
#: shared-bindings/framebufferio/FramebufferDisplay.c
#: shared-bindings/mipidsi/Display.c
msgid "Display rotation must be in 90 degree increments"
msgstr ""

#: ports/zephyr-cp/bindings/zephyr_display/Display.c
#: shared-bindings/busdisplay/BusDisplay.c
#: shared-bindings/epaperdisplay/EPaperDisplay.c
Expand All @@ -2475,8 +2487,9 @@ msgstr ""

#: ports/zephyr-cp/bindings/zephyr_display/Display.c
#: shared-bindings/framebufferio/FramebufferDisplay.c
#: shared-module/busdisplay/BusDisplay.c
#: shared-module/framebufferio/FramebufferDisplay.c
#: shared-module/busdisplay/legacy/BusDisplay.c
#: shared-module/framebufferio/legacy/FramebufferDisplay.c
#: shared-module/framebufferio/lvgl/FramebufferDisplay.c
msgid "Group already used"
msgstr ""

Expand Down Expand Up @@ -2507,9 +2520,11 @@ msgstr ""
msgid "Failed to set hostname"
msgstr ""

#: ports/zephyr-cp/common-hal/zephyr_display/Display.c
#: shared-module/busdisplay/BusDisplay.c
#: shared-module/framebufferio/FramebufferDisplay.c
#: ports/zephyr-cp/common-hal/zephyr_display/legacy/Display.c
#: ports/zephyr-cp/common-hal/zephyr_display/lvgl/Display.c
#: shared-module/busdisplay/legacy/BusDisplay.c
#: shared-module/framebufferio/legacy/FramebufferDisplay.c
#: shared-module/framebufferio/lvgl/FramebufferDisplay.c
msgid "Below minimum frame rate"
msgstr ""

Expand Down Expand Up @@ -3908,7 +3923,9 @@ msgstr ""
#: shared-bindings/_bleio/__init__.c shared-bindings/emmcio/EMMC.c
#: shared-bindings/memorymonitor/AllocationSize.c
#: shared-bindings/pulseio/PulseIn.c shared-module/bitmaptools/__init__.c
#: shared-module/displayio/Bitmap.c shared-module/displayio/Group.c
#: shared-module/displayio/legacy/Bitmap.c
#: shared-module/displayio/legacy/Group.c shared-module/displayio/lvgl/Bitmap.c
#: shared-module/displayio/lvgl/Group.c
msgid "Read-only"
msgstr ""

Expand Down Expand Up @@ -4170,13 +4187,6 @@ msgstr ""
msgid "No default %q bus"
msgstr ""

#: shared-bindings/busdisplay/BusDisplay.c
#: shared-bindings/epaperdisplay/EPaperDisplay.c
#: shared-bindings/framebufferio/FramebufferDisplay.c
#: shared-bindings/mipidsi/Display.c
msgid "Display rotation must be in 90 degree increments"
msgstr ""

#: shared-bindings/busdisplay/BusDisplay.c
msgid "%q must be 1 when %q is True"
msgstr ""
Expand Down Expand Up @@ -4284,7 +4294,8 @@ msgstr ""

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

Expand Down Expand Up @@ -4341,6 +4352,10 @@ msgstr ""
msgid "Scale dimensions must divide by 3"
msgstr ""

#: shared-bindings/is31fl3741/FrameBuffer.c
msgid "LED mappings must match display size"
msgstr ""

#: shared-bindings/is31fl3741/IS31FL3741.c
msgid "Mapping must be a tuple"
msgstr ""
Expand Down Expand Up @@ -4583,50 +4598,92 @@ msgstr ""
msgid "unsupported bitmap depth"
msgstr ""

#: shared-module/busdisplay/lvgl/BusDisplay.c
#: shared-module/framebufferio/lvgl/FramebufferDisplay.c
msgid "LVGL display create failed"
msgstr ""

#: shared-module/busdisplay/lvgl/BusDisplay.c
#: shared-module/framebufferio/lvgl/FramebufferDisplay.c
msgid "LVGL buffer alloc failed"
msgstr ""

#: shared-module/cryptography/hazmat/primitives/asymmetric/rsa/DigitalSignatureKey.c
msgid "OAEP requires this build to enable TLS 1.3 support"
msgstr ""

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

#: shared-module/displayio/legacy/Bitmap.c
#: shared-module/displayio/lvgl/Bitmap.c
msgid "Invalid bits per value"
msgstr ""

#: shared-module/displayio/ColorConverter.c
#: shared-module/displayio/legacy/ColorConverter.c
#: shared-module/displayio/lvgl/ColorConverter.c
msgid "Only one color can be transparent at a time"
msgstr ""

#: shared-module/displayio/Group.c
#: shared-module/displayio/legacy/Group.c shared-module/displayio/lvgl/Group.c
msgid "Layer already in a group"
msgstr ""

#: shared-module/displayio/Group.c
#: shared-module/displayio/legacy/Group.c
msgid "Layer must be a Group or TileGrid subclass"
msgstr ""

#: shared-module/displayio/OnDiskBitmap.c
#: shared-module/displayio/legacy/OnDiskBitmap.c
#: shared-module/displayio/lvgl/OnDiskBitmap.c
#, c-format
msgid ""
"Only Windows format, uncompressed BMP supported: given header size is %d"
msgstr ""

#: shared-module/displayio/OnDiskBitmap.c
#: shared-module/displayio/legacy/OnDiskBitmap.c
#: shared-module/displayio/lvgl/OnDiskBitmap.c
msgid "RLE-compressed BMP not supported"
msgstr ""

#: shared-module/displayio/OnDiskBitmap.c
#: shared-module/displayio/legacy/OnDiskBitmap.c
#: shared-module/displayio/lvgl/OnDiskBitmap.c
msgid "Unable to read color palette data"
msgstr ""

#: shared-module/displayio/__init__.c
#: shared-module/displayio/legacy/__init__.c
msgid "Too many displays"
msgstr ""

#: shared-module/displayio/__init__.c
#: shared-module/displayio/legacy/__init__.c
msgid "Too many display busses; forgot displayio.release_displays() ?"
msgstr ""

#: shared-module/displayio/bus_core.c
msgid "Unsupported display bus type"
#: shared-module/displayio/lvgl/Group.c
msgid "Layer does not support scaling"
msgstr ""

#: shared-module/displayio/lvgl/Group.c
msgid "Layer must be a Group, TileGrid, vector shape or VideoBuffer"
msgstr ""

#: shared-module/displayio/lvgl/TileGrid.c
msgid "LVGL displayio backend does not support flips/transpose yet"
msgstr ""

#: shared-module/displayio/lvgl/TileGrid.c
msgid "OnDiskBitmap requires its own pixel_shader"
msgstr ""

#: shared-module/framebufferio/lvgl/FramebufferDisplay.c
msgid "LVGL dirty row alloc failed"
msgstr ""

#: shared-module/framebufferio/lvgl/FramebufferDisplay.c
#: shared-module/videocore/VideoBuffer.c
#: shared-module/videocore/legacy/VideoBuffer.c
#: shared-module/videocore/lvgl/VideoBuffer.c
msgid "VideoBuffer can't stream into a rotated display"
msgstr ""

#: shared-module/gifio/GifWriter.c
Expand Down Expand Up @@ -4655,10 +4712,6 @@ msgstr ""
msgid "This microcontroller does not support continuous capture."
msgstr ""

#: shared-module/is31fl3741/FrameBuffer.c
msgid "LED mappings must match display size"
msgstr ""

#: shared-module/jpegio/JpegDecoder.c
msgid "Interrupted by output function"
msgstr ""
Expand Down Expand Up @@ -4875,15 +4928,15 @@ msgid "video size changed since play; stop and play again"
msgstr ""

#: shared-module/videocore/VideoBuffer.c
msgid "VideoBuffer can't stream into a rotated display"
msgid "VideoBuffer is playing into a different framebuffer"
msgstr ""

#: shared-module/videocore/VideoBuffer.c
#: shared-module/videocore/legacy/VideoBuffer.c
msgid "VideoBuffer does not support transforms"
msgstr ""

#: shared-module/videocore/VideoBuffer.c
msgid "VideoBuffer is playing into a different framebuffer"
#: shared-module/videocore/lvgl/VideoBuffer.c
msgid "video format must be 16, 24 or 32 bits per pixel"
msgstr ""

#: supervisor/shared/bluetooth/bluetooth.c
Expand Down Expand Up @@ -4972,6 +5025,10 @@ msgstr ""
msgid "Interrupt error."
msgstr ""

#: supervisor/shared/safe_mode.c
msgid "LVGL ran out of memory."
msgstr ""

#: supervisor/shared/safe_mode.c
msgid "NLR jump failed. Likely memory corruption."
msgstr ""
Expand Down
1 change: 1 addition & 0 deletions ports/espressif/AGENTS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Source esp-idf/export.sh before running make.
3 changes: 2 additions & 1 deletion ports/espressif/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set(ENV{IDF_PATH} ${CMAKE_SOURCE_DIR}/esp-idf)
# Core components
set(COMPONENTS bt driver esptool_py freertos log main mbedtls pthread soc)
# Peripheral drivers
list(APPEND COMPONENTS esp_driver_dac esp_driver_gpio esp_driver_gptimer esp_driver_i2c esp_driver_i2s esp_driver_jpeg esp_driver_ledc esp_driver_pcnt esp_driver_rmt esp_driver_sdmmc esp_driver_spi esp_driver_touch_sens esp_driver_tsens esp_driver_uart)
list(APPEND COMPONENTS esp_driver_dac esp_driver_gpio esp_driver_gptimer esp_driver_i2c esp_driver_i2s esp_driver_jpeg esp_driver_ledc esp_driver_pcnt esp_driver_ppa esp_driver_rmt esp_driver_sdmmc esp_driver_spi esp_driver_touch_sens esp_driver_tsens esp_driver_uart)
# Networking
list(APPEND COMPONENTS esp_eth esp-tls esp_event esp_netif esp_wifi lwip mdns wpa_supplicant)
# Misc
Expand All @@ -22,6 +22,7 @@ if(CIRCUITPY_MIPICSI)
endif()

set(EXTRA_COMPONENT_DIRS "esp-protocols/components/mdns" "esp-camera")
set(EXTRA_COMPONENT_DIRS "${EXTRA_COMPONENT_DIRS}" "${CMAKE_SOURCE_DIR}/../../lib/lvgl")

if(CIRCUITPY_ESP_HOSTED)
list(APPEND EXTRA_COMPONENT_DIRS "esp-hosted")
Expand Down
Loading
Loading