Merge remote-tracking branch 'upstream/edge' into upstream-master
[clinton/Smoothieware.git] / src / modules / tools / laser / Laser.cpp
2015-12-14 Jim MorrisMerge remote-tracking branch 'upstream/edge' into upstr...
2015-11-29 Arthur WolfMerge pull request #749 from justinledwards/patch-1
2015-11-22 erroltMerge remote-tracking branch 'upstream/edge' into edge
2015-11-13 Jim MorrisMerge remote-tracking branch 'upstream/edge' into add...
2015-11-13 Jim MorrisMerge pull request #768 from Smoothieware/refactor...
2015-11-13 Jim MorrisRemove play/pause
2015-09-13 Jim MorrisMerge pull request #730 from wolfmanjm/fix/suspend...
2015-08-23 Arthur WolfMerge pull request #686 from thinkl33t/edge
2015-07-19 Bob CloughUpdated config variables loading code.
2015-07-19 Bob CloughChanges to laser module PWM config.
2015-01-21 Arthur WolfMerge pull request #552 from lautr3k/module/Drills
2015-01-14 Jim Morrisfix comment typo
2014-11-29 Jim MorrisMerge branch 'edge'
2014-11-24 Jim MorrisMerge remote-tracking branch 'upstream/edge' into fix...
2014-11-24 Jim MorrisMerge pull request #549 from PetteriAimonen/edge
2014-11-23 Petteri AimonenAdd hardware_pwm() function to smoothie Pins
2014-11-11 Jim MorrisMerge pull request #546 from Smoothieware/add/z_junctio...
2014-11-09 Jim MorrisMerge pull request #545 from Smoothieware/add/P1.23...
2014-11-03 Jim MorrisMerge remote-tracking branch 'upstream/edge' into featu...
2014-10-31 LogxenAdded P1.24, P1.26, P3.25, and P3.26 to Laser
2014-10-31 Jim Morrisadd P1.18, P1.20, P1.21, P1.23 as laser PWM pins
2014-09-15 Jim MorrisMerge pull request #511 from Smoothieware/edge
2014-09-09 Jim MorrisMerge pull request #506 from wolfmanjm/refactor/laser...
2014-09-09 Jim Morrisrefactor laser module to follow coding guidelines as...
2014-06-29 Jim MorrisMerge branch 'edge'
2014-05-24 Jim MorrisMerge remote-tracking branch 'upstream/edge' into upstr...
2014-05-24 Jim MorrisMerge pull request #401 from wolfmanjm/fix/cleanup...
2014-05-24 Jim Morriscleanup a bunch of fields that should be private
2014-05-24 LogxenMerge pull request #399 from Smoothieware/edge
2014-04-23 LogxenMerge branch 'edge' into multitool
2014-03-31 Jim MorrisMerge pull request #353 from wolfmanjm/cleanup/headers
2014-03-31 Jim Morriscleanup all libs/ headers and dependent files
2014-03-31 Jim Morrismore header cleanup, compiles faster now
2014-03-30 Jim MorrisMerge pull request #350 from wolfmanjm/fix/tabs-in...
2014-03-30 Jim MorrisAllow TABS in config
2014-03-24 LogxenMerge branch 'edge' into multitool
2014-03-15 Jim MorrisMerge remote-tracking branch 'upstream/edge' into upstr...
2014-03-15 Jim MorrisMerge pull request #334 from wolfmanjm/upstreamedge
2014-03-14 Michael MoonLaser: do not dereference laser_pin if incorrect pin...
2014-02-19 LogxenMerge branch 'switch' into edge
2014-01-31 Logxenenabled inversion of PWM pin within Laser Module
2014-01-30 Logxenadded laser_module_pwm_period config setting which...
2014-01-24 Michael MoonMerge branch 'master' into edge
2013-12-27 Michael MoonReplace all doubles with floats including some constants
2013-12-27 Michael MoonUse static kernel singleton pointer instead of per...
2013-12-22 Jim MorrisMerge branch 'upstreamedge' into upstream-master
2013-10-11 Arthur Wolfmaking mbed pwm pins for laser configurable
2013-06-07 Jim MorrisMerge remote-tracking branch 'upstream/edge' into featu...
2013-06-06 Logxenfinally made Laser's pin configable
2013-05-13 Michael MoonMerge remote-tracking branch 'fix/USBMSD' into edge
2013-03-27 Arthur Wolfmerge edge into master
2013-03-16 Arthur Wolffixing merge conflict
2013-03-15 Arthur WolfMerge branch 'edge' into extruderfix
2013-03-11 LogxenMerge remote-tracking branch 'upstream/edge' into firmc...
2013-03-07 Michael MoonMerge pull request #147 from bgamari/fixes
2013-03-06 Ben GamariLaser: Fix up whitespace
2013-02-17 LogxenMerge branch 'edge' into onboot
2013-02-16 LogxenMerge branch 'edge' into debugbreak
2013-02-16 LogxenMerge branch 'edge' into button
2013-02-14 Ante VukorepaMerge branch 'edge' of git://github.com/arthurwolf...
2013-02-13 Adam GreenMerge branch 'edge' into track_allocs
2013-02-13 arthurwolfMerge pull request #92 from wolfmanjm/move_digipot
2013-02-08 Jim Morrismove digipot instance to CurrentControl module
2013-01-28 Arthur Wolfthe laser module now will not take the p21 pin, unless...
2013-01-24 Arthur Wolfremoving get_value from laser too
2013-01-02 Michael MoonMerge branch 'release/0.1'
2012-11-16 arthurwolfMerge pull request #72 from triffid/feature/SDHC_support
2012-11-16 Mark A. CooperMerge pull request #73 from logxen/edge
2012-11-16 Mark A. Cooperenabled the laser module and added tickle_power for...
2012-11-11 Arthur WolfMerge branch 'edge' of github.com:arthurwolf/Smoothie...
2012-11-11 arthurwolfMerge pull request #67 from triffid/feature/cleaner_mak...
2012-11-11 Michael Moonfix things that -std=gnu++0x was complaining about...
2012-11-06 arthurwolfMerge pull request #65 from arthurwolf/edge
2012-08-15 Arthur Wolfmerging edge into stepper, correcting conflicts
2012-08-13 Arthur Wolflaser was broken, lines missing at the end of files
2012-07-29 arthurwolfMerge pull request #57 from gxurma/lasercontrol
2012-07-29 Gyurkó MartinAdded laser control command. Forked from edge. Now...
2012-07-07 arthurwolfMerge pull request #48 from arthurwolf/edge
2012-05-09 LogxenMerge branch 'edge' into wait4q
2012-05-09 Mark A. CooperMerge pull request #26 from logxen/edge
2012-05-09 Mark A. CooperMerge pull request #25 from logxen/edge
2012-05-09 Mark A. CooperMerge pull request #24 from logxen/xhume
2012-05-09 Logxenmade mbed.h include more specific for several key files
2011-11-20 Arthur WolfMerge branch 'player' into edge
2011-11-20 Arthur Wolfminor
2011-11-20 Arthur Wolfvarious bug fixes
2011-11-18 Arthur Wolfadding boolean configuration values, and extruder/laser...
2011-11-18 Arthur WolfChanged config system to an object-based one, configs...
2011-10-09 Arthur Wolffixed bug with planner/stepper interaction
2011-10-07 Arthur WolfFixed a bug with Block gcode queue access from interrup...
2011-10-02 Arthur Wolfadded Pauser module
2011-09-19 Arthur Wolffirst commit