felix/Marlin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Commit Graph

  • 7df9ca051c Merge pull request #1428 from thinkyhead/issue_1388_eeprom Scott Lahteine 2015-01-28 22:58:04 -08:00
  • fe3810f073 yeah, what he said Scott Lahteine 2015-01-28 22:27:15 -08:00
  • 6137bbd484 use eeprom read correctly Scott Lahteine 2015-01-28 22:10:31 -08:00
  • 45805c2b76 Merge pull request #1432 from blubbfish/patch-1 Scott Lahteine 2015-01-28 21:33:24 -08:00
  • 9bc9051405 Flag EEPROM write errors on serial output Scott Lahteine 2015-01-28 21:19:51 -08:00
  • ff99ca3040 Fix alignment of Restore following PIDTEMP Scott Lahteine 2015-01-28 20:48:32 -08:00
  • 6c285930cb Fixing wrong pin to heater extruder 2 <-> 3 Philip Schell 2015-01-28 23:57:22 +01:00
  • 0d4ce27b79 Add pins_WITBOX file Victor Andueza 2015-01-28 17:26:50 +01:00
  • 13118cde33 Add bq Witbox 3D printer Victor Andueza 2015-01-28 16:52:36 +01:00
  • 093fedfde8 Make EEPROM storage consistent Scott Lahteine 2015-01-28 01:08:48 -08:00
  • 34377ee512 Merge pull request #1427 from thinkyhead/fewer_preheat_strings Scott Lahteine 2015-01-27 22:10:08 -08:00
  • 7378a7fef4 Merge pull request #1408 from thinkyhead/cleanup_servo Scott Lahteine 2015-01-27 22:09:04 -08:00
  • 5fbef6bed2 Merge pull request #1409 from thinkyhead/rename_lastnr Scott Lahteine 2015-01-27 22:07:23 -08:00
  • 53eea611b8 Fix MSG_NOZZLE Scott Lahteine 2015-01-27 22:00:32 -08:00
  • d7211a5324 Changes for Portuguese too Scott Lahteine 2015-01-27 21:53:08 -08:00
  • 0a21727c0a Portuguese (pt) and Brazilian Portuguese (pt-br) Scott Lahteine 2015-01-27 21:45:21 -08:00
  • c90f2e77d8 Remove language strings that only add a number Scott Lahteine 2015-01-27 21:36:58 -08:00
  • 34758088c5 Merge pull request #1416 from thinkyhead/cleanup_pins Scott Lahteine 2015-01-27 16:03:28 -08:00
  • 2ce4a102ee Add support for Megatronics 3 a la #1426 Scott Lahteine 2015-01-27 15:54:46 -08:00
  • eacd931fad Merge branch 'cleanup_pins' of https://github.com/thinkyhead/Marlin into cleanup_pins Remote has diverged, so pull Scott Lahteine 2015-01-27 15:50:08 -08:00
  • ae4b348d77 Make sure _Ex_PINS is defined Scott Lahteine 2015-01-27 15:19:03 -08:00
  • 80be6f3f91 tweak tweak Scott Lahteine 2015-01-26 05:18:43 -08:00
  • ebe78cb36f tweak Scott Lahteine 2015-01-26 05:17:08 -08:00
  • 82474fef8a Max endstop pins disabled by configuration Scott Lahteine 2015-01-25 20:08:51 -08:00
  • 8045e4d60d Add support for 4th extruder Scott Lahteine 2015-01-25 19:43:43 -08:00
  • df4f3e7712 cleanup Scott Lahteine 2015-01-25 19:20:25 -08:00
  • b6ecbd8cc4 cleanup Scott Lahteine 2015-01-25 18:50:09 -08:00
  • 4e573134de Cleanup heading Scott Lahteine 2015-01-25 18:42:16 -08:00
  • 574a5ab72a Split up pins to make it more manageable Scott Lahteine 2015-01-25 18:40:00 -08:00
  • b697bb260e Make sure _Ex_PINS is defined Scott Lahteine 2015-01-27 15:19:03 -08:00
  • ab1ddcd89d Merge pull request #1425 from clefranc/Development Scott Lahteine 2015-01-27 14:26:11 -08:00
  • d55c62bf9f Update ConfigurationStore.cpp clefranc 2015-01-27 13:28:37 -05:00
  • e779641c73 Update ConfigurationStore.cpp clefranc 2015-01-27 13:25:47 -05:00
  • baac6e242d Merge pull request #1419 from AnHardt/bootsplash Scott Lahteine 2015-01-27 00:30:29 -08:00
  • a425111eb7 Merge pull request #1421 from blubbfish/patch-2 Scott Lahteine 2015-01-27 00:04:23 -08:00
  • 75cf302da3 example configurations changed to meet Configuration.h AnHardt 2015-01-27 00:01:33 +01:00
  • 61fd45a0c2 Add 4th extruder Philip Schell 2015-01-26 21:22:00 +01:00
  • 2650be4921 Add 4th extruder Philip Schell 2015-01-26 21:21:31 +01:00
  • a9763d894e Add 4th extruder Philip Schell 2015-01-26 21:20:56 +01:00
  • 4949088302 Add 4th extruder Philip Schell 2015-01-26 21:20:04 +01:00
  • fc5204bd42 Add 4th extruder Philip Schell 2015-01-26 21:17:35 +01:00
  • 9834818ef7 Add 4th extruder Philip Schell 2015-01-26 21:16:23 +01:00
  • 8696963154 Add 4th extruder Philip Schell 2015-01-26 21:15:24 +01:00
  • ee8a7419f4 Add 4th extruder Philip Schell 2015-01-26 21:14:18 +01:00
  • e18403235d Add 4th extruder Philip Schell 2015-01-26 21:12:55 +01:00
  • 7baee555f4 Add 4th extruder Philip Schell 2015-01-26 21:11:49 +01:00
  • cebc7daf2a Add 4th extruder Philip Schell 2015-01-26 21:10:42 +01:00
  • ef4c7abb21 Update language_es.h Philip Schell 2015-01-26 21:09:24 +01:00
  • 22e591518a Update language_de.h Philip Schell 2015-01-26 21:08:13 +01:00
  • a20c35bb38 Update language_ca.h Philip Schell 2015-01-26 21:04:31 +01:00
  • dd301be52d Added suport for multiline G-code commands in the LCD menus Jérémie FRANCOIS 2015-01-26 18:50:29 +01:00
  • aa48056c03 Made centering of bootlogo work and removed contraproductiv setScale2x2() in dogm_lcd_implementation.h AnHardt 2015-01-26 17:26:22 +01:00
  • 0d219b3e14 Make centering of STRING_SPLASH work AnHardt 2015-01-26 16:00:10 +01:00
  • 59315330dd Remove definition of VERSION_STRING and replace where usend with STRING_VERSION AnHardt 2015-01-26 15:52:01 +01:00
  • 8c792c7b22 Make STRING_VERSION and VERSION_STRING the same AnHardt 2015-01-26 15:40:44 +01:00
  • a231764523 tweak tweak Scott Lahteine 2015-01-26 05:18:43 -08:00
  • acf4a12fc3 tweak Scott Lahteine 2015-01-26 05:17:08 -08:00
  • 74b40b039a Merge branch 'cleanup_pins' of https://github.com/thinkyhead/Marlin into cleanup_pins Pull for divergence. Scott Lahteine 2015-01-26 05:09:33 -08:00
  • 812fafac80 Max endstop pins disabled by configuration Scott Lahteine 2015-01-25 20:08:51 -08:00
  • a0a97c9c4c cleanup Scott Lahteine 2015-01-25 19:20:25 -08:00
  • aa23e75eb8 Cleanup heading Scott Lahteine 2015-01-25 18:42:16 -08:00
  • 89282ebaa6 Split up pins to make it more manageable Scott Lahteine 2015-01-25 18:40:00 -08:00
  • b87ec5da73 Max endstop pins disabled by configuration Scott Lahteine 2015-01-25 20:08:51 -08:00
  • e5a7f34fa4 Add support for 4th extruder Scott Lahteine 2015-01-25 19:43:43 -08:00
  • 865ca0ef04 Merge pull request #1405 from MagoKimbra/4th-extruders Scott Lahteine 2015-01-25 19:30:51 -08:00
  • b51a583f08 cleanup Scott Lahteine 2015-01-25 19:20:25 -08:00
  • 5347ac2766 cleanup Scott Lahteine 2015-01-25 18:50:09 -08:00
  • b684f7e92b Cleanup heading Scott Lahteine 2015-01-25 18:42:16 -08:00
  • 86f1d1cfc3 Split up pins to make it more manageable Scott Lahteine 2015-01-25 18:40:00 -08:00
  • 3021f7f743 Fix PID_dT MagoKimbra 2015-01-25 17:56:14 +01:00
  • 415d95a298 Merge pull request #1401 from thinkyhead/issue_1379_printrboard_lcd Scott Lahteine 2015-01-24 16:38:09 -08:00
  • a7b02975b7 No TEMP1 or TEMP2 pins for TEENSYLU || PRINTRBOARD Scott Lahteine 2015-01-24 05:10:48 -08:00
  • 3ec0f7cfc0 Merge branch 'issue_1379_printrboard_lcd' of https://github.com/thinkyhead/Marlin into issue_1379_printrboard_lcd Diverged from origin Scott Lahteine 2015-01-24 05:01:26 -08:00
  • 6723388f7f Proposed fix to #1379. Printrboard I2C LCD support Scott Lahteine 2015-01-23 07:42:26 -08:00
  • 09eff0c4db Merge branch 'rename_lastnr' of https://github.com/thinkyhead/Marlin into rename_lastnr Diverged from origin Scott Lahteine 2015-01-24 04:58:11 -08:00
  • 03c9cb60e8 Rename lastnr to autostart_index and... Scott Lahteine 2015-01-23 22:55:13 -08:00
  • ef5959a705 Fix Temperature MagoKimbra 2015-01-24 13:49:29 +01:00
  • 3d4ee6c868 Merge branch '4th-extruders' of https://github.com/MagoKimbra/Marlin into 4th-extruders MagoKimbra 2015-01-24 13:41:15 +01:00
  • 986e723eeb Add 4th extruder MagoKimbra 2015-01-23 23:13:06 +01:00
  • 9552e59306 Merge pull request #1402 from thinkyhead/issue_1227_max6675_spi Scott Lahteine 2015-01-24 04:06:42 -08:00
  • 49765fc75d Merge branch 'issue_1227_max6675_spi' of https://github.com/thinkyhead/Marlin into issue_1227_max6675_spi Branches diverged Scott Lahteine 2015-01-24 03:50:04 -08:00
  • f16bdd2ff2 Borrow from Ultimaker to fix MAX6675 SPI conflict Scott Lahteine 2015-01-23 10:37:39 -08:00
  • 1ed3913333 Rename lastnr to autostart_index and... Scott Lahteine 2015-01-23 22:55:13 -08:00
  • 06c3b37933 Formatting cleanup of quiet sources Scott Lahteine 2015-01-23 22:26:52 -08:00
  • 23fcd1ecb2 Merge pull request #1407 from thinkyhead/cleanup_marlinserial Scott Lahteine 2015-01-23 21:33:43 -08:00
  • fd78902194 Formatting cleanup of quiet sources Scott Lahteine 2015-01-23 21:11:50 -08:00
  • 5c1814383a Merge pull request #1390 from floyd871/Development Scott Lahteine 2015-01-23 20:08:23 -08:00
  • 0ebf896070 Add 4th extruder MagoKimbra 2015-01-23 23:13:06 +01:00
  • a9d7ab9530 Update ConfigurationStore.cpp Michael Neumann 2015-01-23 21:05:27 +01:00
  • a244bcb953 Merge pull request #1403 from thinkyhead/issue_1356 Scott Lahteine 2015-01-23 10:51:39 -08:00
  • 3a9a3e5ed8 Fix Issue #1356 – remove EXTRUDER1_Z_OFFSET Scott Lahteine 2015-01-23 10:51:06 -08:00
  • e770489f27 Borrow from Ultimaker to fix MAX6675 SPI conflict Scott Lahteine 2015-01-23 10:37:39 -08:00
  • 54d5b52a2e Merge pull request #1399 from beanz/use-bed-defines-not-extruder-ones Scott Lahteine 2015-01-23 08:36:25 -08:00
  • 0ce252ba7a This ifdef is for bed code so should use bed constants for testing. Mark Hindess 2015-01-23 10:20:07 +00:00
  • 0218ad45a1 Proposed fix to #1379. Printrboard I2C LCD support Scott Lahteine 2015-01-23 07:42:26 -08:00
  • 9040446780 Merge pull request #1395 from AnHardt/iss1394 Scott Lahteine 2015-01-23 06:58:10 -08:00
  • 25f79c5010 Merge pull request #1391 from CONSULitAS/Development-newBoard_K8200 Scott Lahteine 2015-01-23 06:08:38 -08:00
  • 9ce75ab7de Merge pull request #1386 from roglio/Development Scott Lahteine 2015-01-23 06:00:24 -08:00
  • 99e6ce901b Merge pull request #1393 from thinkyhead/issue_1385_timing Scott Lahteine 2015-01-23 03:33:39 -08:00
  • 15a00a5a7c Add 1µs delay in other appropriate spots Scott Lahteine 2015-01-23 03:24:45 -08:00