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

LASER improvements #15335

Merged
merged 60 commits into from
Apr 3, 2020
Merged

LASER improvements #15335

merged 60 commits into from
Apr 3, 2020

Commits on Nov 24, 2019

  1. Improved laser control

    @jediminer543 @thinkyhead
    jediminer543 authored and thinkyhead committed Nov 24, 2019
    Configuration menu
    Copy the full SHA
    0dd0cfe View commit details
    Browse the repository at this point in the history

  2. Various tweaks & adjustments

    @thinkyhead
    thinkyhead committed Nov 24, 2019
    Configuration menu
    Copy the full SHA
    3702347 View commit details
    Browse the repository at this point in the history

  3. Add isOn, adjustable power while OFF

    @shitcreek @thinkyhead
    shitcreek authored and thinkyhead committed Nov 24, 2019
    Configuration menu
    Copy the full SHA
    962ddce View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2019

  1. laser tweaks

    @thinkyhead
    thinkyhead committed Nov 25, 2019
    Configuration menu
    Copy the full SHA
    b697d01 View commit details
    Browse the repository at this point in the history

  2. Fix cutter/planner circular dependency

    @thinkyhead
    thinkyhead committed Nov 25, 2019
    Configuration menu
    Copy the full SHA
    68c808a View commit details
    Browse the repository at this point in the history

  3. Use enabled() in apply_power

    @thinkyhead
    thinkyhead committed Nov 25, 2019
    Configuration menu
    Copy the full SHA
    ed86baf View commit details
    Browse the repository at this point in the history

  4. Bring back cutter.refresh()

    @thinkyhead
    thinkyhead committed Nov 25, 2019
    Configuration menu
    Copy the full SHA
    d6f633d View commit details
    Browse the repository at this point in the history

  5. Remove update_output refs

    @thinkyhead
    thinkyhead committed Nov 25, 2019
    Configuration menu
    Copy the full SHA
    f1e767c View commit details
    Browse the repository at this point in the history

  6. MENU_BACK is now BACK_ITEM

    @shitcreek
    shitcreek authored Nov 25, 2019
    Configuration menu
    Copy the full SHA
    5906e1c View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2019

  1. Update spindle_laser.h

    @thinkyhead
    thinkyhead authored Nov 27, 2019
    Configuration menu
    Copy the full SHA
    caa0d1e View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2019

  1. Add comments, use SPINDLE_LASER_PWM_OFF

    @thinkyhead
    thinkyhead committed Nov 29, 2019
    Configuration menu
    Copy the full SHA
    186bb02 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2019

  1. missing closing parenthesis

    @shitcreek
    shitcreek authored Nov 30, 2019
    Configuration menu
    Copy the full SHA
    7e6b76d View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2019

  1. correct lcd menu laser off 

    additionally, laser control set value no longer resets to zero.
    @shitcreek
    shitcreek authored Dec 2, 2019
    Configuration menu
    Copy the full SHA
    538a78a View commit details
    Browse the repository at this point in the history

  2. add 'setPower'

    @shitcreek
    shitcreek authored Dec 2, 2019
    Configuration menu
    Copy the full SHA
    6ccc62c View commit details
    Browse the repository at this point in the history

  3. change 'cutter.power' to 'cutter.setPower'

    @shitcreek
    shitcreek authored Dec 2, 2019
    Configuration menu
    Copy the full SHA
    8a3e079 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2019

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

    @thinkyhead
    thinkyhead authored Dec 3, 2019
    Configuration menu
    Copy the full SHA
    c595aea View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2019

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

    …laser_15335
    @thinkyhead
    thinkyhead committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    57716c3 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2019

  1. Nest Laser Controls inside LCD MENU condition+ 

    Rename `setPower` to `menuLaserPower`, and nest lcd controls inside condition. And remove duplicate define of `powerPercent`.
    @shitcreek
    shitcreek authored Dec 8, 2019
    Configuration menu
    Copy the full SHA
    3f0c48c View commit details
    Browse the repository at this point in the history

  2. Change setPower to menuLaserPower 

    And nest inside LCD Menu condition
    @shitcreek
    shitcreek authored Dec 8, 2019
    Configuration menu
    Copy the full SHA
    3fa8e88 View commit details
    Browse the repository at this point in the history

  3. Change setpower to menuLaserPower

    @shitcreek
    shitcreek authored Dec 8, 2019
    Configuration menu
    Copy the full SHA
    0a326b4 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2020

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

    …laser_15335
    @thinkyhead
    thinkyhead committed Feb 1, 2020
    Configuration menu
    Copy the full SHA
    2d14900 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'jediminer543/bugfix-2.0.x' into bf2_bet… 

    …ter_laser_15335
    @thinkyhead
    thinkyhead committed Feb 1, 2020
    Configuration menu
    Copy the full SHA
    dcc7f3f View commit details
    Browse the repository at this point in the history

  3. Update stepper.cpp

    @thinkyhead
    thinkyhead committed Feb 1, 2020
    Configuration menu
    Copy the full SHA
    d528744 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2020

  1. Rename HAL flag

    @thinkyhead
    thinkyhead committed Feb 2, 2020
    Configuration menu
    Copy the full SHA
    e62d26b View commit details
    Browse the repository at this point in the history

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

    …laser_15335
    @thinkyhead
    thinkyhead committed Feb 2, 2020
    Configuration menu
    Copy the full SHA
    1aba250 View commit details
    Browse the repository at this point in the history

  3. Delete Configuration_adv.h

    @thinkyhead
    thinkyhead committed Feb 2, 2020
    Configuration menu
    Copy the full SHA
    e5df900 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2020

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

    …laser_15335
    @thinkyhead
    thinkyhead committed Feb 5, 2020
    Configuration menu
    Copy the full SHA
    fdfb90d View commit details
    Browse the repository at this point in the history

  2. Set cutter power in gcode.cpp

    @thinkyhead
    thinkyhead committed Feb 5, 2020
    Configuration menu
    Copy the full SHA
    f3e4e2f View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2020

  1. mods to laser/spindle feature 

    add ability to S value in PWM, percentage or RPM
