Commit Graph

Select branches

Hide Pull Requests

1.0.x

1.1.x

AllowsRAMPSAutoHWSPIPins

AnetE16V2.0.5.2

ArtilleryX1_2.0

ArtilleryX1_2.0_Devel

BedTrammingAutoCalcPoints

BigMeter_Octopus

CR-6Devel

ControllerFanAdditions

CrealityDwin2.0_Bleeding

CrealityDwin_2.0

Creality_Bondtech

DwinParity_1

EBAB_22IDEX

EBAB_EBAP

Ebab_2072

F1rstLayer_Touchscreens

FixDUESPI

FixDuplicatedTempReport

FixG34ZPos

FixLulzbotFTDITimeoutToStatus

FixPIDMenus

FixPowerOffMessage

Followup-for-V2-S1-Displays

FormbotTrex+_2.0.1

FunmatHT

Implement-M591-Configurable-Runout-Sensors

LPC4078

LPC4078_DevUpd

LulzbotTestBase

LulzbotUniversalTools

M591_RRFRunoutParity

Mamorubot_SX4

Optomize-G425-to-compute-Primary-Axis-before-probing-remainders

OrturV4

ParseSafetyCommandsEvenWithEParser

Raise3D-N2+-Dual

Raptor_2.0.X

Raptor_2.0.X_Devel

ReapplyChamberPreheat

ReduceKillPinWait

SunluS8

SwitchingNozzleEnhancements

TMSX4_2.0_Bleeding

TM_Raptor

TM_SX4_2.0

TM_SX4_2.0_Devel

TM_Trex

TM_Trex2+_2.0.x

Tenlog_DWIN

Trex3_1.1.9

Trex_2.0.x_Devel

TronxyX5SA

UseRAW_POS_ForG34

Vivedino_Trex3

bugfix-1.1.x

bugfix-2.0.x

#1

#10

#100

#104

#11

#117

#12

#124

#13

#14

#168

#176

#18

#180

#2

#20

#28

#288

#292

#292

#295

#3

#311

#311

#34

#4

#5

#55

#75

#76

#8

#9

#91

#93

#99

1.0.0-beta

1.0.1

1.0.2

1.0.2-1

1.0.2-2

1.1.0

1.1.0-RC1

1.1.0-RC2

1.1.0-RC3

1.1.0-RC4

1.1.0-RC5

1.1.0-RC6

1.1.0-RC7

1.1.0-RC8

1.1.1

1.1.2

1.1.3

1.1.4

1.1.5

1.1.6

1.1.7

1.1.8

BT_DW731

BT_DW746

BT_DW747

BondtechDW73

Bondtech_743

Bontech_745

CrealityDW73

DW4

DW6.2

DW7.2

DW72

DW731

DW74

DW743

DW_746

EEPROMwrite_Removed

FL_745

FL_DW746

LF_HAS_THIS

LF_MarlinSerial_h_mismatch

LF_Marlin_h_includes

LF_MatchesChangeInEEpromWrite

LF_Matches_Marlin_h_manageInactivity

RepRapPro-Huxley-July-2012

RepRapPro-Mendel-June-2012

SX4I

TL_DW747

TM3D_745

TM3D_CrealityDwin2.0.x_DW3

TM3D_Creality_2.0.x_CR28

TM3D_DW747

TM3D_Evnovo_X1_2.0.x_01

TM3D_Raptor_2.0.x_R2

TM3D_SX4_2.0.x_F

TR20

v1.0.0.RC1

v1.0.0.beta1

Mono Color

