HCoop
/
clinton
/
Smoothieware.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Change default
[clinton/Smoothieware.git]
/
src
/
modules
/
robot
/
Conveyor.h
2016-05-28
Jim Morris
Merge pull request #921 from wolfmanjm/feature/cnc...
blob
|
commitdiff
|
raw
2016-05-11
Jim Morris
Merge remote-tracking branch 'upstream/edge' into featu...
blob
|
commitdiff
|
raw
2016-05-09
Jim Morris
fix the actualy feedrate display on panel for cnc pendant
blob
|
commitdiff
|
raw
2016-05-08
Jim Morris
display in CNC pendant the requested feedrate and the...
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