also applies to LCD status display and control

add set frequency menu option for Marlin Dev Mode
    @shitcreek
    shitcreek committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    f6ac9dd View commit details
    Browse the repository at this point in the history

  2. add laser/spindle mods to configuration_adv

    @shitcreek
    shitcreek committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    aabe066 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2020

  1. Improved laser control

    @jediminer543 @shitcreek
    jediminer543 authored and shitcreek committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    1bd3748 View commit details
    Browse the repository at this point in the history

  2. Various tweaks & adjustments

    @thinkyhead @shitcreek
    thinkyhead authored and shitcreek committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    89cbcc8 View commit details
    Browse the repository at this point in the history

  3. Add isOn, adjustable power while OFF

    @shitcreek
    shitcreek committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    d7e86d3 View commit details
    Browse the repository at this point in the history

  4. laser tweaks

    @thinkyhead @shitcreek
    thinkyhead authored and shitcreek committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    1698b5a View commit details
    Browse the repository at this point in the history

  5. Fix cutter/planner circular dependency

    @thinkyhead @shitcreek
    thinkyhead authored and shitcreek committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    edbc66b View commit details
    Browse the repository at this point in the history

  6. Use enabled() in apply_power

    @thinkyhead @shitcreek
    thinkyhead authored and shitcreek committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    7e84930 View commit details
    Browse the repository at this point in the history

  7. Bring back cutter.refresh()

    @thinkyhead @shitcreek
    thinkyhead authored and shitcreek committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    ee73af5 View commit details
    Browse the repository at this point in the history

  8. Remove update_output refs

    @thinkyhead @shitcreek
    thinkyhead authored and shitcreek committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    6ca7bba View commit details
    Browse the repository at this point in the history

  9. MENU_BACK is now BACK_ITEM

    @shitcreek
    shitcreek committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    4b06c2b View commit details
    Browse the repository at this point in the history

  10. Update spindle_laser.h

    @thinkyhead @shitcreek
    thinkyhead authored and shitcreek committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    2975a1d View commit details
    Browse the repository at this point in the history

  11. Add comments, use SPINDLE_LASER_PWM_OFF

    @thinkyhead @shitcreek
    thinkyhead authored and shitcreek committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    e230d2a View commit details
    Browse the repository at this point in the history

  12. missing closing parenthesis

    @shitcreek
    shitcreek committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    b5b5e80 View commit details
    Browse the repository at this point in the history

  13. correct lcd menu laser off 

    additionally, laser control set value no longer resets to zero.
    @shitcreek
    shitcreek committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    70d3329 View commit details
    Browse the repository at this point in the history

  14. add 'setPower'

    @shitcreek
    shitcreek committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    b3e08fa View commit details
    Browse the repository at this point in the history

  15. change 'cutter.power' to 'cutter.setPower'

    @shitcreek
    shitcreek committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    2d4f5e5 View commit details
    Browse the repository at this point in the history

  16. Nest Laser Controls inside LCD MENU condition+ 

    Rename `setPower` to `menuLaserPower`, and nest lcd controls inside condition. And remove duplicate define of `powerPercent`.
    @shitcreek
    shitcreek committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    5bb1685 View commit details
    Browse the repository at this point in the history

  17. Change setPower to menuLaserPower 

    And nest inside LCD Menu condition
    @shitcreek
    shitcreek committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    2654c1b View commit details
    Browse the repository at this point in the history

  18. Change setpower to menuLaserPower

    @shitcreek
    shitcreek committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    3841987 View commit details
    Browse the repository at this point in the history

  19. Update stepper.cpp

    @thinkyhead @shitcreek
    thinkyhead authored and shitcreek committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    dddf94d View commit details
    Browse the repository at this point in the history

  20. Rename HAL flag

    @thinkyhead @shitcreek
    thinkyhead authored and shitcreek committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    37a75dc View commit details
    Browse the repository at this point in the history

  21. Set cutter power in gcode.cpp

    @thinkyhead @shitcreek
    thinkyhead authored and shitcreek committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    9012fe3 View commit details
    Browse the repository at this point in the history

  22. mods to laser/spindle feature 

    add ability to S value in PWM, percentage or RPM
