Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: espressif/esp-iot-solution
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: espressif/esp-iot-solution
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: release/v1.1
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 7 commits
  • 4 files changed
  • 4 contributors

Commits on Dec 8, 2020

  1. fix(ugfx): modify submodule ugfx url 

    this bug may cause submodule clone failed, existing users should run `git submodule sync` to update the new url

fix #97
    @leeebo
    leeebo committed Dec 8, 2020
    Configuration menu
    Copy the full SHA
    5de44c0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'bugfix/ugfx_url_change_backport_1.1' into 'release/v1.1' 

    fix(ugfx): modify submodule ugfx url

See merge request rd/esp-iot-solution!452
    @esp-lqq
    esp-lqq committed Dec 8, 2020
    Configuration menu
    Copy the full SHA
    263e56c View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2020

  1. bugfix(touchpad): fix each custom callback startup a new freertos timer

    @Invincible-Ultraman
    Invincible-Ultraman committed Dec 14, 2020
    Configuration menu
    Copy the full SHA
    fa5f214 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2020

  1. bugfix(touchpad): remove the unused code

    @Invincible-Ultraman
    Invincible-Ultraman committed Dec 17, 2020
    Configuration menu
    Copy the full SHA
    8814aea View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2021

  1. Merge branch 'bugfix/touchpad' into 'release/v1.1' 

    bugfix(touchpad): fix each custom callback startup a new freertos timer

See merge request rd/esp-iot-solution!459
    @esp-lqq
    esp-lqq committed Jun 28, 2021
    Configuration menu
    Copy the full SHA
    788f98c View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2023

  1. bugfix: fix LittlevGL link in lvgl_wificonfig_en.md 

    Resolve #320
    @gravityrail @Lzw655
    gravityrail authored and Lzw655 committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    1cf0643 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'bugfix/fix_release1.1_lvgl_link' into 'release/v1.1' 

    bugfix: fix LittlevGL link in lvgl_wificonfig_en.md

See merge request ae_group/esp-iot-solution!929
    @leeebo
    leeebo committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    1f8856d View commit details
    Browse the repository at this point in the history
Loading