bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Commit Graph

  • 6a514f3dc9 Aplied HAS_LCD_CONTRAST also to Marlin_main.cpp AnHardt 2015-04-08 13:26:29 +02:00
  • a76fb42ca6 Merge https://github.com/MarlinFirmware/Marlin into contrast AnHardt 2015-04-08 13:05:21 +02:00
  • bcc04192fc Remove Contrast Menu for U8GLIB_ST7920 AnHardt 2015-04-08 12:56:38 +02:00
  • 98f3130a5c Merge pull request #1865 from thinkyhead/configurator_values Scott Lahteine 2015-04-08 03:13:27 -07:00
  • 4788b59300 Thermistor values for configurator Scott Lahteine 2015-04-08 03:12:21 -07:00
  • bb917ecda8 Merge pull request #1853 from thinkyhead/dev_version Scott Lahteine 2015-04-08 01:57:51 -07:00
  • caa7734402 Merge pull request #1864 from thinkyhead/is_running Scott Lahteine 2015-04-08 01:10:36 -07:00
  • c82da64d10 Merge pull request #1863 from lcfm1/patch-3 Scott Lahteine 2015-04-08 01:07:12 -07:00
  • 3162971cd6 current_position not static Scott Lahteine 2015-04-08 01:05:39 -07:00
  • 27cb90da8b IsStopped / IsRunning inline Scott Lahteine 2015-04-08 00:56:19 -07:00
  • 07fc2b5b70 Update language_ru.h Max 2015-04-08 13:18:45 +06:00
  • 756bb5e268 Cleanup formatting in hitachi & dogm lcd Scott Lahteine 2015-04-07 22:04:10 -07:00
  • 7431ef7e2d Merge branch 'Development' into dev_version Latest upstream commits Scott Lahteine 2015-04-07 21:14:00 -07:00
  • 43773ff735 Formatting and lcd contrast masking Scott Lahteine 2015-04-07 21:11:03 -07:00
  • eb6e3886f4 Set version to "1.0.3 dev" Scott Lahteine 2015-04-07 20:38:43 -07:00
  • cf9b58452c Minimum delay in menu click feedback Scott Lahteine 2015-04-07 20:20:30 -07:00
  • 419f3ebc03 Merge pull request #1850 from OpCode1300/docs Scott Lahteine 2015-04-07 20:14:53 -07:00
  • ff429cdd8a Fix typo in readme Administrator 2015-04-07 23:03:46 -05:00
  • 1d291be2ba Fix de after PREVENT_DANGEROUS_EXTRUDE Scott Lahteine 2015-04-07 20:01:08 -07:00
  • e03da4805b Merge pull request #1774 from epatel/Development Scott Lahteine 2015-04-07 19:24:46 -07:00
  • 5b2c67f4c3 Merge pull request #1847 from thinkyhead/more_configurator Scott Lahteine 2015-04-07 15:41:02 -07:00
  • f7c4e7e19f Fix G29 not deploying in some instances Scott Lahteine 2015-04-07 15:38:29 -07:00
  • a9ed39b12d Moved checks into SanityCheck.h + removed previous added checks. Edward Patel 2015-04-07 22:58:08 +02:00
  • 002340f32c Merge branch 'Development-Marlin' into Development Edward Patel 2015-04-07 22:49:12 +02:00
  • 3db4e0fb5d Merge pull request #1842 from thinkyhead/more_configurator Scott Lahteine 2015-04-06 23:38:20 -07:00
  • c379f17117 Encapsulate setting of homing_bump_feedrate Scott Lahteine 2015-04-06 23:21:33 -07:00
  • 7d2c2f1790 Updates for the configurator Scott Lahteine 2015-04-06 23:16:01 -07:00
  • 967db181d0 Latest upstream commits Scott Lahteine 2015-04-06 21:46:18 -07:00
  • e502144eda Fixup formatting of last commit Scott Lahteine 2015-04-06 21:28:14 -07:00
  • d05efa008d Merge pull request #1825 from shaggythesheep/bugfix_no_heaters Scott Lahteine 2015-04-06 21:25:22 -07:00
  • d20f42c883 Don't stow the probe until the last grid point! Scott Lahteine 2015-04-06 20:58:09 -07:00
  • 5c2bb05af3 Merge pull request #1839 from AnHardt/fix-statusmessage Scott Lahteine 2015-04-06 19:08:25 -07:00
  • d70a4a3847 Merge pull request #1823 from AnHardt/splashscreen Scott Lahteine 2015-04-06 18:48:48 -07:00
  • 56aea5f8e5 Merge pull request #1829 from Natealus/Development Scott Lahteine 2015-04-06 18:19:33 -07:00
  • 6a860b99dc Merge pull request #1828 from Wackerbarth/Configurator Scott Lahteine 2015-04-06 18:09:26 -07:00
  • ac843fbf3b Fix lcd_status_message AnHardt 2015-04-07 02:33:34 +02:00
  • 6d084c017f Fix typo in FWRETRACT handler Scott Lahteine 2015-04-06 17:04:22 -07:00
  • ed7a2f9fac Merge pull request #1827 from thinkyhead/fixup_dualz Scott Lahteine 2015-04-06 16:34:04 -07:00
  • d27c82a450 Added check for Delta printers in Mesh, #error not yet supported. Edward Patel 2015-04-06 23:03:06 +02:00
  • 9a093b2e8f Added #error + mention not to enable ABL and Mesh at the same time Edward Patel 2015-04-06 19:38:59 +02:00
  • 6ae714894e Now the simplycistic solution. AnHardt 2015-04-06 12:43:38 +02:00
  • d521693641 Revert "Draw content in display loop only when needed" AnHardt 2015-04-06 12:31:31 +02:00
  • b6f2bff461 Azteeg X3 Pro Pin fix ups Natealus 2015-04-05 23:34:56 -06:00
  • d867c18535 Fix compile error with Z_DUAL_ENDSTOPS Scott Lahteine 2015-04-05 03:44:47 -07:00
  • 46474cf2f2 Incorporate @section headers from configurator Richard Wackerbarth 2015-04-04 06:15:42 -05:00
  • cf66cb8808 Bring configurator up-to-date Richard Wackerbarth 2015-04-04 05:36:35 -05:00
  • 1a5293c2ce Prevents MINTEMP / MAXTEMP when no heaters present Richard Miles 2015-04-05 22:27:14 +01:00
  • 5360158545 Merge branch 'Development-Marlin' into Development Edward Patel 2015-04-05 20:28:44 +02:00
  • bf04a92cc0 Draw content in display loop only when needed AnHardt 2015-04-05 12:53:20 +02:00
  • 9865318f1c Disable splash-screen when done once AnHardt 2015-04-05 12:24:01 +02:00
  • f5dad8ade2 Merge pull request #1819 from thinkyhead/fixup_probing Scott Lahteine 2015-04-04 20:19:44 -07:00
  • 53eb662908 Have the configurator read from MarlinFirmware repo Scott Lahteine 2015-04-04 20:19:17 -07:00
  • d24ea7c03f Added Comment in hope of github seeing these updates Edward Patel 2015-04-05 05:14:06 +02:00
  • 61de6ecd54 Added change to example Configuration.h's Edward Patel 2015-04-05 04:26:35 +02:00
  • 2f0081bbb5 Compile error fix! Fix for merge artifacts. Edward Patel 2015-04-05 04:16:16 +02:00
  • 0e6514e7bd Bug fix! Missed putting z value back in right slot after zigzag mod. Edward Patel 2015-04-05 04:13:34 +02:00
  • ea10601406 Merge branch 'Development-Marlin' into Development Edward Patel 2015-04-05 04:06:02 +02:00
  • cb02bc6db4 Merge pull request #1817 from AnHardt/dogm_looptest Scott Lahteine 2015-04-04 17:29:56 -07:00
  • f3597cf55a Merge pull request #1818 from quillford/patch-1 Scott Lahteine 2015-04-04 16:27:33 -07:00
  • b02a55e60f Fixed scara directions quillford 2015-04-04 15:26:35 -07:00
  • 6c5f07c5cb Merge pull request #1813 from thinkyhead/fixup_probing Scott Lahteine 2015-04-04 14:41:43 -07:00
  • 340d165a9c Reduce display updates for dogm displays AnHardt 2015-04-04 22:02:24 +02:00
  • 418d22d7b3 Revert "Testloop cleanup" AnHardt 2015-04-04 18:33:36 +02:00
  • 6361404b91 Testloop cleanup AnHardt 2015-04-04 17:56:13 +02:00
  • 6d4b3f0d6a Move the condition before the loop AnHardt 2015-04-04 17:49:39 +02:00
  • 4cb7dfc546 Move the 'alive dot' in every displayloop AnHardt 2015-04-04 17:34:28 +02:00
  • b0f198c153 heater_index above its use Scott Lahteine 2015-04-04 06:18:08 -07:00
  • 3d01492228 Update README.md Bo Herrmannsen 2015-04-04 15:07:36 +02:00
  • bf5dbb90c4 Update README.md Bo Herrmannsen 2015-04-04 15:06:13 +02:00
  • 60f8e0386f More thermal runaway states Scott Lahteine 2015-04-04 05:45:36 -07:00
  • f9dbd73652 Fix tr_target_temperature type - float! Scott Lahteine 2015-04-04 05:25:53 -07:00
  • c83faa9c5e Merge pull request #1811 from thinkyhead/fixup_probing Scott Lahteine 2015-04-04 05:14:59 -07:00
  • cabd713610 Update README.md Bo Herrmannsen 2015-04-04 14:12:36 +02:00
  • f39e5988a3 Update README.md Bo Herrmannsen 2015-04-04 14:09:59 +02:00
  • 20a047b8c5 Update README.md Bo Herrmannsen 2015-04-04 14:09:39 +02:00
  • a5e9263987 Update README.md Bo Herrmannsen 2015-04-04 14:08:30 +02:00
  • 506a42338b Update README.md Bo Herrmannsen 2015-04-04 14:07:59 +02:00
  • 2f189be2e4 Update README.md Bo Herrmannsen 2015-04-04 14:07:20 +02:00
  • 1836aa2615 Update README.md Bo Herrmannsen 2015-04-04 14:02:58 +02:00
  • 61f8394361 Compare indices instead of floats for probe actions Scott Lahteine 2015-04-04 05:01:16 -07:00
  • a98183b463 Merge pull request #1809 from Wackerbarth/LanguageCleanup Scott Lahteine 2015-04-04 04:37:20 -07:00
  • 41ded7e996 Merge pull request #1805 from thinkyhead/fixup_probing Scott Lahteine 2015-04-04 03:49:54 -07:00
  • 4119738e69 Deferring default definition made #undef unnecessary Richard Wackerbarth 2015-04-04 05:41:02 -05:00
  • 6f06d33be5 Fix missing refresh_cmd_timeout function Scott Lahteine 2015-04-04 03:47:25 -07:00
  • 2d099a2c70 Fix missing backslash in macro Scott Lahteine 2015-04-04 03:35:16 -07:00
  • 0f9b29e6c5 Merge pull request #1803 from Natealus/Development Scott Lahteine 2015-04-03 23:45:05 -07:00
  • 0935084141 Fix manage_inactivity Scott Lahteine 2015-04-03 23:42:50 -07:00
  • c065da52ec Spacing and spelling Scott Lahteine 2015-04-03 22:54:48 -07:00
  • a3e129e091 Merge pull request #1801 from thinkyhead/fixup_probing Scott Lahteine 2015-04-03 22:30:01 -07:00
  • e8a711994a Merge pull request #1802 from Natealus/Development Scott Lahteine 2015-04-03 22:14:12 -07:00
  • ab11f90da0 Z_PROBE_ENDSTOP Pin for Azteeg X3 Pro Natealus 2015-04-03 23:14:03 -06:00
  • 8680b515b0 Fix missing tmp_extruder -> target_extruder Scott Lahteine 2015-04-03 22:12:49 -07:00
  • a6ba40ae48 Compiling error temperature.cpp with multiple extruders defined Natealus 2015-04-03 23:09:31 -06:00
  • fc3c76fc16 Fix #1800 Scott Lahteine 2015-04-03 22:04:42 -07:00
  • c185912c19 Latest upstream commits, mostly Scott Lahteine 2015-04-03 21:58:48 -07:00
  • 1e5c18bb14 Add code_value_short and SERIAL_CHAR Scott Lahteine 2015-04-03 21:43:30 -07:00
  • e0d4368cb5 Minor code cleanup, move NUM_AXIS out of config Scott Lahteine 2015-04-03 20:45:24 -07:00
  • 4c7af484f8 Merge pull request #1787 from thinkyhead/fixup_tr Scott Lahteine 2015-04-03 20:06:56 -07:00
  • c747becec1 Merge pull request #1796 from thinkyhead/pidbed_temp_eeprom Scott Lahteine 2015-04-03 20:03:38 -07:00
  • 369a497300 Merge pull request #1797 from quillford/Development Scott Lahteine 2015-04-03 19:58:09 -07:00