| 2016-07-31 |
Jim Morris | initial implementation of new laser module |
blob | commitdiff | raw |
| 2016-07-02 |
Jim Morris | Merge pull request #961 from wolfmanjm/upstreamedge |
blob | commitdiff | raw | diff to current |
| 2016-06-30 |
Zaaphod | Merge pull request #3 from Smoothieware/edge-unstable |
blob | commitdiff | raw | diff to current |
| 2016-06-28 |
Jim Morris | fix MPG mode for CNC pendant |
blob | commitdiff | raw | diff to current |
| 2016-06-28 |
Jim Morris | Merge remote-tracking branch 'upstream/edge' into exper... |
blob | commitdiff | raw | diff to current |
| 2016-06-26 |
Jim Morris | Merge remote-tracking branch 'upstream/edge' into featu... |
blob | commitdiff | raw | diff to current |
| 2016-06-24 |
Jim Morris | Merge remote-tracking branch 'upstream/edge' into featu... |
blob | commitdiff | raw | diff to current |
| 2016-06-23 |
Jim Morris | fix entry speed of a move following an retracty or... |
blob | commitdiff | raw | diff to current |
| 2016-06-21 |
Jim Morris | make the tick_info in Block a vector, assigning how... |
blob | commitdiff | raw | diff to current |
| 2016-06-17 |
Jim Morris | Merge remote-tracking branch 'upstream/edge' into featu... |
blob | commitdiff | raw | diff to current |
| 2016-06-16 |
Jim Morris | Go back to stepticker getting data direct from block... |
blob | commitdiff | raw | diff to current |
| 2016-06-10 |
Jim Morris | Merge remote-tracking branch 'upstream/edge' into featu... |
blob | commitdiff | raw | diff to current |
| 2016-06-01 |
Jim Morris | Merge branch 'upstreamedge' into feature/acceleration... |
blob | commitdiff | raw | diff to current |
| 2016-05-30 |
Jim Morris | Merge remote-tracking branch 'upstream/edge' into featu... |
blob | commitdiff | raw | diff to current |
| 2016-05-28 |
Jim Morris | Merge remote-tracking branch 'upstream/edge' into merge... |
blob | commitdiff | raw | diff to current |
| 2016-05-24 |
Jim Morris | improve the check for blocks that can be pushed onto... |
blob | commitdiff | raw | diff to current |
| 2016-05-24 |
Jim Morris | Fix conveyor to autostart |
blob | commitdiff | raw | diff to current |
| 2016-05-23 |
Arthur Wolf | Merge pull request #929 from Smoothieware/edge |
blob | commitdiff | raw | diff to current |
| 2016-05-23 |
Jim Morris | Reworked the entire block queue and conveyor, see comme... |
blob | commitdiff | raw | diff to current |
| 2016-05-17 |
Jim Morris | started hacking on the new conveyor model |
blob | commitdiff | raw | diff to current |
| 2016-05-15 |
Jim Morris | fixed bugs |
blob | commitdiff | raw | diff to current |
| 2016-05-14 |
Jim Morris | Inital rewrite of stepticker and associated code to... |
blob | commitdiff | raw | diff to current |
| 2015-12-16 |
Jim Morris | Merge pull request #804 from wolfmanjm/feature/wcs... |
blob | commitdiff | raw | diff to current |
| 2015-12-15 |
Jim Morris | whitespace changes... |
blob | commitdiff | raw | diff to current |
| 2015-12-12 |
Jim Morris | Squashed commit of the following: |
blob | commitdiff | raw | diff to current |
| 2015-01-21 |
Arthur Wolf | Merge pull request #552 from lautr3k/module/Drills |
blob | commitdiff | raw | diff to current |
| 2014-12-09 |
Jim Morris | Merge pull request #551 from wolfmanjm/use-pendsv-handl... |
blob | commitdiff | raw | diff to current |
| 2014-12-02 |
Jim Morris | Merge remote-tracking branch 'upstream/edge' into use... |
blob | commitdiff | raw | diff to current |
| 2014-12-01 |
Jim Morris | Merge remote-tracking branch 'upstream/edge' into use... |
blob | commitdiff | raw | diff to current |
| 2014-11-24 |
Jim Morris | Merge remote-tracking branch 'upstream/edge' into fix... |
blob | commitdiff | raw | diff to current |
| 2014-11-17 |
Jim Morris | change the slowest steps per second speed to the lowest... |
blob | commitdiff | raw | diff to current |
| 2014-11-17 |
Jim Morris | put accleratrion in the block, thi sallows M204 to... |
blob | commitdiff | raw | diff to current |
| 2014-08-20 |
Jim Morris | Merge pull request #491 from soldierkam/edge |
blob | commitdiff | raw | diff to current |
| 2014-08-06 |
Jim Morris | Merge pull request #473 from wolfmanjm/refactor/planner... |
blob | commitdiff | raw | diff to current |
| 2014-08-06 |
Jim Morris | planner is no longer a module |
blob | commitdiff | raw | diff to current |
| 2014-05-24 |
Logxen | Merge pull request #399 from Smoothieware/edge |
blob | commitdiff | raw | diff to current |
| 2014-04-23 |
Logxen | Merge branch 'edge' into multitool |
blob | commitdiff | raw | diff to current |
| 2014-03-31 |
Jim Morris | Merge pull request #353 from wolfmanjm/cleanup/headers |
blob | commitdiff | raw | diff to current |
| 2014-03-31 |
Jim Morris | cleanup more headers |
blob | commitdiff | raw | diff to current |
| 2014-03-30 |
Jim Morris | Merge pull request #350 from wolfmanjm/fix/tabs-in... |
blob | commitdiff | raw | diff to current |
| 2014-03-30 |
Jim Morris | Allow TABS in config |
blob | commitdiff | raw | diff to current |
| 2014-02-19 |
Logxen | Merge branch 'switch' into edge |
blob | commitdiff | raw | diff to current |
| 2014-01-25 |
Michael Moon | change minute -> second in relevant comments |
blob | commitdiff | raw | diff to current |
| 2014-01-24 |
Michael Moon | Merge branch 'master' into edge |
blob | commitdiff | raw | diff to current |
| 2014-01-19 |
Michael Moon | Merge branch 'feature/ActionQueue_redux' into edge |
blob | commitdiff | raw | diff to current |
| 2014-01-17 |
Michael Moon | Block: don't update trapezoids, and return correct... |
blob | commitdiff | raw | diff to current |
| 2014-01-17 |
Michael Moon | Merge branch 'edge' into feature/ActionQueue_redux |
blob | commitdiff | raw | diff to current |
| 2014-01-17 |
Michael Moon | Big Planner::recalculate rewrite |
blob | commitdiff | raw | diff to current |
| 2014-01-16 |
Michael Moon | biggish Block queue reshuffle, Planner::recalculate... |
blob | commitdiff | raw | diff to current |
| 2014-01-08 |
Jim Morris | Merge pull request #308 from wolfmanjm/upstreamedge |
blob | commitdiff | raw | diff to current |
| 2014-01-08 |
Jim Morris | Fix acceleration calculatin bug when preceded by extrud... |
blob | commitdiff | raw | diff to current |
| 2013-12-27 |
Michael Moon | Replace all doubles with floats including some constants |
blob | commitdiff | raw | diff to current |
| 2013-12-27 |
Michael Moon | replace all uses of module::kernel pointer with kernel... |
blob | commitdiff | raw | diff to current |
| 2013-12-27 |
Michael Moon | Revert "Revert "Merge branch 'fix/Queue_scan_consolidat... |
blob | commitdiff | raw | diff to current |
| 2013-12-26 |
Michael Moon | Revert "Merge branch 'fix/Queue_scan_consolidation... |
blob | commitdiff | raw | diff to current |
| 2013-12-26 |
Michael Moon | Merge branch 'fix/Queue_scan_consolidation' into edge |
blob | commitdiff | raw | diff to current |
| 2013-12-26 |
Michael Moon | Remove unused parameters to Block::reverse pass and... |
blob | commitdiff | raw | diff to current |
| 2013-05-13 |
Michael Moon | Merge remote-tracking branch 'fix/USBMSD' into edge |
blob | commitdiff | raw | diff to current |
| 2013-03-27 |
Arthur Wolf | merge edge into master |
blob | commitdiff | raw | diff to current |
| 2013-03-16 |
Arthur Wolf | fixing merge conflict |
blob | commitdiff | raw | diff to current |
| 2013-03-15 |
Arthur Wolf | Merge branch 'edge' into extruderfix |
blob | commitdiff | raw | diff to current |
| 2013-03-06 |
Arthur Wolf | this commit does not compile, commiting to get help... |
blob | commitdiff | raw | diff to current |
| 2013-02-21 |
Ben Gamari | Merge pull request #118 from bgamari/temp-no-irq |
blob | commitdiff | raw | diff to current |
| 2013-02-18 |
Adam Green | Merge branch 'edge' into track_allocs |
blob | commitdiff | raw | diff to current |
| 2013-02-17 |
arthurwolf | Merge pull request #124 from logxen/onboot |
blob | commitdiff | raw | diff to current |
| 2013-02-17 |
Logxen | Merge branch 'edge' into onboot |
blob | commitdiff | raw | diff to current |
| 2013-02-17 |
Logxen | Merge branch 'edge' into onboot |
blob | commitdiff | raw | diff to current |
| 2013-02-17 |
Logxen | Merge branch 'edge' into onboot |
blob | commitdiff | raw | diff to current |
| 2013-02-16 |
Logxen | Merge branch 'edge' into debugbreak |
blob | commitdiff | raw | diff to current |
| 2013-02-16 |
Logxen | Merge branch 'edge' into button |
blob | commitdiff | raw | diff to current |
| 2013-02-03 |
Arthur Wolf | Merge branch 'edge' of github.com:arthurwolf/Smoothie... |
blob | commitdiff | raw | diff to current |
| 2013-02-03 |
Arthur Wolf | max_jerk was unused, removing |
blob | commitdiff | raw | diff to current |
| 2013-01-15 |
Michael Moon | Merge branch 'fix/gcode_freed_while_in_queue' into... |
blob | commitdiff | raw | diff to current |
| 2013-01-15 |
Michael Moon | allocate Gcode objects on the heap, don't clean them... |
blob | commitdiff | raw | diff to current |
| 2013-01-02 |
Michael Moon | Merge branch 'release/0.1' |
blob | commitdiff | raw | diff to current |
| 2012-11-21 |
Logxen | renamed all references to the Player module to Conveyor |
blob | commitdiff | raw | diff to current |
| 2012-11-11 |
Arthur Wolf | Merge branch 'edge' of github.com:arthurwolf/Smoothie... |
blob | commitdiff | raw | diff to current |
| 2012-11-11 |
arthurwolf | Merge pull request #67 from triffid/feature/cleaner_mak... |
blob | commitdiff | raw | diff to current |
| 2012-11-11 |
Michael Moon | mass trailing whitespace cleanup |
blob | commitdiff | raw | diff to current |
| 2012-11-11 |
Michael Moon | remove weird unicode chars |
blob | commitdiff | raw | diff to current |
| 2012-11-06 |
arthurwolf | Merge pull request #66 from arthurwolf/stepper |
blob | commitdiff | raw | diff to current |
| 2012-10-08 |
Arthur Wolf | solved the block end problem, commiting mostly to save... |
blob | commitdiff | raw | diff to current |
| 2011-12-05 |
Arthur Wolf | major bug fixes, way too many to enumerate |
blob | commitdiff | raw | diff to current |
| 2011-11-20 |
Arthur Wolf | various cleanups |
blob | commitdiff | raw | diff to current |
| 2011-11-20 |
Arthur Wolf | Merge branch 'player' into edge |
blob | commitdiff | raw | diff to current |
| 2011-11-20 |
Arthur Wolf | Changed from Queue in Planner module to the new Player... |
blob | commitdiff | raw | diff to current |
| 2011-11-20 |
Arthur Wolf | various bug fixes |
blob | commitdiff | raw | diff to current |
| 2011-11-18 |
Arthur Wolf | Changed config system to an object-based one, configs... |
blob | commitdiff | raw | diff to current |
| 2011-10-09 |
Arthur Wolf | fixed bug with planner/stepper interaction |
blob | commitdiff | raw | diff to current |
| 2011-10-07 |
Arthur Wolf | Fixed a bug with Block gcode queue access from interrup... |
blob | commitdiff | raw | diff to current |
| 2011-10-01 |
Arthur Wolf | integrating chamnit's grbl-edge's math |
blob | commitdiff | raw | diff to current |
| 2011-09-19 |
Arthur Wolf | first commit |
blob | commitdiff | raw | diff to current |
|
HCoop / clinton / Smoothieware.git / history