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

Add Laser Based I2C Ammeter Feature #21835

Merged
merged 23 commits into from
Jun 7, 2021
Merged

Add Laser Based I2C Ammeter Feature #21835

merged 23 commits into from
Jun 7, 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 May 5, 2021

  1. Add MKS_LCD12864B

    @thinkyhead
    thinkyhead committed May 5, 2021
    Configuration menu
    Copy the full SHA
    5f30e9f View commit details
    Browse the repository at this point in the history

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

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

Commits on May 7, 2021

  1. Add Laser INA226 Ammeter module feature

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

  2. Keep PWM255

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

  3. Merge remote-tracking branch 'upstream/bugfix-2.0.x' into laser.featu… 

    …re.ammeter
    @descipher
    descipher committed May 7, 2021
    Configuration menu
    Copy the full SHA
    fa278e3 View commit details
    Browse the repository at this point in the history

  4. Updates

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

  5. Updates

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

  6. Cleanup and Updates

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