fixing merge conflict
[clinton/Smoothieware.git] / src / libs / StepTicker.cpp
2013-03-16 Arthur Wolffixing merge conflict
2013-03-01 Adam GreenMerge remote-tracking branch 'origin/edge' into feature...
2013-02-26 Arthur Wolfsome reordering for speed
2013-02-25 LogxenMerge pull request #135 from wolfmanjm/feature/add...
2013-02-21 Adam GreenMerge remote-tracking branch 'origin/fix/USBSerial...
2013-02-21 Arthur Wolfvarious optimisations in StepTicker and SteppperMotor
2013-02-21 Arthur Wolfpossibly saving some time in the step interrupt
2013-02-21 Adam GreenRemove bitmask from within for loop.
2013-02-21 Ben GamariMerge pull request #118 from bgamari/temp-no-irq
2013-02-20 Arthur Wolfchar is bad
2013-02-20 Arthur Wolfcleaning up debug gpios
2013-02-20 Arthur WolfMerge branch 'edge' of github.com:arthurwolf/Smoothie...
2013-02-20 Arthur WolfPossible problem with the way Conveyor takes and releas...
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-01-15 Michael MoonMerge branch 'feature/on_second_tick_event' into edge
2013-01-15 Michael Moonmove on_second_tick callout to on_idle event, also...
2013-01-02 Michael MoonMerge branch 'hotfix/db35a1-typo' into edge
2013-01-02 Michael MoonMerge branch 'master' into edge
2013-01-02 Michael MoonMerge branch 'feature/new-usb-stack' into edge
2013-01-02 Michael MoonStepTicker: skip unused variable warnings
2013-01-02 Michael Moonfix StepTicker walking off the end of active_motors...
2013-01-02 Michael Moonminor whitespace changes
2013-01-02 Michael MoonMerge branch 'release/0.1'
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 Moonremove weird unicode chars
2012-11-08 Arthur Wolfadded acceleration curve synchronization, memory leak...
2012-11-07 Arthur Wolfcorrected stepper block change duration compensation...
2012-11-07 Arthur Wolfcorrected interrupt priorities
2012-11-06 arthurwolfMerge pull request #66 from arthurwolf/stepper
2012-11-06 Arthur Wolfstepper branch ready for merging with edge, debug stuff...
2012-11-02 Arthur WolfMerge branch 'stepper' of github.com:arthurwolf/Smoothi...
2012-11-02 Arthur Wolfoptimized kernel
2012-10-30 Arthur Wolftimer overflow problem fixed, rare small offsets still...
2012-10-28 Arthur Wolfthe fast move end bug is fixed, re-working the stepper...
2012-10-18 Arthur Wolfsaving the new acceleration system before reverting it
2012-10-08 Arthur Wolfsolved the block end problem, commiting mostly to save...
2012-09-17 Arthur Wolfmerging edge into stepper
2012-08-15 Arthur Wolfmerging edge into stepper, correcting conflicts
2012-08-14 Arthur Wolfstepper code now only iterates on stepper motors that...
2012-07-07 arthurwolfMerge pull request #48 from arthurwolf/edge
2012-07-01 Arthur WolfMerge branch 'edge' into stepper
2012-07-01 Arthur Wolfmostly working, needs extruder support
2012-06-27 Arthur Wolfworking code, only one bug left
2012-06-26 Arthur Wolfhalf-way commit to explain some of what is going on
2012-05-11 LogxenMerge branch 'edge' into wait4q
2012-05-11 arthurwolfMerge pull request #31 from logxen/xhume
2012-05-11 Logxenmostly changes to headers files to further identify...
2012-02-27 Arthur Wolfremoved most mbed.h includes
2012-02-02 Arthur Wolfcleanup before merging
2012-01-06 Arthur Wolfadded missing files, working on extruder module ( not...