Commit Graph

  • 56aea5f8e5 Merge pull request #1829 from Natealus/Development Scott Lahteine 2015-04-06 18:19:33 -0700
  • 6a860b99dc Merge pull request #1828 from Wackerbarth/Configurator Scott Lahteine 2015-04-06 18:09:26 -0700
  • ac843fbf3b Fix lcd_status_message AnHardt 2015-04-07 02:33:34 +0200
  • 6d084c017f Fix typo in FWRETRACT handler Scott Lahteine 2015-04-06 17:04:22 -0700
  • ed7a2f9fac Merge pull request #1827 from thinkyhead/fixup_dualz Scott Lahteine 2015-04-06 16:34:04 -0700
  • d27c82a450 Added check for Delta printers in Mesh, #error not yet supported. Edward Patel 2015-04-06 23:03:06 +0200
  • 9a093b2e8f Added #error + mention not to enable ABL and Mesh at the same time Edward Patel 2015-04-06 19:38:59 +0200
  • 6ae714894e Now the simplycistic solution. AnHardt 2015-04-06 12:43:38 +0200
  • d521693641 Revert "Draw content in display loop only when needed" AnHardt 2015-04-06 12:31:31 +0200
  • b6f2bff461 Azteeg X3 Pro Pin fix ups Natealus 2015-04-05 23:34:56 -0600
  • d867c18535 Fix compile error with Z_DUAL_ENDSTOPS Scott Lahteine 2015-04-05 03:44:47 -0700
  • 46474cf2f2 Incorporate @section headers from configurator Richard Wackerbarth 2015-04-04 06:15:42 -0500
  • cf66cb8808 Bring configurator up-to-date Richard Wackerbarth 2015-04-04 05:36:35 -0500
  • 1a5293c2ce Prevents MINTEMP / MAXTEMP when no heaters present Richard Miles 2015-04-05 22:27:14 +0100
  • 5360158545 Merge branch 'Development-Marlin' into Development Edward Patel 2015-04-05 20:28:44 +0200
  • bf04a92cc0 Draw content in display loop only when needed AnHardt 2015-04-05 12:53:20 +0200
  • 9865318f1c Disable splash-screen when done once AnHardt 2015-04-05 12:24:01 +0200
  • f5dad8ade2 Merge pull request #1819 from thinkyhead/fixup_probing Scott Lahteine 2015-04-04 20:19:44 -0700
  • 53eb662908 Have the configurator read from MarlinFirmware repo Scott Lahteine 2015-04-04 20:19:17 -0700
  • d24ea7c03f Added Comment in hope of github seeing these updates Edward Patel 2015-04-05 05:14:06 +0200
  • 61de6ecd54 Added change to example Configuration.h's Edward Patel 2015-04-05 04:26:35 +0200
  • 2f0081bbb5 Compile error fix! Fix for merge artifacts. Edward Patel 2015-04-05 04:16:16 +0200
  • 0e6514e7bd Bug fix! Missed putting z value back in right slot after zigzag mod. Edward Patel 2015-04-05 04:13:34 +0200
  • ea10601406 Merge branch 'Development-Marlin' into Development Edward Patel 2015-04-05 04:06:02 +0200
  • cb02bc6db4 Merge pull request #1817 from AnHardt/dogm_looptest Scott Lahteine 2015-04-04 17:29:56 -0700
  • f3597cf55a Merge pull request #1818 from quillford/patch-1 Scott Lahteine 2015-04-04 16:27:33 -0700
  • b02a55e60f Fixed scara directions quillford 2015-04-04 15:26:35 -0700
  • 6c5f07c5cb Merge pull request #1813 from thinkyhead/fixup_probing Scott Lahteine 2015-04-04 14:41:43 -0700
  • 340d165a9c Reduce display updates for dogm displays AnHardt 2015-04-04 22:02:24 +0200
  • 418d22d7b3 Revert "Testloop cleanup" AnHardt 2015-04-04 18:33:36 +0200
  • 6361404b91 Testloop cleanup AnHardt 2015-04-04 17:56:13 +0200
  • 6d4b3f0d6a Move the condition before the loop AnHardt 2015-04-04 17:49:39 +0200
  • 4cb7dfc546 Move the 'alive dot' in every displayloop AnHardt 2015-04-04 17:34:28 +0200
  • b0f198c153 heater_index above its use Scott Lahteine 2015-04-04 06:18:08 -0700
  • 3d01492228 Update README.md Bo Herrmannsen 2015-04-04 15:07:36 +0200
  • bf5dbb90c4 Update README.md Bo Herrmannsen 2015-04-04 15:06:13 +0200
  • 60f8e0386f More thermal runaway states Scott Lahteine 2015-04-04 05:45:36 -0700
  • f9dbd73652 Fix tr_target_temperature type - float! Scott Lahteine 2015-04-04 05:25:53 -0700
  • c83faa9c5e Merge pull request #1811 from thinkyhead/fixup_probing Scott Lahteine 2015-04-04 05:14:59 -0700
  • cabd713610 Update README.md Bo Herrmannsen 2015-04-04 14:12:36 +0200
  • f39e5988a3 Update README.md Bo Herrmannsen 2015-04-04 14:09:59 +0200
  • 20a047b8c5 Update README.md Bo Herrmannsen 2015-04-04 14:09:39 +0200
  • a5e9263987 Update README.md Bo Herrmannsen 2015-04-04 14:08:30 +0200
  • 506a42338b Update README.md Bo Herrmannsen 2015-04-04 14:07:59 +0200
  • 2f189be2e4 Update README.md Bo Herrmannsen 2015-04-04 14:07:20 +0200
  • 1836aa2615 Update README.md Bo Herrmannsen 2015-04-04 14:02:58 +0200
  • 61f8394361 Compare indices instead of floats for probe actions Scott Lahteine 2015-04-04 05:01:16 -0700
  • a98183b463 Merge pull request #1809 from Wackerbarth/LanguageCleanup Scott Lahteine 2015-04-04 04:37:20 -0700
  • 41ded7e996 Merge pull request #1805 from thinkyhead/fixup_probing Scott Lahteine 2015-04-04 03:49:54 -0700
  • 4119738e69 Deferring default definition made #undef unnecessary Richard Wackerbarth 2015-04-04 05:41:02 -0500
  • 6f06d33be5 Fix missing refresh_cmd_timeout function Scott Lahteine 2015-04-04 03:47:25 -0700
  • 2d099a2c70 Fix missing backslash in macro Scott Lahteine 2015-04-04 03:35:16 -0700
  • 0f9b29e6c5 Merge pull request #1803 from Natealus/Development Scott Lahteine 2015-04-03 23:45:05 -0700
  • 0935084141 Fix manage_inactivity Scott Lahteine 2015-04-03 23:42:50 -0700
  • c065da52ec Spacing and spelling Scott Lahteine 2015-04-03 22:54:48 -0700
  • a3e129e091 Merge pull request #1801 from thinkyhead/fixup_probing Scott Lahteine 2015-04-03 22:30:01 -0700
  • e8a711994a Merge pull request #1802 from Natealus/Development Scott Lahteine 2015-04-03 22:14:12 -0700
  • ab11f90da0 Z_PROBE_ENDSTOP Pin for Azteeg X3 Pro Natealus 2015-04-03 23:14:03 -0600
  • 8680b515b0 Fix missing tmp_extruder -> target_extruder Scott Lahteine 2015-04-03 22:12:49 -0700
  • a6ba40ae48 Compiling error temperature.cpp with multiple extruders defined Natealus 2015-04-03 23:09:31 -0600
  • fc3c76fc16 Fix #1800 Scott Lahteine 2015-04-03 22:04:42 -0700
  • c185912c19 Latest upstream commits, mostly Scott Lahteine 2015-04-03 21:58:48 -0700
  • 1e5c18bb14 Add code_value_short and SERIAL_CHAR Scott Lahteine 2015-04-03 21:43:30 -0700
  • e0d4368cb5 Minor code cleanup, move NUM_AXIS out of config Scott Lahteine 2015-04-03 20:45:24 -0700
  • 4c7af484f8 Merge pull request #1787 from thinkyhead/fixup_tr Scott Lahteine 2015-04-03 20:06:56 -0700
  • c747becec1 Merge pull request #1796 from thinkyhead/pidbed_temp_eeprom Scott Lahteine 2015-04-03 20:03:38 -0700
  • 369a497300 Merge pull request #1797 from quillford/Development Scott Lahteine 2015-04-03 19:58:09 -0700
  • 84e4edaea7 Add M48 comment for #1794 Scott Lahteine 2015-04-03 19:52:00 -0700
  • 9ba55baa5b Track target temperature separately for each heater Scott Lahteine 2015-04-03 19:42:40 -0700
  • 528e32a1d4 Fix timeout in thermal_runaway when temperature is set higher Scott Lahteine 2015-04-03 19:34:55 -0700
  • b98ebd517e disable / enable_all_steppers functions Scott Lahteine 2015-04-03 19:25:22 -0700
  • 713953d8c1 Upstream commits, allow no extruder in M105 Scott Lahteine 2015-04-03 19:16:38 -0700
  • 8f893eb8df Merge pull request #1798 from thinkyhead/fixup_probing Scott Lahteine 2015-04-03 19:03:00 -0700
  • dde7e11f8e Merge branch 'Development' into fixup_tr Latest upstream commits Scott Lahteine 2015-04-03 18:56:52 -0700
  • abd7fc36b6 Fix probe height at G28 start Scott Lahteine 2015-04-03 18:54:55 -0700
  • 610c8c5471 Merge pull request #1795 from thinkyhead/fixup_probing Scott Lahteine 2015-04-03 18:44:44 -0700
  • 1ad5fb1178 Fixed README typos quillford 2015-04-03 18:36:01 -0700
  • e4934164e4 Merge pull request #1790 from Wurstnase/fix_home_z Scott Lahteine 2015-04-03 18:35:09 -0700
  • a469d796e1 Add cleanups needed for #1772 Scott Lahteine 2015-04-03 18:14:57 -0700
  • c0ca26cd50 Merge branch 'Development' into fixup_probing Latest upstream commits Scott Lahteine 2015-04-03 18:05:17 -0700
  • 5c1f08a35f Merge pull request #1772 from croadfeldt/Merge_cleanup Scott Lahteine 2015-04-03 18:04:31 -0700
  • db7b0ea0cf Merge pull request #1569 from Wackerbarth/Development Scott Lahteine 2015-04-03 16:56:31 -0700
  • 92119d0f7d Static delta[] for SCARA Scott Lahteine 2015-04-03 16:46:56 -0700
  • 007a4bd421 Adjust spacing in view function Scott Lahteine 2015-04-03 16:41:58 -0700
  • 424d5495e4 Add PIDTEMPBED to EEPROM Scott Lahteine 2015-04-03 16:38:05 -0700
  • 6b919e14c1 Group all universal variables Scott Lahteine 2015-04-03 15:45:41 -0700
  • 21cd2e4fae Merge branch 'Development' into fixup_probing Latest upstream commits Scott Lahteine 2015-04-03 15:32:15 -0700
  • 0e8182bbf2 Additional pin tests, cleanup Scott Lahteine 2015-04-03 15:31:35 -0700
  • e8700bd1e2 Merge pull request #1788 from AnHardt/iss1786 Scott Lahteine 2015-04-03 15:14:58 -0700
  • 45565b680d second wrong feedrate Wurstnase 2015-04-03 18:01:28 +0200
  • 581b2aae04 fix feedrate for homing z Wurstnase 2015-04-03 16:11:32 +0200
  • 48b1c3822f Merge branch 'Development-Marlin' into Development Edward Patel 2015-04-03 00:46:30 +0200
  • 8f620de0ff Actually activate Automatic Versioning Richard Wackerbarth 2015-02-11 09:00:33 -0600
  • ccdaea51ba Add KosselPro Richard Wackerbarth 2015-04-02 08:15:55 -0500
  • f4599143eb Allow M115 to better reflect the build Richard Wackerbarth 2015-02-06 10:17:17 -0600
  • a33e20b27d Adjust per-project .gitignore Richard Wackerbarth 2015-02-06 09:58:04 -0600
  • 34c7d45879 Hook for Auto-generated Build Version Richard Wackerbarth 2015-02-06 10:30:43 -0600
  • c756b4cf07 Comment tweak Scott Lahteine 2015-04-02 06:11:03 -0700
  • 23cd54755f Fix typo in Marlin_main.cpp AnHardt 2015-04-02 14:50:31 +0200
  • e96df67630 Clarify thermal_runaway_protection Scott Lahteine 2015-04-02 05:10:14 -0700