Merge pull request #1038 from michael-moore0/feature/time-format
[clinton/Smoothieware.git] / src / main.cpp
2016-08-07 Jim MorrisMerge pull request #994 from Smoothieware/add/new-laser
2016-07-31 Jim Morrisinitial implementation of new laser module
2016-07-02 Jim MorrisMerge pull request #961 from wolfmanjm/upstreamedge
2016-06-28 Jim MorrisMerge remote-tracking branch 'upstream/edge' into exper...
2016-06-28 Jim MorrisMerge pull request #907 from lordofhyphens/deltagrid_ca...
2016-06-27 Jim Morriscomment out laser for now
2016-06-26 Jim MorrisMerge remote-tracking branch 'upstream/edge' into featu...
2016-06-24 Jim MorrisMerge remote-tracking branch 'upstream/edge' into featu...
2016-06-21 Jim Morrismake the tick_info in Block a vector, assigning how...
2016-06-21 Jim Morrismove more modules to AHB0
2016-06-17 Jim MorrisMerge remote-tracking branch 'upstream/edge' into featu...
2016-06-10 Jim MorrisMerge remote-tracking branch 'upstream/edge' into featu...
2016-06-07 Jim Morrismove where the stepticker debug pin is defined
2016-06-06 Arthur WolfMerge pull request #933 from Smoothieware/edge
2016-06-01 Jim MorrisMerge branch 'upstreamedge' into feature/acceleration...
2016-05-30 Jim MorrisMerge remote-tracking branch 'upstream/edge' into featu...
2016-05-28 Jim MorrisMerge remote-tracking branch 'upstream/edge' into merge...
2016-05-28 Jim MorrisMerge pull request #921 from wolfmanjm/feature/cnc...
2016-05-25 Jim Morrisattempt to fix the issues regarding the job q drying...
2016-05-23 Arthur WolfMerge pull request #929 from Smoothieware/edge
2016-05-14 Jim MorrisInital rewrite of stepticker and associated code to...
2016-05-13 Jim Morrisprint out CNC build if a CNC build
2016-03-08 Jim MorrisMerge remote-tracking branch 'upstream/edge' into upstr...
2016-03-08 Jim MorrisMerge pull request #868 from tritao/typos
2016-03-08 Joao MatosFixed some typos and minor consistency issues.
2016-02-28 Jim MorrisMerge pull request #864 from wolfmanjm/rdelta/improve...
2016-02-28 Jim Morriscreate ROatryDEltaCalibration module
2016-02-25 Jim MorrisMerge pull request #862 from wolfmanjm/upstreamedge
2016-02-25 Jim Morrismake module.h include platform_memory.h so if any modul...
2016-02-24 Jim MorrisMerge pull request #861 from wolfmanjm/upstreamedge
2016-02-24 Jim Morrisfix more delete crashes when object is in AHB0
2016-02-24 Jim MorrisMerge pull request #860 from wolfmanjm/upstreamedge
2016-02-24 Jim Morrisfix discrepanceis in realtime postion vs last milestone...
2016-02-22 Jim MorrisMerge pull request #851 from wolfmanjm/feature/correct...
2016-02-21 Jim MorrisMerge remote-tracking branch 'upstream/edge' into featu...
2016-02-21 Jim MorrisMerge pull request #854 from Smoothieware/fix/when...
2016-02-21 Jim MorrisMerge branch 'fix/when-slow-ticker-is-started' into...
2016-02-21 Jim Morrisfix when slow ticker gets started
2016-02-21 Jim Morrismove some high memory use modules to AHB0 as we started...
2016-02-19 Jim MorrisFix command line error if command not handled in Simple...
2016-01-12 Jim MorrisMerge pull request #811 from quillford/patch-1 origin/archive/touchprobe
2016-01-12 Jim MorrisMerge pull request #823 from wolfmanjm/upstreamedge
2016-01-07 Jim Morrisappend NOMSD to version if a nomsd build
2015-11-29 Arthur WolfMerge pull request #749 from justinledwards/patch-1
2015-11-29 Jim MorrisMerge pull request #773 from wolfmanjm/add/SPI-driver...
2015-11-29 Jim MorrisMerge remote-tracking branch 'upstream/edge' into add...
2015-11-23 Jim MorrisMerge remote-tracking branch 'upstream/edge' into add...
2015-11-22 Jim MorrisMerge remote-tracking branch 'upstream/edge' into add...
2015-11-22 erroltMerge remote-tracking branch 'upstream/edge' into edge
2015-11-20 Jim Morrisuppercse the exclusion define for motorcontrolsetup
2015-11-13 Jim MorrisMerge remote-tracking branch 'upstream/edge' into add...
2015-11-13 Jim MorrisMerge remote-tracking branch 'upstream/edge' into add...
2015-11-13 Jim MorrisMerge pull request #768 from Smoothieware/refactor...
2015-11-13 Jim MorrisRemove play/pause
2015-11-12 Jim Morrisadded debug output
2015-11-11 Jim MorrisInitial creation of th emotor controller module
2015-11-10 ErrolMerge branch 'edge' of https://github.com/errolt/Smooth...
2015-11-10 Jim MorrisMerge pull request #763 from wolfmanjm/feature/enable...
2015-11-09 Jim Morrisallow both DFU and watchdog
2015-11-09 Jim Morrismake watch dog timeout enter mri mode
2015-11-09 Jim MorrisMerge remote-tracking branch 'upstream/edge' into featu...
2015-10-07 Jim Morrisadd option to enable watchdog. Enabled if dfu is disabled.
2015-09-23 Jim MorrisMerge pull request #740 from wolfmanjm/feature/abort_he...
2015-09-23 Jim Morrisrefactor ON_HALT, add THEKERNEL->is_halted() for module...
2015-09-13 Jim MorrisMerge branch 'feature/soft_soft_endstops' of https...
2015-09-13 Jim MorrisMerge pull request #727 from wolfmanjm/modify/temperatu...
2015-09-13 Jim MorrisMerge pull request #730 from wolfmanjm/fix/suspend...
2015-09-12 Jim MorrisMerge branch 'modify/temperature-switch-edge-detection...
2015-09-12 Jim MorrisMerge pull request #728 from Smoothieware/fix/temperatu...
2015-09-12 Jim Morrisinterating temperature controllers was done wrong....
2015-05-23 Jim MorrisMerge pull request #666 from wolfmanjm/feature/filament...
2015-05-23 Jim MorrisMerge remote-tracking branch 'upstream/edge' into featu...
2015-04-04 Jim MorrisMerge remote-tracking branch 'upstream/edge' into featu...
2015-02-28 Jim Morrismodify makefile so excluded modules can be included...
2015-01-29 Jim MorrisMerge remote-tracking branch 'upstream/edge' into upstr...
2015-01-21 Arthur WolfMerge pull request #552 from lautr3k/module/Drills
2015-01-21 Sébastien Mischler... Update: change module name
2014-12-17 Jim MorrisMerge pull request #559 from wolfmanjm/feature/suspend...
2014-12-16 Jim MorrisAdded suspend and pause console commands
2014-12-09 Jim MorrisMerge pull request #551 from wolfmanjm/use-pendsv-handl...
2014-12-07 Sébastien Mischler... Add Drills module
2014-12-02 Jim MorrisMerge remote-tracking branch 'upstream/edge' into use...
2014-12-01 Jim MorrisMerge remote-tracking branch 'upstream/edge' into use...
2014-12-01 Jim Morrisuse RIT timer for accleration tick lower prioirty than...
2014-11-29 Jim Morrisfix deadlock/race condition
2014-11-24 Jim MorrisMerge remote-tracking branch 'upstream/edge' into fix...
2014-11-24 Jim MorrisMerge pull request #549 from PetteriAimonen/edge
2014-11-24 Petteri AimonenMove systick initialization from main.cpp to Spindle.cpp
2014-11-23 Petteri AimonenAdd PID-loopback spindle speed control
2014-11-23 Jim Morrisadd debug pins to makefile, ignored if not set origin/fix/trapezoid-symmetry
2014-11-03 Jim MorrisMerge remote-tracking branch 'upstream/edge' into featu...
2014-10-09 Jim MorrisMerge pull request #530 from wolfmanjm/feature/disable...
2014-10-09 Jim Morrisallocate secind serial to AHBO
2014-09-30 Arthur WolfMerge branch 'edge' of https://github.com/Smoothieware...
2014-09-30 Jim MorrisMerge pull request #518 from wolfmanjm/add/external...
2014-09-28 Jim Morrisfix opendir bug for multiple FAT volumes
2014-09-09 Jim MorrisMerge pull request #506 from wolfmanjm/refactor/laser...
2014-09-09 Jim Morrisrefactor laser module to follow coding guidelines as...
2014-09-05 Jim MorrisMerge remote-tracking branch 'upstream/edge' into add...
2014-08-28 hogthrobMerge remote-tracking branch 'upstream/edge' into edge
next