• 0c1b863755 Ignore ":" in comments. Erik van der Zalm 2012-03-25 14:41:26 +02:00
• 63aec3c56e Replaced Kill by Stop. If the printer is stopped. Fix the error and use M999 to restart. Erik van der Zalm 2012-03-25 14:36:51 +02:00
• 8b785f75a6 Merge pull request #123 from buserror-uk/for-upstream ErikZalm 2012-03-23 11:54:58 -07:00
• 5b8758f42b Merge pull request #126 from tommycheng/patch-1 ErikZalm 2012-03-23 11:54:37 -07:00
• 520f1a54a8 Fix compilation error when PIDTEMP is undefined and ULTIPANEL is defined. Tommy Cheng 2012-03-24 02:26:59 +08:00
• a89e833b50 minor changes jeanmarc 2012-03-22 16:29:02 +00:00
• 5550e893d5 New board variant, Open Motion Controller Michel Pollet 2012-03-22 13:51:21 +00:00
• aa6e6e914e Makefile: Redone Michel Pollet 2012-03-22 13:48:10 +00:00
• 6db3d3b90d made m206 work jeanmarc 2012-03-21 17:09:51 +00:00
• 62b5f458d4 bed levelled jeanmarc 2012-03-21 14:05:12 +00:00
• 0183e6332a made prepare->autostart independent of current folder. Bernhard 2012-03-19 20:24:40 +01:00
• 1532200435 found error in filenames. One array was too short. This had nothing to do with long filenames, other than if they were 12 characters exactly, which could only happen if the extension and the text before were filled completely Bernhard 2012-03-19 20:06:58 +01:00
• 21a2cf0a9e scropp's levelling added for testing. jeanmarc 2012-03-19 00:09:22 +00:00
• 34dfe7a6b4 Set correct thermistor tables. jeanmarc 2012-03-18 21:53:18 +00:00
• e70f1e5871 removed temp file jeanmarc 2012-03-18 21:48:13 +00:00
• fc4eaabe60 brought up to date with Erik Zalm Marlin. Included Melzi LED pin. jeanmarc 2012-03-18 21:47:29 +00:00
• 7f775c142c Update README.md ErikZalm 2012-03-18 15:59:14 +01:00
• da2f5db1af Merge branch 'dev' into Marlin_v1 jeanmarc 2012-03-17 22:53:13 +00:00
• e44ab05e0f removed temp files jeanmarc 2012-03-17 22:52:58 +00:00
• 9ea7de270b added E jerk. Initial test with fast SD xfer. jeanmarc 2012-03-17 22:47:44 +00:00
• b985e4a134 Fixed compile errors in ultralcd when no ultra_lcd is selected. Erik van der Zalm 2012-03-15 22:29:31 +01:00
• 2e749d60c3 Added DISABLE_MAX_ENDSTOPS Erik van der Zalm 2012-03-12 20:32:14 +01:00
• 33f5697888 PPID tune exports more constants. Erik van der Zalm 2012-03-11 22:18:25 +01:00
• b44055cc51 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 Erik van der Zalm 2012-03-11 18:03:00 +01:00
• f5eae52098 Added more manage_inactivity checks Erik van der Zalm 2012-03-11 17:59:44 +01:00
• 19a47dae4a Merge pull request #99 from Justblair/master ErikZalm 2012-03-11 04:34:59 -07:00
• 910f4e77a2 Added 20MHz support. Erik van der Zalm 2012-03-11 12:25:04 +01:00
• 7cefad3744 Merge pull request #106 from bgamari/Marlin_v1 ErikZalm 2012-03-11 01:48:30 -08:00
• 87ff2f8867 Added CONTROLLERFAN. (Controlling a fan to cool down the steppper drivers) Erik van der Zalm 2012-03-11 10:44:10 +01:00
• 387fe51a56 Do not disable steppers when there are moves in the queue. Erik van der Zalm 2012-03-09 20:20:01 +01:00
• 421264e58a Fixed typo Erik van der Zalm 2012-03-09 17:49:48 +01:00
• 15ad923310 Removed !!!. Stupid arduino bootloader can't handle this. Erik van der Zalm 2012-03-09 17:42:32 +01:00
• 61e09e6be2 Added FAN_PIN -1 checks Erik van der Zalm 2012-03-08 22:09:49 +01:00
• 87c4e06c24 Corrected active_extruder when autotemp is used. Erik van der Zalm 2012-03-08 22:04:13 +01:00
• 7b1e295f34 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 Erik van der Zalm 2012-03-08 21:48:06 +01:00
• c077316b2b Added PID autotune. (experimental) M303 Starts autotune. Wait till the Kp Ki and Kd constants are printed. Put these values in Configuration.h Erik van der Zalm 2012-03-08 21:43:21 +01:00
• 49b228c4b3 Add instructions to regenerate speed_lookuptable when changing F_CPU Ben Gamari 2012-03-07 18:05:10 -05:00
• 96509494f0 stepper: Clarify comment on timer-counter configuration Ben Gamari 2012-03-07 17:58:35 -05:00
• 6d7e6a11fc Add create_speed_lookup Ben Gamari 2012-03-07 17:41:29 -05:00
• f3095493b0 Merge pull request #100 from tommycheng/patch-1 ErikZalm 2012-03-05 09:56:50 -08:00
• ce07c9186d While Waiting for hotbed to warm up via M190, LCD Display and Click Encoder input freeze until target temperature is reached. Tommy Cheng 2012-03-05 23:12:26 +08:00
• 116dc86b8a Fixed type in e-jerk Erik van der Zalm 2012-03-04 23:09:13 +01:00
• 02ee9e3d30 Changed Pin Assignment for the RAMPS motherboard so that LCD and Rotary encoder are all wired to AUX-4 Blair Thompson 2012-03-04 21:34:20 +00:00
• e056bf8081 Added E-Jerk Erik van der Zalm 2012-03-04 16:34:58 +01:00
• 4deeffbc88 Added missing defines to the german section. Translation still needed. Erik van der Zalm 2012-03-04 14:08:20 +01:00
• 632528aa95 merging with SCUBA82 Erik van der Zalm 2012-03-04 13:41:47 +01:00
• aac7aa3bf0 Queued fan control. Issue #90 Erik van der Zalm 2012-03-04 13:05:26 +01:00
• fde51084f3 set SD file delete to M30; switch printime output to M31 Christian Thalhammer 2012-03-03 21:58:12 +01:00
• 21e2bae063 Changed (corrected?) SD_card comment handling. Erik van der Zalm 2012-03-03 21:28:33 +01:00
• e509bbf636 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 Erik van der Zalm 2012-03-03 20:41:22 +01:00
• 072011a3ef Added current_block = NULL to quickStop() Erik van der Zalm 2012-03-03 20:40:46 +01:00
• 2422a857a1 Merge pull request #96 from haxar/Marlin_v1 ErikZalm 2012-03-03 11:24:58 -08:00
• f598077af3 Removed vc files Erik van der Zalm 2012-03-03 20:22:42 +01:00
• cb0c84e075 Merge remote-tracking branch 'justblair/master' into Marlin_v1 Erik van der Zalm 2012-03-03 20:20:55 +01:00
• 1d5809d458 Merge pull request #88 from daid/Marlin_v1 ErikZalm 2012-03-03 11:18:14 -08:00
• ed951b1977 Fixed RAMPS 1.2 support (Found and fixed by rrhb) Erik van der Zalm 2012-03-03 20:15:41 +01:00
• 4879de08e8 The percent complete for the SD file statistic sits squint. Changed "lcd.Setcursor (7,2);" to "lcd.Setcursor (10,2);". Blair Thompson 2012-03-03 16:47:27 +00:00
• f278e1c00f This is in my opinion a much better way of dealing with SD cards than my previous fix. Blair Thompson 2012-03-03 16:30:31 +00:00
• 046a8e0039 Added more defines to the language.h file so that nowe most of the text strings are now configured via this file. Still got some hunting down to do to complete this task. Blair Thompson 2012-03-03 15:51:47 +00:00
• 79a466ca26 make analog2tempBed return a precise celsius reading for BED_USES_THERMISTOR, complementing changes to analog2temp in d15f01e haxar 2012-03-02 17:15:21 -08:00
• 5f3a422e68 added M31 - delete file from sd card Christian Thalhammer 2012-03-02 21:49:05 +01:00
• fa2e3a40e9 fixed LCD manual z axis move Feedrate to 70 (was 1700) Christian Thalhammer 2012-03-01 14:38:50 +01:00
• a92b3afe64 added german translation;Menue should be in english.. sounds better Christian Thalhammer 2012-03-01 14:24:20 +01:00
• 9fa586bbed fixed languages; Preheat_PLA and Preheat_ABS was not defined for non english Christian Thalhammer 2012-03-01 14:05:40 +01:00
• 00d33e6b82 Typo fix Daid 2012-02-29 19:01:21 +01:00
• 4eb543e4ca temp files no longer tracked jeanmarc 2012-02-29 16:45:47 +00:00
• 5ca66537dc temp files removed jeanmarc 2012-02-29 16:32:31 +00:00
• 340876889b hux2 running jeanmarc 2012-02-29 16:31:12 +00:00
• 7d124478fa Only protect the heater pins for the defined extruders. Changed the way the extruder pins are defined so it doesn't create extra -1 entries in the list. Daid 2012-02-29 15:49:02 +01:00
• 3d83109028 Fixed general 16x2 LCD build without SD support. Daid 2012-02-29 15:33:23 +01:00
• cb02914687 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 Christian Thalhammer 2012-02-29 14:51:35 +01:00
• 10bf2bb8e1 - Christian Thalhammer 2012-02-29 14:51:15 +01:00
• d47b666630 Merge branch 'Marlin_v1' of git://github.com/ErikZalm/Marlin into Marlin_v1 Daid 2012-02-29 12:19:20 +01:00
• 88d289caa1 Made plan_buffer_line arguments const, which optimizes better and fixes the RUNOUT_PREVENTION feature. Daid 2012-02-29 11:38:12 +01:00
• b4833d55c2 Fixed HOME_POS in combination with G28 X0 or G28 Y0 Erik van der Zalm 2012-02-28 18:20:03 +01:00
• c6f2ec3c82 remove stop_heating_wait Erik van der Zalm 2012-02-27 18:45:45 +01:00
• b48d67ce10 Fixed homing Erik van der Zalm 2012-02-27 18:31:40 +01:00
• 071eec7aa7 Merge pull request #81 from phord/09469add5560ca8a676c42e4bcd499868c33f0dd ErikZalm 2012-02-27 08:38:36 -08:00
• 1ebe7d1ab6 Merge pull request #83 from phord/tempfix ErikZalm 2012-02-27 08:36:45 -08:00
• de37b2264a Merge pull request #82 from phord/fix-gen7-build ErikZalm 2012-02-27 08:36:06 -08:00
• b65ef8d66c Add support for upcoming Gen7 v1.4 Phil Hord 2012-02-26 20:39:49 -05:00
• 740f0c7690 Add explicit #define for bogus temp override Phil Hord 2012-02-26 18:46:34 -05:00
• ba8500a236 pins.h: Define Z_MAX_PIN for Gen7 board Phil Hord 2012-02-26 20:15:40 -05:00
• 09469add55 Add board reset reporting (from Repetier-Firmware) Phil Hord 2012-02-20 02:30:31 -05:00
• f3101e96d9 Add suitable .gitignore to avoid build noise Phil Hord 2012-02-16 12:06:33 -05:00
• 245dca4bee Makefile: generic pde=>cpp rule Phil Hord 2012-02-16 12:17:33 -05:00
• 97d42ca2b2 SDSUPPORT default disabled Erik van der Zalm 2012-02-26 22:05:38 +01:00
• 2faa0852b9 Merge pull request #79 from changwoo/Marlin_v1 ErikZalm 2012-02-26 13:03:15 -08:00
• 7b14953c99 Fix build on Sanguino based boards with ATmega1284P Changwoo Ryu 2012-02-27 04:05:33 +09:00
• 286d5003fa Fixed compiler warning for Sanguino compile Daid 2012-02-26 17:35:01 +01:00
• 66d50562b6 Merge pull request #76 from iXce/Marlin_v1 ErikZalm 2012-02-26 07:30:51 -08:00
• 27f595a444 Changed version => RC2 Erik van der Zalm 2012-02-26 16:26:40 +01:00
• 018c567abf Moved SLOWDOWN function. (jetty840) Included AD595 calibration options. (daid) Erik van der Zalm 2012-02-26 16:23:47 +01:00
• 4fbda5c3f5 Merge remote-tracking branch 'daid/Marlin_v1' into Test Erik van der Zalm 2012-02-26 16:10:59 +01:00
• ce714fe306 Fixes in pins.h Erik van der Zalm 2012-02-25 22:55:17 +01:00
• 35e57bf149 Added gen6 deluxe. Erik van der Zalm 2012-02-25 17:44:45 +01:00
• 84ea2d61e8 Moved gen7 boards to motherboard type 10, 11 and 12. Split ramps1.3 in Sprinter like config and multiextruder config. Erik van der Zalm 2012-02-24 23:34:41 +01:00
• adc108d79e Correctly build the produced applet/Marlin.cpp source Guillaume Seguin 2012-02-24 21:21:19 +01:00
• 5aa9c41ab1 Changed comment mode for detection. Added M221 extuder multiply factor. Erik van der Zalm 2012-02-24 20:42:07 +01:00
• 00690f7ffd Fix cast warning in Gen7 Erik van der Zalm 2012-02-23 18:50:05 +01:00