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.

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

Jump to bottom

Merge master into develop #191

Merged
merged 10 commits into from
Apr 19, 2022
Merged

Merge master into develop #191

merged 10 commits into from
Apr 19, 2022

Commits on Dec 16, 2021

  1. fix spi names

    @tore-espressif
    tore-espressif committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    22ba416 View commit details
    Browse the repository at this point in the history

  2. Merge pull request lvgl#151 from lvgl/fix/spi-names 

    fix spi names
    @tore-espressif
    tore-espressif committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    02d351f View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2021

  1. Revert "fix spi names"

    @tore-espressif
    tore-espressif committed Dec 17, 2021
    Configuration menu
    Copy the full SHA
    d44b7e8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request lvgl#152 from lvgl/revert-151-fix/spi-names 

    Revert "fix spi names"
    @tore-espressif
    tore-espressif committed Dec 17, 2021
    Configuration menu
    Copy the full SHA
    762bb35 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2021

  1. fix SPI names for touch 

    with ESP32-C3 specific auto-dma proper selection
    @arktrin @C47D
    arktrin authored and C47D committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    8cbbc29 View commit details
    Browse the repository at this point in the history

  2. replace hardcoded SPI DMA parameter

    @arktrin @C47D
    arktrin authored and C47D committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    8d1fbcf View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2021

  1. add offset for 240x135 displays based on ST7789

    @arktrin @C47D
    arktrin authored and C47D committed Dec 23, 2021
    Configuration menu
    Copy the full SHA
    c4cd524 View commit details
    Browse the repository at this point in the history

  2. clarify the 52/53 px offset oddity

    @arktrin @C47D
    arktrin authored and C47D committed Dec 23, 2021
    Configuration menu
    Copy the full SHA
    26fe6e7 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2022

  1. Merge branch 'master' into develop 

    Resolving conflicts
    @tore-espressif
    tore-espressif committed Apr 11, 2022
    Configuration menu
    Copy the full SHA
    ef10845 View commit details
    Browse the repository at this point in the history

  2. ci: Update build job to v4.4

    @tore-espressif
    tore-espressif committed Apr 11, 2022
    Configuration menu
    Copy the full SHA
    9fd1634 View commit details
    Browse the repository at this point in the history