also applies to LCD status display and control

add set frequency menu option for Marlin Dev Mode
    @shitcreek
    shitcreek committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    92ba4bb View commit details
    Browse the repository at this point in the history

  23. add laser/spindle mods to configuration_adv

    @shitcreek
    shitcreek committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    a98d5a8 View commit details
    Browse the repository at this point in the history

  24. Update Configuration_adv.h

    @shitcreek
    shitcreek authored Mar 16, 2020
    Configuration menu
    Copy the full SHA
    ea991c1 View commit details
    Browse the repository at this point in the history

  25. Merge branch 'bugfix-2.0.x' of github.com:jediminer543/Marlin into my… 

    …Laser2
    @shitcreek
    shitcreek committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    63eab2e View commit details
    Browse the repository at this point in the history

  26. remove duplicate calls

    @shitcreek
    shitcreek committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    a382b1c View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2020

  1. Merge branch 'bugfix-2.0.x' of github.com:jediminer543/Marlin into my… 

    …Laser2
    @shitcreek
    shitcreek committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    5182c20 View commit details
    Browse the repository at this point in the history

  2. reset head and add fixes 

    reset head to upstream and added fixes
credit to @cmidgley

also corrected translate_power() to return pwm as is
    @shitcreek
    shitcreek committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    53436b0 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2020

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

    …ackup_15335
    @thinkyhead
    thinkyhead committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    232fc89 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2020

  1. Clean up, fix spacing, etc.

    @thinkyhead
    thinkyhead committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    ead15b5 View commit details
    Browse the repository at this point in the history