HCoop Git - clinton/Smoothieware.git/history - src/modules/robot/Conveyor.cpp

HCoop / clinton / Smoothieware.git / history

[clinton/Smoothieware.git] / src / modules / robot / Conveyor.cpp

2018-02-26	Jim Morris	Merge remote-tracking branch 'upstream/edge' into featu...	blob \| commitdiff \| raw
2017-09-19	Grey Christoforo	Merge pull request #4 from JeffreyRodriguez/greyltc_ISR...	blob \| commitdiff \| raw
2017-09-17	Jeff Rodriguez	Merged with current edge.	blob \| commitdiff \| raw
2017-04-08	Jim Morris	Merge pull request #1162 from Smoothieware/feature...	blob \| commitdiff \| raw
2017-04-07	Jim Morris	Add an alarm if homing did not hit the endstops	blob \| commitdiff \| raw
2017-04-06	Jim Morris	Merge pull request #1156 from Smoothieware/stepticker...	blob \| commitdiff \| raw \| diff to current
2017-04-05	Jim Morris	refactor...	blob \| commitdiff \| raw \| diff to current
2017-04-05	Jim Morris	Merge remote-tracking branch 'upstream/edge' into stept...	blob \| commitdiff \| raw \| diff to current
2017-04-05	Jim Morris	optimize 64bit fixed point usage	blob \| commitdiff \| raw \| diff to current
2017-02-21	Jim Morris	remove block debug	blob \| commitdiff \| raw \| diff to current
2017-02-21	Jim Morris	more debug stuff	blob \| commitdiff \| raw \| diff to current
2017-02-20	Jim Morris	Merge branch 'upstreamedge' into stepticker/use-64bit...	blob \| commitdiff \| raw \| diff to current
2017-02-20	Jim Morris	add some more block debugging	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 featu...	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-10-13	Jim Morris	Merge pull request #1040 from wolfmanjm/upstreamedge	blob \| commitdiff \| raw \| diff to current
2016-10-13	Jim Morris	workaround to handle kill and not wait for motors to...	blob \| commitdiff \| raw \| diff to current
2016-07-22	Jim Morris	Merge pull request #988 from wolfmanjm/upstreamedge	blob \| commitdiff \| raw \| diff to current
2016-07-20	Jim Morris	fix halt when queue is full	blob \| commitdiff \| raw \| diff to current
2016-07-20	Jim Morris	Corerctly handle halt when queue was full and stuck...	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-07-02	Jim Morris	typo fix	blob \| commitdiff \| raw \| diff to current
2016-06-30	Jim Morris	Merge remote-tracking branch 'upstream/edge-unstable...	blob \| commitdiff \| raw \| diff to current
2016-06-30	Jim Morris	show nominal speed for each curren tblock on CNC panel	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-29	Jim Morris	implement current_speed for panel display	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-27	Jim Morris	alos make sure stepticker handles ablock with no steps...	blob \| commitdiff \| raw \| diff to current
2016-06-27	Jim Morris	Fix a bug where a move could result in zero steps for...	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-24	Jim Morris	fix using is queue empty when it should be is_idle	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	remove debug of block	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-21	Jim Morris	move more modules to AHB0	blob \| commitdiff \| raw \| diff to current
2016-06-21	Jim Morris	add home_z_first option for homing, where Z will home...	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-17	Jim Morris	fix homing, speeds and backoffs	blob \| commitdiff \| raw \| diff to current
2016-06-17	Jim Morris	Implement endstops using new motion control	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	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	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-08	Jim Morris	display in CNC pendant the requested feedrate and the...	blob \| commitdiff \| raw \| diff to current
2015-12-24	bouni	fixed minor merging problems	blob \| commitdiff \| raw \| diff to current
2015-12-14	Jim Morris	Merge remote-tracking branch 'upstream/edge' into upstr...	blob \| commitdiff \| raw \| diff to current
2015-09-13	Jim Morris	Merge pull request #730 from wolfmanjm/fix/suspend...	blob \| commitdiff \| raw \| diff to current
2015-08-23	Arthur Wolf	Merge pull request #686 from thinkl33t/edge	blob \| commitdiff \| raw \| diff to current
2015-08-19	Jim Morris	Merge pull request #696 from wolfmanjm/fix/unmarked...	blob \| commitdiff \| raw \| diff to current
2015-08-19	Jim Morris	remove the unhandled gcode hack, and all the cruft...	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	Merge remote-tracking branch 'upstream/edge' into featu...	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-09-16	Jim Morris	Merge pull request #513 from Smoothieware/update/gcc4.8	blob \| commitdiff \| raw \| diff to current
2014-09-15	Jim Morris	Merge remote-tracking branch 'upstream/edge' into updat...	blob \| commitdiff \| raw \| diff to current
2014-09-15	Jim Morris	Merge branch 'upstreamedge' into update/gcc4.8	blob \| commitdiff \| raw \| diff to current
2014-09-14	Jim Morris	Merge remote-tracking branch 'upstream/edge' into updat...	blob \| commitdiff \| raw \| diff to current
2014-09-14	Jim Morris	Update to GCC4.8	blob \| commitdiff \| raw \| diff to current
2014-06-29	Jim Morris	Merge branch 'edge'	blob \| commitdiff \| raw \| diff to current
2014-06-19	Jim Morris	Merge remote-tracking branch 'upstream/edge' into optim...	blob \| commitdiff \| raw \| diff to current
2014-06-19	Jim Morris	Merge pull request #433 from wolfmanjm/update/remove...	blob \| commitdiff \| raw \| diff to current
2014-06-19	Jim Morris	Merge remote-tracking branch 'upstream/edge' into updat...	blob \| commitdiff \| raw \| diff to current
2014-06-17	Jim Morris	remove on_config_reload event	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 all libs/ headers and dependent files	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: add verbose commentary	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom