Merge pull request #1289 from wolfmanjm/feature/add-xy-maxspeed
[clinton/Smoothieware.git] / src / main.cpp
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...
2013-05-18 Stefan KruljMerge branch 'edge' of git://github.com/arthurwolf...
2013-05-13 Michael MoonMerge remote-tracking branch 'fix/USBMSD' into edge
2013-05-08 Michael Moonstrip utf8 nbsp from comments
2013-04-22 Jim MorrisMerge remote-tracking branch 'upstream/edge' into fix...
2013-04-18 Michael Moonmain: fix warning
2013-04-17 Logxenadded commented initializer for connecting sdcard to...
2013-04-15 Arthur WolfMerge branch 'edge' into accel
2013-03-27 Arthur WolfMerge branch 'edge' into accel
2013-03-27 Arthur Wolfmerge edge into master
2013-03-16 Arthur Wolffixing merge conflict
2013-03-15 Arthur WolfMerge branch 'edge' into extruderfix
2013-03-11 Arthur Wolfputting Endstops back into main.cpp
2013-03-11 Arthur WolfMerge branch 'extruderfix' of github.com:arthurwolf...
2013-03-11 Arthur Wolfhoming problem solved ( defaults in Endstops.cpp were...
2013-03-11 LogxenMerge remote-tracking branch 'upstream/edge' into firmc...
2013-03-11 Michael MoonStart message: report system clock frequency
2013-03-06 Michael MoonMerge branch 'edge' into local-firmconfig
2013-03-06 Michael MoonMerge pull request #145 from wolfmanjm/feature/add...
2013-03-06 Jim MorrisMerge remote-tracking branch 'upstream/edge' into featu...
2013-03-06 Michael MoonNew LED behaviour: off = not paused, not running. flash...
2013-02-21 Adam GreenMerge remote-tracking branch 'origin/fix/USBSerial...
2013-02-21 Ben GamariMerge pull request #118 from bgamari/temp-no-irq
2013-02-20 Arthur Wolfdifferenciate accel branch
2013-02-18 Adam GreenMerge branch 'edge' into track_allocs
2013-02-18 Arthur Wolfremoving G90 from main.cpp
2013-02-18 Arthur Wolfthe new Player module was not created in main.cpp,...
2013-02-18 Arthur Wolfcleaning up main.cpp
2013-02-17 arthurwolfMerge pull request #124 from logxen/onboot
2013-02-17 LogxenMerge branch 'edge' into onboot
2013-02-17 LogxenMerge pull request #123 from logxen/button
2013-02-17 LogxenMerge branch 'edge' into button
2013-02-17 LogxenMerge branch 'edge' into onboot
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-02-16 LogxenMerge branch 'edge' into button
2013-02-15 arthurwolfMerge pull request #114 from orcinus/HomingDirection
2013-02-14 LogxenMerge branch 'edge' into rostock2
2013-02-14 LogxenMerge pull request #109 from logxen/edge
2013-02-14 Logxenadded second_usb_serial_enable config option
2013-02-14 Ante VukorepaMerge branch 'edge' of git://github.com/arthurwolf...
2013-02-14 Adam GreenMerge branch 'edge' into track_allocs
2013-02-13 LogxenMerge branch 'edge' into rostock2
2013-02-13 LogxenMerge pull request #108 from logxen/edge
2013-02-13 Logxencommented the second usbserial to simplify life for...
2013-01-28 Arthur Wolfthe laser module now will not take the p21 pin, unless...
2013-01-23 arthurwolfMerge pull request #86 from bgamari/edge
2013-01-23 Michael Moonuse MRI hooks to disable heaters in debug mode
2013-01-18 Michael MoonUSB DFU: keep usb connected while we respond to reset...
2013-01-17 Arthur Wolfversion change
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-15 Michael MoonEvents: add ON_SECOND_TICK event that fires once per...
2013-01-03 Michael MoonMerge branch 'feature/extra-usbserial-interface' into...
2013-01-03 Michael Moonanother USBSerial interface
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 MoonWatchdog: default disabled, currently messes with DFU...
2013-01-02 Michael Moonreinstate configuration of uart0 baudrate, set default...
2013-01-02 Michael Moonreduce debug information sent via UART0
2013-01-02 Michael Moonadd SD card to mbed's list of filesystems
2013-01-02 Michael MoonDFU application mode support
2013-01-02 Michael Moondisable laser module by default, it interferes with...
2013-01-02 Michael Moonset LEDs, say hi
2013-01-02 Michael MoonSDHC support
2013-01-02 Michael Moonclean up something left from rebase
2013-01-02 Michael Moonchange initialisation in main to suit new framework...
2013-01-02 Michael Moonremove old monolithic usb code
next