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

Enabled 2 mesh viewers #26181

Open
wants to merge 80 commits into
base: bugfix-2.1.x
Choose a base branch
from
Open

Enabled 2 mesh viewers #26181

wants to merge 80 commits into from

Commits on Aug 17, 2023

  1. fix gcode preview

    @classicrocker883
    classicrocker883 committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    47bfe07 View commit details
    Browse the repository at this point in the history

  2. add 2nd mesh viewer option

    @classicrocker883
    classicrocker883 committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    8c2f232 View commit details
    Browse the repository at this point in the history

  3. add missing env to pins.h (CREALITY_V4)

    @classicrocker883
    classicrocker883 committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    8a67bfc View commit details
    Browse the repository at this point in the history

  4. optimize cardreader.h - OPTARG

    @classicrocker883
    classicrocker883 committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    c725f0e View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2023

  1. Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin… 

    … into bugfix-2.1.x-redo
    @classicrocker883
    classicrocker883 committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    1929c2e View commit details
    Browse the repository at this point in the history

  2. Update Conditionals_post.h

    @classicrocker883
    classicrocker883 authored Aug 18, 2023
    Configuration menu
    Copy the full SHA
    884027a View commit details
    Browse the repository at this point in the history

  3. use has_mesh

    @thinkyhead
    thinkyhead committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    c94f04b View commit details
    Browse the repository at this point in the history

  4. translatable

    @thinkyhead
    thinkyhead committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    aece6f5 View commit details
    Browse the repository at this point in the history

  5. format

    @thinkyhead
    thinkyhead committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    77fdb58 View commit details
    Browse the repository at this point in the history

  6. Mesh without mesh viewer

    @thinkyhead
    thinkyhead committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    699c598 View commit details
    Browse the repository at this point in the history

  7. tweak drawing

    @thinkyhead
    thinkyhead committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    270122e View commit details
    Browse the repository at this point in the history

  8. tweak alert print

    @thinkyhead
    thinkyhead committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    e813b70 View commit details
    Browse the repository at this point in the history

  9. viewer_asymmetric_range still referenced

    @thinkyhead
    thinkyhead committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    5a5f4bd View commit details
    Browse the repository at this point in the history

  10. better for intellisense

    @thinkyhead
    thinkyhead committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    a882d17 View commit details
    Browse the repository at this point in the history

  11. optional level

    @thinkyhead
    thinkyhead committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    dc9ac72 View commit details
    Browse the repository at this point in the history

  12. tweak print

    @thinkyhead
    thinkyhead committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    e00b3e5 View commit details
    Browse the repository at this point in the history

  13. cleanup

    @thinkyhead
    thinkyhead committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    6cc92cc View commit details
    Browse the repository at this point in the history

  14. no more viewer_asymmetric_range ?

    @thinkyhead
    thinkyhead committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    bcba732 View commit details
    Browse the repository at this point in the history

  15. string update

    @thinkyhead
    thinkyhead committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    77ccf54 View commit details
    Browse the repository at this point in the history

  16. misc. cleanup

    @thinkyhead
    thinkyhead committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    e9f7742 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2023

  1. revert gcode_preview.cpp

    @classicrocker883
    classicrocker883 authored Aug 19, 2023
    Configuration menu
    Copy the full SHA
    e22e9cc View commit details
    Browse the repository at this point in the history

  2. revert gcode_preview.cpp

    @classicrocker883
    classicrocker883 authored Aug 19, 2023
    Configuration menu
    Copy the full SHA
    bbc91e0 View commit details
    Browse the repository at this point in the history

  3. revert gcode_preview.cpp

    @classicrocker883
    classicrocker883 authored Aug 19, 2023
    Configuration menu
    Copy the full SHA
    6a3c9cf View commit details
    Browse the repository at this point in the history

  4. revert gcode_preview.h

    @classicrocker883
    classicrocker883 authored Aug 19, 2023
    Configuration menu
    Copy the full SHA
    98ae726 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'bugfix-2.1.x' into pr/26181

    @thinkyhead
    thinkyhead committed Aug 19, 2023
    Configuration menu
    Copy the full SHA
    6764626 View commit details
    Browse the repository at this point in the history

  6. tweak style

    @thinkyhead
    thinkyhead committed Aug 19, 2023
    Configuration menu
    Copy the full SHA
    3ee47a2 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2023

  1. exit avrdude.conf - optimize spacing

    @classicrocker883
    classicrocker883 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    8e741cc View commit details
    Browse the repository at this point in the history

  2. renamed to "Normal Mesh Viewer"

    @classicrocker883
    classicrocker883 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    93c66eb View commit details
    Browse the repository at this point in the history

  3. small tweaks

    @classicrocker883
    classicrocker883 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    a0557c5 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin… 

    … into bugfix-2.1.x-redo
    @classicrocker883
    classicrocker883 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    7bec91e View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2023

  1. Merge branch 'bugfix-2.1.x' into bugfix-2.1.x-redo

    @classicrocker883
    classicrocker883 committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    100bb82 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2023

  1. typo in config_adv.h

    @classicrocker883
    classicrocker883 committed Sep 3, 2023
    Configuration menu
    Copy the full SHA
    98fd495 View commit details
    Browse the repository at this point in the history

  2. rename to MSG_CHANGE_MESH - add language support

    @classicrocker883
    classicrocker883 committed Sep 3, 2023
    Configuration menu
    Copy the full SHA
    675061b View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2023

  1. had issue with "floating" Flow%, this a good fix??

    @classicrocker883
    classicrocker883 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    ebceff1 View commit details
    Browse the repository at this point in the history

  2. remove/replace MSG_UBL_LEVEL_BED

    @classicrocker883
    classicrocker883 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    17fb167 View commit details
    Browse the repository at this point in the history

  3. enum Buttons

    @classicrocker883
    classicrocker883 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    58e7eff View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2023

  1. should be "purge_length", not "extrude_length"

    @classicrocker883
    classicrocker883 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    fecab96 View commit details
    Browse the repository at this point in the history

  2. fix for HAS_MARLINUI_MENU unsigned int (Flow%)

    @classicrocker883
    classicrocker883 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    5af8197 View commit details
    Browse the repository at this point in the history

  3. test

    @classicrocker883
    classicrocker883 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    3335b0c View commit details
    Browse the repository at this point in the history

  4. fix for HAS_MARLINUI_MENU unsigned int (Flow%)

    @classicrocker883
    classicrocker883 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    020a22d View commit details
    Browse the repository at this point in the history

  5. Merge branch 'bugfix-2.1.x-redo' of https://github.com/classicrocker8… 

    …83/Marlin into bugfix-2.1.x-redo
    @classicrocker883
    classicrocker883 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    6451b2a View commit details
    Browse the repository at this point in the history

  6. revert test

    @classicrocker883
    classicrocker883 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    73e46a7 View commit details
    Browse the repository at this point in the history

  7. revert flow_percentage (needs more research)

    @classicrocker883
    classicrocker883 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    4c51e4d View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2023

  1. revert Buttons 

    as to not cause any issues w/ proui lib
    @classicrocker883
    classicrocker883 authored Oct 27, 2023
    Configuration menu
    Copy the full SHA
    9275010 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2023

  1. Merge branch 'MarlinFirmware:bugfix-2.1.x' into bugfix-2.1.x-redo

    @classicrocker883
    classicrocker883 authored Nov 18, 2023
    Configuration menu
    Copy the full SHA
    8012d70 View commit details
    Browse the repository at this point in the history

  2. revert language_xx.h, MSG_UBL_LEVEL_BED 

    to be used with another (more recent) PR
    @classicrocker883
    classicrocker883 committed Nov 18, 2023
    Configuration menu
    Copy the full SHA
    2c7b4a0 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'bugfix-2.1.x-redo' of https://github.com/classicrocker8… 

    …83/Marlin into bugfix-2.1.x-redo
    @classicrocker883
    classicrocker883 committed Nov 18, 2023
    Configuration menu
    Copy the full SHA
    671bc8c View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2023

  1. Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin… 

    … into bugfix-2.1.x-redo
    @classicrocker883
    classicrocker883 committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    595f5a1 View commit details
    Browse the repository at this point in the history

  2. fix USE_GRID_MESHVIEWER bedlevelTools 

    SanityChecks for having ProUI only
    @classicrocker883
    classicrocker883 committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    67158da View commit details
    Browse the repository at this point in the history

  3. forgot #endif 

    in Conditionals_post.h
    @classicrocker883
    classicrocker883 committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    4242ca1 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. Update language_en.h, add MSG_CHANGE_MESH

    @classicrocker883
    classicrocker883 authored Dec 4, 2023
    Configuration menu
    Copy the full SHA
    4b76ed7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin… 

    … into bugfix-2.1.x-redo
    @classicrocker883
    classicrocker883 committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    c21eacc View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2023

  1. Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin… 

    … into bugfix-2.1.x-redo
    @classicrocker883
    classicrocker883 committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    c8a1534 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2024

  1. Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin… 

    … into bugfix-2.1.x-redo
    @classicrocker883
    classicrocker883 committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    996fe86 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2024

  1. Merge https://github.com/MarlinFirmware/Marlin into bugfix-2.1.x-redo

    @classicrocker883
    classicrocker883 committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    d677952 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2024

  1. Update bedlevel_tools.cpp, fix error

    @classicrocker883
    classicrocker883 authored Jan 6, 2024
    Configuration menu
    Copy the full SHA
    44705e1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin… 

    … into bugfix-2.1.x-redo
    @classicrocker883
    classicrocker883 committed Jan 6, 2024
    Configuration menu
    Copy the full SHA
    a496bae View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2024

  1. change to !

    @classicrocker883
    classicrocker883 committed Jan 7, 2024
    Configuration menu
    Copy the full SHA
    47d34fa View commit details
    Browse the repository at this point in the history

  2. revert - transfer various to Various small fixes PR

    @classicrocker883
    classicrocker883 committed Jan 7, 2024
    Configuration menu
    Copy the full SHA
    b59769d View commit details
    Browse the repository at this point in the history

  3. temp fix for error (read TODO:)

    @classicrocker883
    classicrocker883 committed Jan 7, 2024
    Configuration menu
    Copy the full SHA
    d0abcd5 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2024

  1. Merge remote-tracking branch 'upstream/bugfix-2.1.x' into bugfix-2.1.… 

    …x-redo
    @classicrocker883
    classicrocker883 committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    de66cd9 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2024

  1. Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin… 

    … into bugfix-2.1.x-redo
    @classicrocker883
    classicrocker883 committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    bf55c79 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2024

  1. Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin… 

    … into bugfix-2.1.x-redo
    @classicrocker883
    classicrocker883 committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    056af4a View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2024

  1. Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin… 

    … into bugfix-2.1.x-redo
    @classicrocker883
    classicrocker883 committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    e2e2a6c View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2024

  1. Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin… 

    … into bugfix-2.1.x-redo
    @classicrocker883
    classicrocker883 committed Jan 21, 2024
    Configuration menu
    Copy the full SHA
    b07ce9b View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2024

  1. Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin… 

    … into bugfix-2.1.x-redo
    @classicrocker883
    classicrocker883 committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    6015ca0 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2024

  1. Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin… 

    … into bugfix-2.1.x-redo
    @classicrocker883
    classicrocker883 committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    13337ec View commit details
    Browse the repository at this point in the history

  2. Update Conditionals_post.h define meshviewer

    @classicrocker883
    classicrocker883 authored Feb 22, 2024
    Configuration menu
    Copy the full SHA
    3625019 View commit details
    Browse the repository at this point in the history

  3. Update dwin.cpp ALL()

    @classicrocker883
    classicrocker883 authored Feb 22, 2024
    Configuration menu
    Copy the full SHA
    dc8c0b0 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin… 

    … into bugfix-2.1.x-redo
    @classicrocker883
    classicrocker883 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    bff5153 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2024

  1. Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin… 

    … into bugfix-2.1.x-redo
    @classicrocker883
    classicrocker883 committed Apr 6, 2024
    Configuration menu
    Copy the full SHA
    7d8c400 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2024

  1. Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin… 

    … into bugfix-2.1.x-redo
    @classicrocker883
    classicrocker883 committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    8fb56e3 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin… 

    … into bugfix-2.1.x-redo
    @classicrocker883
    classicrocker883 committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    bdfda6d View commit details
    Browse the repository at this point in the history

  2. remove characters causing issue with make format-pins

    @classicrocker883
    classicrocker883 committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    6975a53 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2024

  1. Merge branch 'MarlinFirmware:bugfix-2.1.x' into bugfix-2.1.x-redo

    @classicrocker883
    classicrocker883 authored Apr 25, 2024
    Configuration menu
    Copy the full SHA
    6f4c7bc View commit details
    Browse the repository at this point in the history

Commits on May 29, 2024

  1. Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin… 

    … into bugfix-2.1.x-redo
    @classicrocker883
    classicrocker883 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    96819d2 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. Merge https://github.com/MarlinFirmware/Marlin into bugfix-2.1.x-redo

    @classicrocker883
    classicrocker883 committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    9b81b2f View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2024

  1. Merge https://github.com/MarlinFirmware/Marlin into bugfix-2.1.x-redo

    @classicrocker883
    classicrocker883 committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    2d30a57 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2024

  1. Merge branch 'bugfix-2.1.x' into bugfix-2.1.x-redo

    @classicrocker883
    classicrocker883 authored Aug 17, 2024
    Configuration menu
    Copy the full SHA
    ba743c3 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2024

  1. Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin… 

    … into bugfix-2.1.x-redo
    @classicrocker883
    classicrocker883 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    b10e1a8 View commit details
    Browse the repository at this point in the history