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 Ammeter display on DOGM #22384

Merged
merged 34 commits into from
Jul 19, 2021
Merged

Fix Ammeter display on DOGM #22384

merged 34 commits into from
Jul 19, 2021

Commits on Dec 12, 2020

  1. Laser percent power 

    Co-Authored-By: Mike La Spina <mike.laspina@shaw.ca>
    @thinkyhead @descipher
    thinkyhead and descipher committed Dec 12, 2020
    Configuration menu
    Copy the full SHA
    ec50d3d View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2020

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

    @descipher
    descipher committed Dec 14, 2020
    Configuration menu
    Copy the full SHA
    98799b5 View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2020

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

    @descipher
    descipher committed Dec 29, 2020
    Configuration menu
    Copy the full SHA
    74367bc View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2021

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

    @descipher
    descipher committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    4a2dab7 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2021

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

    @descipher
    descipher committed Feb 1, 2021
    Configuration menu
    Copy the full SHA
    aa713a1 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2021

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

    @descipher
    descipher committed Feb 2, 2021
    Configuration menu
    Copy the full SHA
    2cc4d48 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2021

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

    @descipher
    descipher committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    8db0a77 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2021

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

    @descipher
    descipher committed Mar 5, 2021
    Configuration menu
    Copy the full SHA
    9dbc82f View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2021

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

    @descipher
    descipher committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    329e211 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2021

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

    @descipher
    descipher committed Mar 16, 2021
    Configuration menu
    Copy the full SHA
    80c48b0 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2021

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

    @descipher
    descipher committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    a9a8bf5 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2021

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

    @descipher
    descipher committed Mar 31, 2021
    Configuration menu
    Copy the full SHA
    245ffde View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2021

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

    @descipher
    descipher committed Apr 5, 2021
    Configuration menu
    Copy the full SHA
    825d057 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2021

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

    @descipher
    descipher committed Apr 6, 2021
    Configuration menu
    Copy the full SHA
    80ded6f View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2021

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

    @descipher
    descipher committed Apr 19, 2021
    Configuration menu
    Copy the full SHA
    d00c06f View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2021

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

    @descipher
    descipher committed Apr 27, 2021
    Configuration menu
    Copy the full SHA
    d9ee4c9 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2021

  1. Merge branch 'MarlinFirmware:bugfix-2.0.x' into bugfix-2.0.x

    @descipher
    descipher committed May 7, 2021
    Configuration menu
    Copy the full SHA
    ecd3c94 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2021

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

    … into bugfix-2.0.x
    @descipher
    descipher committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    a3b165f View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2021

  1. Merge branch 'bugfix-2.0.x' of https://github.com/descipher/Marlin in… 

    …to bugfix-2.0.x
    @descipher
    descipher committed Jun 17, 2021
    Configuration menu
    Copy the full SHA
    a05783e View commit details
    Browse the repository at this point in the history

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

    … into bugfix-2.0.x
    @descipher
    descipher committed Jun 17, 2021
    Configuration menu
    Copy the full SHA
    9e6bd60 View commit details
    Browse the repository at this point in the history

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

    … into bugfix-2.0.x
    @descipher
    descipher committed Jun 17, 2021
    Configuration menu
    Copy the full SHA
    2d72981 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'bugfix-2.0.x' of https://github.com/descipher/Marlin in… 

    …to bugfix-2.0.x
    @descipher
    descipher committed Jun 17, 2021
    Configuration menu
    Copy the full SHA
    5c23756 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2021

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

    … into bugfix-2.0.x
    @descipher
    descipher committed Jun 25, 2021
    Configuration menu
    Copy the full SHA
    bda04df View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2021

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

    … into bugfix-2.0.x
    @descipher
    descipher committed Jun 26, 2021
    Configuration menu
    Copy the full SHA
    1a763c2 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2021

  1. Enable stand alone Flow Meter operation without a display

    @descipher
    descipher committed Jun 27, 2021
    Configuration menu
    Copy the full SHA
    897f53d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'MarlinFirmware:bugfix-2.0.x' into bugfix-2.0.x

    @descipher
    descipher authored Jun 27, 2021
    Configuration menu
    Copy the full SHA
    3521da1 View commit details
    Browse the repository at this point in the history

  3. Keep PWM Default

    @descipher
    descipher committed Jun 27, 2021
    Configuration menu
    Copy the full SHA
    1b9d1fa View commit details
    Browse the repository at this point in the history

  4. Update cooler.h 

    Comment align
    @descipher
    descipher authored Jun 27, 2021
    Configuration menu
    Copy the full SHA
    837edde View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2021

  1. Update temperature.cpp

    @thinkyhead
    thinkyhead authored Jul 9, 2021
    Configuration menu
    Copy the full SHA
    04a92bb View commit details
    Browse the repository at this point in the history

  2. Update cooler.cpp

    @thinkyhead
    thinkyhead authored Jul 9, 2021
    Configuration menu
    Copy the full SHA
    f37346a View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2021

  1. Merge branch 'MarlinFirmware:bugfix-2.0.x' into bugfix-2.0.x

    @descipher
    descipher authored Jul 10, 2021
    Configuration menu
    Copy the full SHA
    e846a90 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2021

  1. Update features.ini

    @thinkyhead
    thinkyhead committed Jul 12, 2021
    Configuration menu
    Copy the full SHA
    a19fb5f View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2021

  1. Merge branch 'MarlinFirmware:bugfix-2.0.x' into bugfix-2.0.x

    @descipher
    descipher authored Jul 18, 2021
    Configuration menu
    Copy the full SHA
    645598f View commit details
    Browse the repository at this point in the history

  2. DOGM include and animation bmp correction

    @descipher
    descipher committed Jul 18, 2021
    Configuration menu
    Copy the full SHA
    958acbf View commit details
    Browse the repository at this point in the history