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

• bf7e453d02 Unwanted artifacts from unclean merge of bed-pid tree Mark Finn 2012-10-09 14:47:35 -05:00
• 36a746d7d5 Merge pull request #244 from markfinn/pidbed ErikZalm 2012-10-08 11:15:16 -07:00
• ca811156a0 Merge pull request #1 from johnnyr/patch-1 tonokip 2012-10-01 23:55:08 -07:00
• 50daf27e5a Merge pull request #255 from elgambitero/Marlin_v1 ErikZalm 2012-09-26 10:29:03 -07:00
• df09e2adce Spanish updated elgambitero 2012-09-26 19:14:07 +02:00
• ddf6603d81 Spanish language updated. Bug fixes on dialogs. elgambitero 2012-09-26 19:11:45 +02:00
• 4bf8b1aeee fesfas elgambitero 2012-09-26 19:05:31 +02:00
• be1e099f1b Union whit Erick version drakelive 2012-09-25 19:17:15 +02:00
• 7afd202b89 New dialogs translated to spanish. Bug fixes. elgambitero 2012-09-25 19:16:57 +02:00
• ebc4601185 Some new dialogs translated to Spanish elgambitero 2012-09-07 14:55:39 +02:00
• c8ea9b0e58 Merge branch 'Marlin_v1' of https://github.com/Drakelive/Marlin drakelive 2012-09-25 18:51:20 +02:00
• ca7ca4572e primo commit drakelive 2012-09-25 18:46:38 +02:00
• c0aad4c28a Merge pull request #254 from ZetaPhoenix/Marlin_v1_bugfix ErikZalm 2012-09-25 00:10:38 -07:00
• 8016f058bc fix max endstop pins johnnyr 2012-09-19 13:15:17 -05:00
• d197f8504b clean up and changes from testing Mark Finn 2012-09-17 19:18:09 -05:00
• eb06a886c4 missed Mark Finn 2012-09-17 14:23:49 -05:00
• 04631d2250 cleanup for pull Mark Finn 2012-09-17 14:17:24 -05:00
• 0a5ad3ab85 move comment to correct place Mark Finn 2012-09-17 08:42:35 -05:00
• 8ac5b29e02 Changes to M119 response for easier visual comparison Changed to report on individual lines with "TRIGGERED" or "open" instead of "H" or "L" on one line as H&L could be confused with logic levels High and Low which may be wrong if using inverted logic. Added strings to language.h. ZetaPhoenix 2012-09-16 14:51:24 -07:00
• 0a31ccb1d1 Merge pull request #251 from ZetaPhoenix/Marlin_v1_bugfix ErikZalm 2012-09-16 01:47:51 -07:00
• c6caa45ae2 Limit Switch locations based on MIN/MAX limits and homing direction fixes #246 Added statements to set the limit switch positions to the maximum travel if homing in the positive direction as well as bed center at (0,0) if defined. Relocated code based on feedback. ZetaPhoenix 2012-09-15 15:25:49 -07:00
• dc566d654f fixes #246 Added statements to set the limit switch positions to the maximum travel if homing in the positive direction as well as bed center at (0,0) if defined. ZetaPhoenix 2012-09-14 21:48:49 -07:00
• ba898faa7d Merge pull request #249 from gwelchc/patch-2 ErikZalm 2012-09-14 12:13:36 -07:00
• 0152ee71a5 Merge pull request #248 from gwelchc/patch-1 ErikZalm 2012-09-14 12:10:28 -07:00
• 348d543425 Merge pull request #245 from andrey-vasilyev/patch-1 ErikZalm 2012-09-14 12:04:57 -07:00
• 6ccbfeb80c Update Marlin/Marlin.pde G. W. C. 2012-09-14 16:38:54 +03:00
• c433142abf Update Marlin/ultralcd.pde G. W. C. 2012-09-14 16:29:43 +03:00
• 1d389ad3a8 Fix M81 not working reliably on Gen7 andrey-vasilyev 2012-09-13 19:23:48 +04:00
• 5bfccab650 readme Mark Finn 2012-09-12 21:52:16 -05:00
• 9698f4ea64 bed pid Mark Finn 2012-09-12 21:01:31 -05:00
• 769796ed4c Merge pull request #240 from ZetaPhoenix/Marlin_v1_bugfix LF_HAS_THIS ErikZalm 2012-09-11 02:10:39 -07:00
• e5c39b7c2a commit drakelive 2012-09-10 14:25:49 +02:00
• e8c92e0a95 Missing #else in temperature.cpp prevented reading bed temp when TEMP_BED_PIN <7. Thanks to Leland Wallace for helping me track this down via "Sesame Street" coding (what is not like the other) ZetaPhoenix 2012-09-09 16:06:02 -07:00
• bf2071871c Merge branch 'Marlin_v1' of https://github.com/Drakelive/Marlin drake 2012-09-08 23:08:34 +02:00
• fc32e20881 first commit drake 2012-09-08 22:26:23 +02:00
• abf0693e8e Added KILL_PIN -1 to gen7 boards Erik vd Zalm 2012-09-04 08:20:27 +02:00
• 47319cf64e Fixed typo in SF arc fix code. Erik vd Zalm 2012-09-03 21:28:31 +02:00
• e358a2d7af Added fix for SF Arc Point fillet procedure Erik vd Zalm 2012-09-02 01:12:49 +02:00
• 044a64a1fb Merge pull request #225 from Justblair/Marlin_v1 ErikZalm 2012-09-01 04:41:49 -07:00
• cd91e0e3e1 Merge pull request #228 from Drakelive/patch-1 ErikZalm 2012-08-30 13:39:37 -07:00
• d728e35658 Update Marlin/pins.h Drakelive 2012-08-30 23:36:49 +03:00
• 1c1fddc7ac Added support for the Rambo reprap electronics board. Added Mcodes to set motor current and microstepping pins. tonokip 2012-08-30 00:16:57 -07:00
• dcd3e8a211 Tidy up Blair Thompson 2012-08-29 22:53:41 +01:00
• ddd9d0cfd4 Added PDF file containing Menu Tree for documentation purposes. Source xlsx document included. Blair Thompson 2012-08-29 21:08:41 +01:00
• 0e58ef6805 Some dialogs are corrected Erik vd Zalm 2012-08-29 21:15:59 +02:00
• 0e89022cc3 Correct temptable_55 name. Erik vd Zalm 2012-08-28 19:47:22 +02:00
• 47d4f55bc0 Fix Gen7 1.4 pinout Bracken Dawson 2012-08-22 23:15:46 +01:00
• 6cd150842f Update Marlin/language.h elgambitero 2012-08-22 21:46:22 +03:00
• 299c18596f Update Marlin/language.h elgambitero 2012-08-22 21:44:57 +03:00
• b86336c3f5 Merge pull request #221 from daid/Marlin_v1 ErikZalm 2012-08-22 06:30:35 -07:00
• b69e75c89a Added long filename support. daid 2012-08-22 14:49:57 +02:00
• 825adbd67b Merge pull request #220 from MaikStohn/1d224cc031 LF_Matches_Marlin_h_manageInactivity ErikZalm 2012-08-22 04:33:28 -07:00
• 1d224cc031 merged with upstream and FIXED AGAIN bad translation commit stohn 2012-08-22 13:05:42 +02:00
• 06c03fe2f0 new method for message for making KILLED message visible stohn 2012-08-22 12:44:41 +02:00
• 87ff61a8a6 Fix for #201 daid 2012-08-22 10:54:55 +02:00
• 8c94ad0d26 Merge pull request #219 from Justblair/Marlin_v1 ErikZalm 2012-08-21 23:21:11 -07:00
• aacbebbebe Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory. Blair Thompson 2012-08-21 23:46:10 +01:00
• 31873ec707 changed int to long to overcome overflow of number display stohn 2012-08-21 16:47:39 +02:00
• de0448343f added KILL_PIN support / cleaned up manage_inactivity function definition stohn 2012-08-21 14:48:29 +02:00
• 69961dbba3 fixed incorrect menu messages from last commit... stohn 2012-08-21 14:44:20 +02:00
• f67feea093 Merge pull request #217 from Justblair/Marlin_v1 ErikZalm 2012-08-20 14:34:32 -07:00
• 6c050b8440 Fixes error introduced at commit aee475aa55 which caused the sketch not to comile for language option 1. Several defines were removed but still referenced in ultralcd.pde Blair Thompson 2012-08-20 21:54:47 +01:00
• b9f9f8f7d3 The pre-heat ABS and PLA options in the LCD Menu were broken a while back. The pre-heat worked fine, but the cooling fans were not switching on as intended. This is now fixed. Blair Thompson 2012-08-20 21:49:37 +01:00
• d38b96fff1 Update Marlin/language.h elgambitero 2012-08-12 22:45:11 +03:00
• 9f7f7354f5 Set default language 1 Erik vd Zalm 2012-08-12 21:29:42 +02:00
• d3b8edb6a2 Merge pull request #212 from elgambitero/Marlin_v1 ErikZalm 2012-08-12 12:27:06 -07:00
• aee475aa55 Update Marlin/language.h elgambitero 2012-08-12 21:26:17 +03:00
• 9083966c22 Do not use feedrate multiiply on Z and E only moves. Erik vd Zalm 2012-08-12 18:13:34 +02:00
• 5406c533db Disable FAST_PWM by default. On some systems it does not work ok. Erik vd Zalm 2012-08-11 15:51:04 +02:00
• f92dc91c3d Enable M503 also when eeprom is disabled LF_MatchesChangeInEEpromWrite Erik vd Zalm 2012-08-11 15:49:40 +02:00
• 35a1dd081f no message James Adams 2012-07-28 12:08:18 -06:00
• 5131ab19ca Fixed Retract in LCD Menu James Adams 2012-07-26 23:44:03 -06:00
• 96f4f90cb3 Added pause and retract lcd menu items James Adams 2012-07-26 23:38:33 -06:00
• e10355500d Updated Language.h with pause, resume, and retract James Adams 2012-07-26 23:33:15 -06:00
• a97c006bbf Merge pull request #195 from kobaan/Marlin_v1 ErikZalm 2012-08-11 01:45:30 -07:00
• f062794a0d Merge pull request #208 from Enchiridion/Marlin_v1 ErikZalm 2012-08-11 01:42:49 -07:00
• 57468d3c21 Merge pull request #210 from Dabble63/Marlin_v1 ErikZalm 2012-08-11 01:42:02 -07:00
• 22aae62ccd Merge pull request #209 from ijackson/for-upstream ErikZalm 2012-08-11 01:40:50 -07:00
• 6b45e9f167 Add Duty Cycling to the Heater Bed Dabble63 2012-08-11 09:17:47 +03:00
• adee81170d M206: save values in eeprom Ian Jackson 2012-08-01 21:18:08 +01:00
• 1dba212e18 HOMEAXIS: make into a function Ian Jackson 2012-08-08 18:30:34 +01:00
• 7bb326d389 eeprom: provide smaller code for SERIAL_ECHOPAIR Ian Jackson 2012-08-04 16:13:25 +01:00
• 957e966d2d M206: always use homing ("homeing") offsets Ian Jackson 2012-08-01 21:12:14 +01:00
• faccb35850 software_endstops: use *_MIN_POS and *_MAX_POS for arcs Ian Jackson 2012-08-09 18:15:32 +01:00
• 3f15b7c7b8 Makefile: Better display of size (device memory usage) Ian Jackson 2012-08-09 19:03:12 +01:00
• 0c35facc94 Makefile: support V=1 Ian Jackson 2012-08-01 21:31:38 +01:00
• 71404eef29 .gitignore: Add *~, *.orig, *.rej, move to root directory Ian Jackson 2012-08-08 18:32:51 +01:00
• a873541ef6 Marlin.pde: include comment for emacs mode Ian Jackson 2012-08-08 17:56:39 +01:00
• 50cde90324 Added support for dual Z axis stepper drivers Enchiridion 2012-08-04 00:32:26 -06:00
• 603a5e25b3 Updated german translations in language.h and eliminated a few double lines. kobaan 2012-07-16 14:26:28 +03:00
• 538189cc19 Fixed soft limits when the origin is in the middle. HOME_POS is now always where the endstop is and can be outside the limits. The limits are now defined by MIN_POS and MAX_POS rather than HOME_POS and MAX_LENGTH. The Z is axis now homed first if direction is away from the bed. Chris Palmer 2012-06-02 13:17:47 +01:00
• 686011a548 Fixed typo ErikZalm 2012-07-14 17:25:35 +03:00
• cd57bf305b Merge git://github.com/daid/Marlin into Marlin_v1 Added invert step pins to corexy code Erik van der Zalm 2012-07-14 15:07:14 +02:00
• ea2c19f978 Added CoreXY support (Thanks Ilan Moyer) Erik van der Zalm 2012-07-14 14:21:53 +02:00
• aa65fe22ed decoupled axes sucessfully at least on pure x or y jog Erik van der Zalm 2012-07-14 13:43:19 +02:00
• c33ed4dcb8 branch brought up to date RepRapPro-Huxley-July-2012 jeanmarc 2012-07-06 20:45:18 +01:00
• b000747fe5 Z max height updated jeanmarc 2012-07-06 20:33:12 +01:00
• 12de8fff81 Support step motor controllers with active low step pins. daid 2012-06-29 16:27:47 +02:00
• c4028c6502 revert planner.cpp change which broke retracts RepRapPro-Mendel-June-2012 jeanmarc 2012-06-25 09:58:17 +01:00
• d5eb0622ee configuration changes jeanmarc 2012-06-25 08:30:48 +01:00