| 2018-09-30 |
Jim Morris | add $J for instant jog of one axis. |
blob | commitdiff | raw |
| 2018-02-26 |
Jim Morris | Merge remote-tracking branch 'upstream/edge' into featu... |
blob | commitdiff | raw | diff to current |
| 2017-09-19 |
Grey Christoforo | Merge pull request #4 from JeffreyRodriguez/greyltc_ISR... |
blob | commitdiff | raw | diff to current |
| 2017-09-17 |
Jeff Rodriguez | Merged with current edge. |
blob | commitdiff | raw | diff to current |
| 2017-04-08 |
Jim Morris | Merge pull request #1162 from Smoothieware/feature... |
blob | commitdiff | raw | diff to current |
| 2017-04-07 |
Jim Morris | Add an alarm if homing did not hit the endstops |
blob | commitdiff | raw | diff to current |
| 2017-04-06 |
Jim Morris | Merge pull request #1156 from Smoothieware/stepticker... |
blob | commitdiff | raw | diff to current |
| 2017-04-06 |
Jim Morris | cleanup header files |
blob | commitdiff | raw | diff to current |
| 2017-04-05 |
Jim Morris | refactor... |
blob | commitdiff | raw | diff to current |
| 2016-12-15 |
Jim Morris | Merge pull request #1055 from wolfmanjm/merge-abc-with... |
blob | commitdiff | raw | diff to current |
| 2016-12-15 |
Jim Morris | Merge remote-tracking branch 'upstream/edge' into merge... |
blob | commitdiff | raw | diff to current |
| 2016-12-11 |
Jim Morris | Merge remote-tracking branch 'upstream/edge' into merge... |
blob | commitdiff | raw | diff to current |
| 2016-11-27 |
Jim Morris | Merge remote-tracking branch 'upstream/edge' into merge... |
blob | commitdiff | raw | diff to current |
| 2016-11-15 |
Jim Morris | clean up some uses of using std::string |
blob | commitdiff | raw | diff to current |
| 2016-11-09 |
Jim Morris | Merge pull request #955 from Bouni/feature/spindle... |
blob | commitdiff | raw | diff to current |
| 2016-10-21 |
Jim Morris | Merge remote-tracking branch 'upstream/edge' into featu... |
blob | commitdiff | raw | diff to current |
| 2016-10-14 |
Jim Morris | Merge remote-tracking branch 'upstream/edge' into featu... |
blob | commitdiff | raw | diff to current |
| 2016-10-14 |
Jim Morris | Merge pull request #1041 from wolfmanjm/upstreamedge |
blob | commitdiff | raw | diff to current |
| 2016-10-14 |
Jim Morris | Merge remote-tracking branch 'upstream/edge' into upstr... |
blob | commitdiff | raw | diff to current |
| 2016-10-14 |
Jim Morris | Better and correct fix for Kill hanging on E moving |
blob | commitdiff | raw | diff to current |
| 2016-07-04 |
bouni | merged latest edge branch and fixed the spindle module... |
blob | commitdiff | raw | diff to current |
| 2016-07-02 |
Jim Morris | Merge pull request #961 from wolfmanjm/upstreamedge |
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-28 |
Jim Morris | Merge pull request #907 from lordofhyphens/deltagrid_ca... |
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-25 |
Jim Morris | rename wait_for_empty_queue to wait for idle |
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-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 | fix bugs inconveyor so it starts queue off correctly |
blob | commitdiff | raw | diff to current |
| 2016-06-16 |
bouni | merged edge into feature/spindle-refactor branch |
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-06 |
Arthur Wolf | Merge pull request #933 from Smoothieware/edge |
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-28 |
Jim Morris | Merge pull request #921 from wolfmanjm/feature/cnc... |
blob | commitdiff | raw | diff to current |
| 2016-05-25 |
Jim Morris | attempt to fix the issues regarding the job q drying... |
blob | commitdiff | raw | diff to current |
| 2016-05-24 |
Jim Morris | Fix conveyor to autostart |
blob | commitdiff | raw | diff to current |
| 2016-05-23 |
Jim Morris | tweak the check_queue for when to push new blocks onto... |
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-18 |
Jim Morris | do not disable irqs in block queue anymore. Should... |
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-11 |
Jim Morris | Merge remote-tracking branch 'upstream/edge' into featu... |
blob | commitdiff | raw | diff to current |
| 2016-05-09 |
Jim Morris | fix the actualy feedrate display on panel for cnc pendant |
blob | commitdiff | raw | diff to current |
| 2016-05-08 |
Jim Morris | display in CNC pendant the requested feedrate and the... |
blob | commitdiff | raw | diff to current |
| 2014-11-29 |
Jim Morris | Merge branch 'edge' |
blob | commitdiff | raw | diff to current |
| 2014-11-09 |
Jim Morris | Merge pull request #545 from Smoothieware/add/P1.23... |
blob | commitdiff | raw | diff to current |
| 2014-11-05 |
Jim Morris | Merge pull request #542 from wolfmanjm/add/clear-block... |
blob | commitdiff | raw | diff to current |
| 2014-11-04 |
Jim Morris | fix issues with timing of when flush happens |
blob | commitdiff | raw | diff to current |
| 2014-11-03 |
Jim Morris | Merge branch 'feature/kill-button' into add/clear-block... |
blob | commitdiff | raw | diff to current |
| 2014-11-03 |
Jim Morris | Implement triffid hunters flush queue code in Conveyor |
blob | commitdiff | raw | diff to current |
| 2014-06-29 |
Jim Morris | Merge branch 'edge' |
blob | commitdiff | raw | diff to current |
| 2014-05-24 |
Jim Morris | Merge remote-tracking branch 'upstream/edge' into upstr... |
blob | commitdiff | raw | diff to current |
| 2014-05-24 |
Jim Morris | Merge pull request #401 from wolfmanjm/fix/cleanup... |
blob | commitdiff | raw | diff to current |
| 2014-05-24 |
Jim Morris | remove incorrect comment about queue size |
blob | commitdiff | raw | diff to current |
| 2014-05-24 |
Jim Morris | remove incorrect comment about block queue size |
blob | commitdiff | raw | diff to current |
| 2014-05-24 |
Jim Morris | cleanup a bunch of fields that should be private |
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-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 | Misc cleanups: turns out, conveyor can quite happily... |
blob | commitdiff | raw | diff to current |
| 2014-01-17 |
Michael Moon | Conveyor: check for queue start conditions in main... |
blob | commitdiff | raw | diff to current |
| 2014-01-17 |
Michael Moon | Conveyor: actually implement planner_queue_size config... |
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 |
Jim Morris | Merge remote-tracking branch 'upstream/edge' into upstr... |
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-15 |
Michael Moon | Change Conveyor,Planner,Block to use HeapRing |
blob | commitdiff | raw | diff to current |
| 2014-01-15 |
Michael Moon | Revert "Change Conveyor,Planner,Block to use HeapRing" |
blob | commitdiff | raw | diff to current |
| 2014-01-15 |
Michael Moon | Change Conveyor,Planner,Block to use HeapRing |
blob | commitdiff | raw | diff to current |
| 2014-01-15 |
Michael Moon | provide one method to add gcode to blocks, reduce code... |
blob | commitdiff | raw | diff to current |
| 2014-01-11 |
Jim Morris | Merge pull request #310 from wolfmanjm/upstreamedge |
blob | commitdiff | raw | diff to current |
| 2014-01-11 |
Jim Morris | Set previous_nominal_speed to 0 if the next block is... |
blob | commitdiff | raw | diff to current |
| 2013-12-22 |
Jim Morris | Merge pull request #295 from wolfmanjm/feature/uip... |
blob | commitdiff | raw | diff to current |
| 2013-12-22 |
Jim Morris | Merge Network code with webserver etc |
blob | commitdiff | raw | diff to current |
| 2013-12-22 |
Jim Morris | Merge branch 'upstreamedge' into upstream-master |
blob | commitdiff | raw | diff to current |
| 2013-06-21 |
Logxen | fixed PlayLed functionality as per arthur's recomendation |
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-01 |
Adam Green | Merge remote-tracking branch 'origin/edge' into feature... |
blob | commitdiff | raw | diff to current |
| 2013-02-25 |
Logxen | Merge pull request #136 from bgamari/fix-homing |
blob | commitdiff | raw | diff to current |
| 2013-02-25 |
Ben Gamari | Conveyor: Introduce wait_for_empty_queue |
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 |
| 2012-11-21 |
Logxen | renamed the Player module to Conveyor |
blob | commitdiff | raw | diff to current |
|
HCoop / clinton / Smoothieware.git / history