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

Fix disordered MKS LVGL UI temperature set interface #22848

Merged
merged 29 commits into from
Sep 27, 2021
Merged

Fix disordered MKS LVGL UI temperature set interface #22848

merged 29 commits into from
Sep 27, 2021

Commits on May 11, 2020

  1. Merge pull request #1 from MarlinFirmware/bugfix-2.0.x 

    Bugfix 2.0.x
    @makerbase-mks
    makerbase-mks authored May 11, 2020
    Configuration menu
    Copy the full SHA
    aa595f5 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2020

  1. Merge pull request #2 from MarlinFirmware/bugfix-2.0.x 

    Bugfix 2.0.x
    @makerbase-mks
    makerbase-mks authored May 13, 2020
    Configuration menu
    Copy the full SHA
    d5d325c View commit details
    Browse the repository at this point in the history

Commits on May 14, 2020

  1. Merge pull request #4 from MarlinFirmware/bugfix-2.0.x 

    Bugfix 2.0.x
    @makerbase-mks
    makerbase-mks authored May 14, 2020
    Configuration menu
    Copy the full SHA
    d8d5c0f View commit details
    Browse the repository at this point in the history

Commits on May 18, 2020

  1. Merge pull request #6 from MarlinFirmware/bugfix-2.0.x 

    Bugfix 2.0.x
    @makerbase-mks
    makerbase-mks authored May 18, 2020
    Configuration menu
    Copy the full SHA
    a1055dd View commit details
    Browse the repository at this point in the history

Commits on May 22, 2020

  1. Merge pull request #7 from MarlinFirmware/bugfix-2.0.x 

    Bugfix 2.0.x
    @makerbase-mks
    makerbase-mks authored May 22, 2020
    Configuration menu
    Copy the full SHA
    8b349b1 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2020

  1. Merge pull request #14 from MarlinFirmware/bugfix-2.0.x 

    Bugfix 2.0.x
    @makerbase-mks
    makerbase-mks authored Jun 27, 2020
    Configuration menu
    Copy the full SHA
    8c42e50 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2020

  1. Merge pull request #15 from MarlinFirmware/bugfix-2.0.x 

    Bugfix 2.0.x
    @makerbase-mks
    makerbase-mks authored Jul 1, 2020
    Configuration menu
    Copy the full SHA
    626ed70 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2020

  1. Merge pull request #16 from MarlinFirmware/bugfix-2.0.x 

    Bugfix 2.0.x
    @MKS-Sean
    MKS-Sean authored Jul 2, 2020
    Configuration menu
    Copy the full SHA
    80a2552 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2021

  1. Merge pull request #54 from MarlinFirmware/bugfix-2.0.x 

    Bugfix 2.0.x
    @MKS-Sean
    MKS-Sean authored Jun 11, 2021
    Configuration menu
    Copy the full SHA
    8386fdf View commit details
    Browse the repository at this point in the history

  2. mks robin nano v3 add function of wifi

    @MKS-Sean
    MKS-Sean committed Jun 11, 2021
    Configuration menu
    Copy the full SHA
    3034d86 View commit details
    Browse the repository at this point in the history

  3. Update irq_overrid.cpp

    @thinkyhead
    thinkyhead authored Jun 11, 2021
    Configuration menu
    Copy the full SHA
    8975478 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2021

  1. Fix the header file path

    @MKS-Sean
    MKS-Sean committed Jun 12, 2021
    Configuration menu
    Copy the full SHA
    5708db5 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2021

  1. Update printer_operation.cpp

    @thinkyhead
    thinkyhead authored Jun 13, 2021
    Configuration menu
    Copy the full SHA
    321a2fa View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2021

  1. split up wifiserial

    @thinkyhead
    thinkyhead committed Jun 14, 2021
    Configuration menu
    Copy the full SHA
    523f2db View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2021

  1. updata

    @solawc
    solawc committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    f86189c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #61 from MarlinFirmware/bugfix-2.0.x 

    Bugfix 2.0.x
    @solawc
    solawc authored Jul 21, 2021
    Configuration menu
    Copy the full SHA
    f2d1f15 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2021

  1. Merge pull request #63 from MarlinFirmware/bugfix-2.0.x 

    Bugfix 2.0.x
    @solawc
    solawc authored Sep 10, 2021
    Configuration menu
    Copy the full SHA
    98bdb52 View commit details
    Browse the repository at this point in the history

  2. change lvgl lcd disp driver

    @solawc
    solawc committed Sep 10, 2021
    Configuration menu
    Copy the full SHA
    976abe9 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2021

  1. fix and add

    @solawc
    solawc committed Sep 16, 2021
    Configuration menu
    Copy the full SHA
    5a8c30b View commit details
    Browse the repository at this point in the history

  2. misc. cleanup

    @thinkyhead
    thinkyhead committed Sep 16, 2021
    Configuration menu
    Copy the full SHA
    88646c2 View commit details
    Browse the repository at this point in the history

  3. MKS UI cosmetic changes

    @thinkyhead
    thinkyhead committed Sep 16, 2021
    Configuration menu
    Copy the full SHA
    46c0e0a View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2021

  1. Merge pull request #64 from MarlinFirmware/bugfix-2.0.x 

    Bugfix 2.0.x
    @solawc
    solawc authored Sep 22, 2021
    Configuration menu
    Copy the full SHA
    09daeb7 View commit details
    Browse the repository at this point in the history

  2. Modify LVGL touch driver

    @solawc
    solawc committed Sep 22, 2021
    Configuration menu
    Copy the full SHA
    49b9451 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2021

  1. clean up, fix typos

    @thinkyhead
    thinkyhead committed Sep 23, 2021
    Configuration menu
    Copy the full SHA
    e7a20ab View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2021

  1. Merge pull request #65 from MarlinFirmware/bugfix-2.0.x 

    Bugfix 2.0.x
    @solawc
    solawc authored Sep 24, 2021
    Configuration menu
    Copy the full SHA
    0f13641 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2021

  1. 修复挤出、热床切换时，出现的图标出错的问题

    @solawc
    solawc committed Sep 27, 2021
    Configuration menu
    Copy the full SHA
    43d3b13 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #66 from MarlinFirmware/bugfix-2.0.x 

    Bugfix 2.0.x
    @solawc
    solawc authored Sep 27, 2021
    Configuration menu
    Copy the full SHA
    5d99eb8 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'bugfix-2.0.x' of https://github.com/makerbase-mks/Marli… 

    …n-2.x.x into bugfix-2.0.x
    @solawc
    solawc committed Sep 27, 2021
    Configuration menu
    Copy the full SHA
    b6a2804 View commit details
    Browse the repository at this point in the history

  4. fix

    @solawc
    solawc committed Sep 27, 2021
    Configuration menu
    Copy the full SHA
    3c2cb1b View commit details
    Browse the repository at this point in the history