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

Commit Graph

  • 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
  • 23cb899c5a removed function step_wait() from stepper.cpp AnHardt 2015-01-21 16:30:45 +01:00
  • d9d4a78e0f Add proper delay in stepper.cpp Scott Lahteine 2015-01-21 01:51:29 -08:00
  • d1322dafc9 Add: Example Configuration for Vellemann K8200 - based on new BOARD_K8200 #1391 CONSULitAS 2015-01-20 23:13:44 +01:00
  • 3b50a5e2e6 Add: Board for Vellemann K8200 (derived from 3Drag) CONSULitAS 2015-01-20 20:46:20 +01:00
  • 2d454da3af Update ConfigurationStore.cpp Michael Neumann 2015-01-20 16:21:44 +01:00
  • 4f35de991a Merge pull request #1383 from CONSULitAS/Development Scott Lahteine 2015-01-19 15:59:38 -08:00
  • 91f7cc2e6d Merge pull request #1380 from chertykov/Development Scott Lahteine 2015-01-19 15:43:14 -08:00
  • 22571ca13d Revert "Configuration for Aurora Z605" roglio 2015-01-19 15:02:11 +01:00
  • 935ee968a7 Configuration for Aurora Z605 roglio 2015-01-19 11:18:52 +01:00
  • ccdbeda526 Fixing a build error for melzi and gfx display roglio 2015-01-19 10:43:26 +01:00
  • e13f159343 Update Boards.h for Vellemann K8200 - comment only CONSULitAS 2015-01-19 00:53:17 +01:00
  • 51c7f2fd5a Revert "## Add: Example Configuration for Vellemann K8200" CONSULitAS 2015-01-19 00:37:57 +01:00
  • 5333590ac2 ## Add: Example Configuration for Vellemann K8200 CONSULitAS 2015-01-19 00:28:55 +01:00
  • ba3ac40b9d Remove hardcoded programmer option (-cwiring). Use variable AVRDUDE_PROGRAMMER. Change default value of AVRDUDE_PROGRAMMER to 'wiring'. Denis Chertykov 2015-01-18 20:18:43 +03:00
  • 993bcd370f Merge pull request #1373 from MarlinFirmware/revert-1350-Development daid 2015-01-16 16:48:41 +01:00
  • 53f971095d Revert "Reduce PROGMEM warnings" daid 2015-01-16 16:48:22 +01:00
  • 5c7e38478b Merge pull request #1369 from PxT/patch-1 Bo Herrmannsen 2015-01-16 15:35:42 +01:00
  • 67b597ad46 Update printrboard pin assignments PxT 2015-01-15 19:48:40 -08:00
  • 88fe6777bf Update README.md Bo Herrmannsen 2015-01-16 04:29:12 +01:00
  • 1a2f796dc7 Merge pull request #1368 from MarlinFirmware/revert-1357-SDlib galexander1 2015-01-15 18:52:44 -05:00
  • d4880a9e60 Revert "Move Sd library out into library" galexander1 2015-01-15 18:52:10 -05:00
  • ccdb086fc8 Merge pull request #1363 from PxT/patch-1 Bo Herrmannsen 2015-01-15 10:57:44 +01:00
  • 5151db5c2f Merge pull request #1349 from msutas/patch-2 Bo Herrmannsen 2015-01-15 10:56:31 +01:00
  • 1746b2582b Merge pull request #1332 from Sniffle/Development Bo Herrmannsen 2015-01-15 10:56:17 +01:00
  • 4b51b5a46d Merge pull request #1357 from odewdney/SDlib Bo Herrmannsen 2015-01-15 10:56:07 +01:00
  • f2cb4a3655 Merge pull request #1353 from thawkins/Development Bo Herrmannsen 2015-01-15 10:55:33 +01:00
  • 2d398393bd Merge pull request #1359 from PxT/patch-2 Bo Herrmannsen 2015-01-15 10:54:44 +01:00
  • 9fd4292923 Fixes #1361 PxT 2015-01-13 10:59:50 -08:00
  • d4c8cfe1f2 Update GCodes.md PxT 2015-01-13 09:23:13 -08:00
  • cf50c0eff8 Arduino.h case sensitive include odewdney 2015-01-13 14:30:28 +00:00
  • abdb974d7f Changed dir sep from windows to unix odewdney 2015-01-13 14:22:57 +00:00
  • db3b4d0c98 Add library to build odewdney 2015-01-13 14:19:20 +00:00
  • f84ff4ba7d Move SD Fat library out of main src odewdney 2015-01-13 13:31:55 +00:00
  • ab074dac17 Merge pull request #1344 from grob6000/independent_pid Bo Herrmannsen 2015-01-13 12:10:37 +01:00
  • d4a665694a Merge pull request #1350 from odewdney/Development Bo Herrmannsen 2015-01-13 11:26:50 +01:00
  • b6623a0d49 Merge pull request #1351 from PxT/patch-1 Bo Herrmannsen 2015-01-13 11:26:24 +01:00
  • 9d9c859ac1 First move of SdFat library odewdney 2015-01-13 08:04:32 +00:00
  • 5045d17a39 fix avrdude upload in makefile Tim Hawkins 2015-01-13 13:01:43 +08:00
  • 848475a5b0 Update GCodes.md PxT 2015-01-12 13:28:31 -08:00
  • 3a5a6f42fb Corrected the ABL grid option msutas 2015-01-12 11:07:46 +02:00
  • cd55a93a13 re-add blank line odewdney 2015-01-11 19:22:35 +00:00
  • 23bfe30036 moved include themister to temperature.c odewdney 2015-01-11 18:18:32 +00:00
  • 538859669d Removing compiler warnings for progmem odewdney 2015-01-11 18:14:21 +00:00
  • 46843bd927 adding back notes on servo power Bo Herrmannsen 2015-01-11 14:18:38 +01:00
  • d9cd8e9e69 starting to add back note on ramps servo power Bo Herrmannsen 2015-01-11 14:16:33 +01:00
  • bf2c923db5 Make multiple PID parameters a config option grob6000 2015-01-11 13:50:17 +11:00
  • 0877aa0fe0 Merge remote-tracking branch 'upstream/Development' into independent_pid grob6000 2015-01-11 11:32:58 +11:00