Merge remote-tracking branch 'upstream/edge' into fix/trapezoid-symmetry
[clinton/Smoothieware.git] / src / main.cpp
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
2014-08-28 Jim MorrisMerge pull request #501 from Smoothieware/update/tempco...
2014-08-27 Jim Morrissome more optimizations
2014-08-20 Jim MorrisMerge pull request #491 from soldierkam/edge
2014-08-20 soldierkamMerge remote-tracking branch 'upstream/master' into...
2014-08-03 Jim MorrisMerge remote-tracking branch 'upstream/edge' into featu...
2014-08-02 Jim MorrisMerge pull request #470 from wolfmanjm/upstreamedge
2014-08-02 Jim Morrisrevert disable msd change to avoid buggy windoze BSOD
2014-07-30 Jim MorrisMerge pull request #466 from wolfmanjm/add/disable-msd
2014-07-30 Jim MorrisAdd a disable_msd to config to totally disable msd
2014-07-21 Jim MorrisMerge branch 'edge' of github.com:Smoothieware/Smoothie...
2014-07-14 Jim MorrisMerge pull request #453 from RepRapMorgan/SCARAcal
2014-07-13 Quentin HarleyMerge remote-tracking branch 'upstream/edge' into edge
2014-07-12 Quentin HarleyAdd SCARAcal to Smoothieware
2014-07-09 Jim MorrisMerge pull request #444 from Smoothieware/feature/firmw...
2014-07-08 Jim MorrisAdd initial firmware retract and recover gomamnds G10...
2014-06-29 Jim MorrisMerge branch 'edge'
2014-06-22 Jim MorrisMerge pull request #438 from mhackney/edge
2014-06-21 mhackneymade recommended changes
2014-06-21 mhackneyAdded TemperatureSwitch module
2014-06-16 Jim MorrisMerge pull request #428 from wolfmanjm/upstreamedge
2014-06-16 Jim Morriscreate an init() in main so stack is released
2014-06-16 Jim MorrisMerge pull request #427 from Smoothieware/fix/makers...
2014-06-16 Jim Morristhese do not need to be modules
2014-06-09 Jim MorrisMerge branch 'edge' of github.com:Smoothieware/Smoothie...
2014-06-08 Jim MorrisMerge pull request #416 from wolfmanjm/optimize/bss
2014-06-08 Jim Morrismove big static data structures to USB and NET ram
2014-05-24 LogxenMerge pull request #400 from Smoothieware/multitool
2014-05-24 LogxenMerge pull request #399 from Smoothieware/edge
2014-05-18 Jim Morristry another approach to tool offset
2014-05-18 Jim MorrisRefactor multi tool code
2014-04-23 LogxenMerge branch 'edge' into multitool
2014-04-21 Jim MorrisMerge pull request #378 from hakalan/thermocouple
2014-04-20 Jim MorrisMerge pull request #380 from wolfmanjm/feature/z-probe
2014-04-20 Jim MorrisAdded G30 simple Z probe, will probe for Z at current...
2014-04-12 Jim MorrisMerge remote-tracking branch 'upstream/edge' into add...
2014-04-12 Jim MorrisMerge pull request #367 from wolfmanjm/optimize/config...
2014-04-12 Jim Morrisreplace map with vector as map uses double the amount...
2014-04-11 Jim Morrisclean up config-cache so it can encapsulate different...
2014-04-11 Jim MorrisMerge remote-tracking branch 'upstream/edge' into add...
2014-04-10 Jim MorrisMerge pull request #364 from wolfmanjm/fix/config-tight...
2014-04-10 Jim Morrisclean up config parsing, make more robust
2014-04-02 Jim MorrisMerge pull request #359 from wolfmanjm/upstreamedge
2014-04-02 Jim MorrisFix positive trim values for delta M666
2014-03-31 Jim MorrisMerge pull request #353 from wolfmanjm/cleanup/headers
2014-03-31 Jim Morriscleanup all libs/ headers and dependent files
2014-03-31 Jim Morrismore header cleanup, compiles faster now
2014-03-30 Jim MorrisMerge pull request #350 from wolfmanjm/fix/tabs-in...
2014-03-30 Jim MorrisAllow TABS in config
2014-02-19 LogxenMerge branch 'switch' into edge
2014-02-07 Jim MorrisMerge pull request #327 from wolfmanjm/upstreamedge
2014-02-07 Jim MorrisAdd Makefile magic to exclude specified modules
2014-01-24 Michael MoonMerge branch 'master' into edge
2013-12-22 Jim MorrisMerge pull request #295 from wolfmanjm/feature/uip...
2013-12-22 Jim MorrisMerge Network code with webserver etc
2013-12-22 Jim MorrisMerge branch 'upstreamedge' into upstream-master
2013-12-14 Jim MorrisMerge pull request #289 from wolfmanjm/upstreamedge
2013-12-13 Jim MorrisAdded M500, M501, M503 to save certain values to a...
2013-11-24 Arthur Wolfincomplete implementation of multi-extruder support...
2013-11-17 Jim MorrisMerge pull request #281 from wolfmanjm/upstreamedge
2013-11-17 Jim Morrisallow leds to be disabled after config loaded
2013-11-07 Jim MorrisMerge pull request #272 from wolfmanjm/upstreamedge
2013-11-07 Jim Morrisset led4 to indicate sd card present or not
2013-11-07 Jim MorrisMerge pull request #269 from wolfmanjm/fix/panel-commands
2013-11-07 Jim MorrisFix panel issuing commands inidle loop ratherthan main...
2013-10-23 Jim MorrisMerge pull request #259 from wolfmanjm/fix/one-second...
2013-10-23 Jim MorrisFix the one second timer
2013-10-21 Michael MoonMerge branch 'feature/cleanup-clock-init' into edge
2013-10-19 Jim MorrisMerge pull request #255 from wolfmanjm/upstreamedge
2013-10-19 Jim Morrisfix a re entrancy bug in panel affecting menu
2013-10-18 Jim MorrisMerge pull request #252 from wolfmanjm/upstreamedge
2013-10-18 Jim Morrisrevert MSD fix
2013-10-11 Jim MorrisMerge pull request #247 from wolfmanjm/upstreamedge
2013-10-11 Jim Morrisdon't create MSD if sdcard is not present
2013-10-03 Jim MorrisMerge pull request #234 from TopherMan/feature/M26
2013-09-22 Jim MorrisMerge pull request #237 from wolfmanjm/upstreamedge
2013-09-22 Jim MorrisClear the config cache just before the main loop starts...
2013-06-23 Jim MorrisMerge pull request #183 from wolfmanjm/add/panel
2013-06-23 Jim Morrisfix tab to space
2013-06-23 Jim MorrisAdded new Panel stuff
2013-06-05 LogxenMerge remote-tracking branch 'upstream/edge' into edge
2013-06-05 arthurwolfMerge pull request #168 from wolfmanjm/feature/add...
2013-06-01 Logxenproperly muxed outputs
2013-05-29 Jim MorrisAdd a version command to simpleshell
2013-05-25 arthurwolfMerge pull request #167 from powertomato/feature/touchprobe
2013-05-21 Stefan KruljTouchprobe-Module first commit. G31 forwards a fake...
next