Commit Graph

Select branches

Hide Pull Requests

master

2.0.5.3_Merge

2.0.7.2_Merge

2.0.7_Merge

2.1.2

Mono Color

• 5de25ccd20 Add Motherboard variant 64 - STB V1.1 Dirk Eichel 2013-03-01 17:39:54 +01:00
• d6ce63c49c Merge pull request #411 from STB3/Marlin_w_STB_Board_support daid 2013-03-18 07:57:39 -07:00
• f036be7c4e Clean up tab/whitespace from last commit Ketil Froyn 2013-03-16 23:11:58 +01:00
• 07e11c7cf5 Add command M928 to enable logging to file of received gcode commands Ketil Froyn 2013-03-16 23:02:57 +01:00
• 92782f9252 Merge pull request #1 from illuminarti/Fix_E_Speed daid 2013-03-15 01:03:53 -07:00
• 6a61a3c0b4 missing comma in last commit whosawhatsis 2013-03-08 16:15:49 -08:00
• f0aee4101a regenerated thermistor table 7 whosawhatsis 2013-03-08 13:41:49 -08:00
• aba67e2449 No bed config for RAMPS Nicolas Rossi 2013-03-05 15:51:24 +01:00
• 6504e96165 Turn off power supply off-load Nicolas Rossi 2013-03-05 15:03:48 +01:00
• 86bf911139 Toggle menu for PSU from LCD pannel Nicolas Rossi 2013-03-05 14:52:51 +01:00
• 7bad72359c Support encoder click on PANELOLU2 being read through I2C Robert F-C 2013-03-03 18:47:50 +11:00
• 1daf2f3256 Number of extruders is not an advanced configuration - it is a basic property. Robert F-C 2013-03-02 16:14:19 +11:00
• f1263d3f88 Further reduce code by using precompiler logic Robert F-C 2013-03-02 16:12:11 +11:00
• 140e095c6e Add pins for Motherboard variant 64 Dirk Eichel 2013-03-01 17:47:32 +01:00
• b2c1c64fb1 Add Motherboard variant 64 - STB V1.1 Dirk Eichel 2013-03-01 17:39:54 +01:00
• ceb5ee38af Replaced corrupted language.h file on local PC with current from ErikZalm/Marlin Dirk Eichel 2013-03-01 17:27:57 +01:00
• 8efd4cfd73 fixed merge conflict Dirk Eichel 2013-03-01 16:27:35 +01:00
• b3ebb71704 Merge pull request #408 from STB3/Marlin_with_ATmega1284p_Sanguino_on_023_support daid 2013-03-01 06:08:18 -08:00
• 372e12f83f Implement automatic extruder/cold-end fan control based on temperature Robert F-C 2013-03-01 21:57:23 +11:00
• 6beb42cdf6 Attempt to address Bernhard's comments Robert F-C 2013-03-01 01:17:07 +11:00
• f991bf23b2 Add bootloader files for ATmega1284/Sanguino Dirk Eichel 2013-02-27 22:34:36 +01:00
• 5bfba7720e Switched to Sanguino 0023r4 Dirk Eichel 2013-02-27 22:29:46 +01:00
• a069d30a4b Add additional Sanguino bard versions to boards.txt Dirk Eichel 2013-02-27 22:17:42 +01:00
• 839bef6d5d Fix Configuration.h file to not define LCDs be default. Robert F-C 2013-02-28 02:32:20 +11:00
• 1292d735ba Converge all I2C LCD branches (PANELOLU2, VIKI & PCF8575) Robert F-C 2013-02-28 02:04:51 +11:00
• 4eb81a69e6 Only compile the new extruder offset code if you have multiple extruders. daid303 2013-02-27 12:32:07 +01:00
• 3e9cd334a4 Merge pull request #383 from dob71/jeff daid 2013-02-27 03:10:18 -08:00
• 67710df9f3 Made i2c mode wok with the hardware I am able to test (ywrobot / sainsmart i2c LCD 2004) MendelMax 2013-02-26 22:22:12 +00:00
• b6209c86dd Added import of Wire Library to make I2C LCD support compilable Bob Clough 2013-02-25 15:15:23 +00:00
• 2b567d1df5 Added I2C port expander support to HD44780 Bob Clough 2013-02-25 14:22:14 +00:00
• 06272f463d Added Config variables for activating I2C LCDs and setting type and address Bob Clough 2013-02-25 14:14:46 +00:00
• 83e33bdd26 Added LiquidCrystal_I2C library to ArduinoAddons Bob Clough 2013-02-25 14:01:48 +00:00
• de3dec7215 Also show the tune menu when USB printing. daid303 2013-02-20 00:54:44 +01:00
• 73d41c10b9 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into jeff Denis Bakin 2013-02-18 12:10:52 -05:00
• 63da4dc59a Merge pull request #398 from DanieleSdei/Marlin_v1 daid 2013-02-16 15:41:43 -08:00
• 7eb9811958 Merge pull request #397 from codenamepawel/patch-1 daid 2013-02-16 15:41:07 -08:00
• 82e28851bd Italian language: SD-Card change and SD-Card init Daniele Sdei 2013-02-16 12:17:11 +01:00
• aed5965ad8 Italian language: remove space and some fix Daniele Sdei 2013-02-15 23:30:25 +01:00
• d360846dd4 Update Marlin/language.h codenamepawel 2013-02-16 03:42:53 +01:00
• 2f60e324dc Fixed #394 daid303 2013-02-14 14:04:26 +01:00
• 5e2abfcdcd Merge pull request #391 from STB3/Marlin_with_SD-Card_Change_Menu daid 2013-02-13 08:56:00 -08:00
• fa5c45f515 Merge pull request #392 from mfeherpataky/Marlin_v1 daid 2013-02-13 08:54:58 -08:00
• a0d4e8e78e Add Messages for SD Card init. & change Dirk Eichel 2013-02-13 10:05:18 +01:00
• bbf0cc1379 Update Marlin/ultralcd_implementation_hitachi_HD44780.h mfeherpataky 2013-02-12 20:06:51 +01:00
• c8f1fbd9d8 Add SD-Card change and SD-Card init. Dirk Eichel 2013-02-12 17:35:46 +01:00
• be91fb9b47 Merge pull request #389 from mfeherpataky/Marlin_v1 daid 2013-02-12 07:56:15 -08:00
• 71ddb8dc60 Update Marlin/ultralcd_implementation_hitachi_HD44780.h mfeherpataky 2013-02-12 00:03:40 +01:00
• d2c547c407 Update Marlin/ultralcd_implementation_hitachi_HD44780.h mfeherpataky 2013-02-11 23:25:24 +01:00
• 70871715e4 Added support for extruder offset handling Denis B 2013-02-04 23:05:45 -05:00
• 49b2ddc8c1 Cleaned up non-standard characters Denis B 2013-02-04 01:41:40 -05:00
• f8876a7958 Merge pull request #376 from kintel/skip_longfilenames Bernhard Kubicek 2013-02-03 03:05:31 -08:00
• 18fcc367d2 Merge pull request #371 from Banjer/Melzi_LED_PIN daid 2013-02-02 03:23:43 -08:00
• 6b78edf7c5 Merge pull request #374 from kintel/quickstop daid 2013-02-01 13:54:12 -08:00
• 19ce90fe02 Added comment about M42 usage (clean) Bas Spaans 2013-01-31 18:20:23 +01:00
• 00fed0a703 Revert "Extended comment explaining M42 usage" Bas Spaans 2013-01-31 18:11:13 +01:00
• e06d820909 Also skip .files and _files with long filenames Marius Kintel 2013-01-31 12:07:14 -05:00
• 01541ee64c Extended comment explaining M42 usage Bas Spaans 2013-01-31 18:00:25 +01:00
• f24f02e212 compile fix: quickStop() needs stepper.h Marius Kintel 2013-01-31 10:43:03 -05:00
• 12c41423ad Fixed typo in comment Bas Spaans 2013-01-30 22:54:04 +01:00
• 0995eaa492 Chenged LED_PIN for Melzi boards, added comment about broken versions of the Sanguino libraries Bas Spaans 2013-01-30 22:12:47 +01:00
• 1d06b10962 Added a feature to have filament change by gcode or display trigger. [default off for now] syntax: M600 X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal] Bernhard 2013-01-27 13:21:34 +01:00
• 408b349a84 Fixed #368. Commented out the wrong pin definition, but explained why it is there. daid303 2013-01-21 15:46:17 +01:00
• 236bb2c110 Merge pull request #365 from DanieleSdei/Marlin_v1 daid 2013-01-14 08:29:55 -08:00
• 9ecb267b63 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 Daniele Sdei 2013-01-14 15:47:40 +01:00
• 3cf59f6f9a add RepRapPro Huxley thermistor tables Daniele Sdei 2012-12-30 12:09:38 +01:00
• c1730e2b08 Merge pull request #363 from yuroller/sanguino_panelolu daid 2013-01-10 07:19:37 -08:00
• 86358dd6cd Panelolu pin assignment for sanguinololu from http://reprap.org/wiki/Panelolu Yuri Valentini 2013-01-10 12:23:20 +01:00
• 0f3f5d083d Minor cleanup of the new FAN_KICKSTART code. #334 daid303 2013-01-10 11:08:45 +01:00
• 6ec56fa923 Merge pull request #334 from KevinOConnor/FanKick daid 2013-01-09 02:47:59 -08:00
• 965baf2683 Merge pull request #362 from daid/Marlin_v1 daid 2013-01-09 02:42:09 -08:00
• 4fde836d83 Merge pull request #8 from randomev/Marlin_v1 daid 2013-01-09 02:39:43 -08:00
• 3d91bd486c Add "kick fan" feature - briefly run fan at full speed on start. Kevin O'Connor 2012-12-09 23:47:52 -05:00
• 3f2f94ef28 Be consistent in setting of the fan PWM. Kevin O'Connor 2012-12-09 22:28:09 -05:00
• 7f30039d2a + Finnish translation Henry Palonen 2013-01-08 19:21:34 +02:00
• 14e1d495ef Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 daid303 2013-01-08 17:10:30 +01:00
• bbe7d3d0fe Fixed #312 daid303 2013-01-08 17:09:57 +01:00
• 7ce509b9a7 Merge pull request #361 from yuroller/MakefileSanguino daid 2013-01-08 06:22:27 -08:00
• 9c34c4f05b fixes for ramps compilation using installed arduino ide Yuri Valentini 2013-01-08 12:54:31 +01:00
• 442ade15a6 Move Gen6 stuff into a proper location. daid303 2013-01-08 12:31:28 +01:00
• 5fd4582cc8 Merge pull request #242 from Drakelive/Marlin_v1 daid 2013-01-08 03:29:20 -08:00
• 8b88e3b386 Fixed #345, Fixed #267. daid303 2013-01-08 12:14:55 +01:00
• 27843388c6 Merge pull request #360 from njprossi/Marlin_v1 daid 2013-01-08 02:58:02 -08:00
• bfa5bb86e4 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 daid303 2013-01-08 11:54:13 +01:00
• 921273baa0 Added optional feature to stop printing when an endstop is hit. Made the Z display on the LCD in 3.2 format instead of 3.1. Added LCD message when and endstop is hit. daid303 2013-01-08 11:53:18 +01:00
• 7d20ec706e Added libraries from Arduino 1.0.3 for sanguino build Yuri Valentini 2013-01-07 17:26:50 +01:00
• 437eb3bafc Initialize PS_ON at startup Nicolas Rossi 2013-01-07 14:57:51 +01:00
• f3c1fc70a9 Power signal control definitions for ATX and others Nicolas Rossi 2013-01-07 14:33:30 +01:00
• dad7691df9 makefile for sanguino standalone compilation Yuri Valentini 2013-01-07 11:08:10 +01:00
• 6752cb2d9c PID now per extruder. Fixed typo Erik vd Zalm 2013-01-06 14:26:23 +01:00
• 0ac452e252 Disable is now multi extruder compatible. M84 got a T option. Erik vd Zalm 2013-01-06 13:37:01 +01:00
• 3a1cd30ce1 Merge pull request #358 from yuroller/sanguino_spi daid 2013-01-04 11:53:10 -08:00
• 69582042d7 Definitions for Sanguino SPI Yuri Valentini 2013-01-04 18:32:08 +01:00
• 9e7b5056a0 {X,Y,Z}_{MIN,MAX}_POS are actually in Gcode coordinates. Johann Rocholl 2012-12-28 16:20:10 -08:00
• 5f82f03ff3 Add italian MSG_RESUMING. Daniele Sdei 2012-12-28 11:44:35 +01:00
• 5e3873c8db Add german MSG_RESUMING. daid303 2012-12-25 20:53:11 +01:00
• 01aac2a142 Small changes on the LCD panel, let the speed control work better, line up the parameter edit the same as the menu, remove some unused defines, and remove the Z from the 10mm move menu. daid303 2012-12-21 16:14:47 +01:00
• b69cb9fbd9 Change the end of SD cart print message from minutes/seconds to hours/minutes. daid303 2012-12-19 12:26:40 +01:00
• 30254e3388 Merge pull request #350 from jcrocholl/Marlin_v1 daid 2012-12-17 02:16:31 -08:00
• 38ee395ac7 Replace the 1ms delay for 2 nops to get a 100ns delay. #259 daid303 2012-12-17 11:12:11 +01:00
• 5df5e4c4a2 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 daid303 2012-12-17 11:09:18 +01:00