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

• 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 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 Erik vd Zalm 2012-08-11 15:49:40 +02:00
• 35a1dd081f no message James AdamsandErik vd Zalm 2012-07-28 12:08:18 -06:00
• 5131ab19ca Fixed Retract in LCD Menu James AdamsandErik vd Zalm 2012-07-26 23:44:03 -06:00
• 96f4f90cb3 Added pause and retract lcd menu items James AdamsandErik vd Zalm 2012-07-26 23:38:33 -06:00
• e10355500d Updated Language.h with pause, resume, and retract James AdamsandErik vd Zalm 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 PalmerandErik van der Zalm 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
• 12de8fff81 Support step motor controllers with active low step pins. daid 2012-06-29 16:27:47 +02:00
• b67dacdc8f Fixed AD595 define Erik van der Zalm 2012-06-11 17:33:42 +02:00
• d3002ef741 corrected retract Bernhard 2012-06-03 16:56:40 +02:00
• 0c123950e9 __ header file replace Bernhard 2012-06-02 20:44:17 +02:00
• bf077125b9 added firmware retract. disabled by default Bernhard 2012-06-02 20:32:28 +02:00
• 88d2a671cc readme corrected Bernhard 2012-06-02 14:14:36 +02:00
• 0e5e249ab5 added individual pullup setting option to have finer control in case there is a special z-min sensor, for example Bernhard 2012-06-02 13:47:50 +02:00
• e792d62f47 readme Bernhard 2012-06-02 13:44:38 +02:00
• 6b14f95b3e Merge pull request #170 from linagee/Marlin_v1 Bernhard Kubicek 2012-06-02 03:46:56 -07:00
• c7ce99d495 Merge pull request #172 from daid/Marlin_v1 Bernhard Kubicek 2012-06-02 03:44:03 -07:00
• b7fc14bc65 repaired thermistortable_6 by graphcial fitting of the off-slope values. see issue 179. Erik, I know you asked for no changes, but this file probably is not related and hopefully allright. Bernhard Kubicek 2012-05-30 14:14:36 +03:00
• 9e1021efbe Fixed SL bug. ErikZalm 2012-05-28 22:32:53 +03:00
• e9bec9b6fe Fixed E1_ENABLE pin for Ultimaker. This was wrong for the 1.5.4 and 1.5.3 PCB (I cannot check the 1.5.6) Daid 2012-05-24 18:36:55 +02:00
• fbd282b3ba Update Marlin/Configuration.h linagee 2012-05-20 13:19:28 -06:00
• 2e8c5049c5 Update Marlin/thermistortables.h linagee 2012-05-20 13:18:45 -06:00
• 2d0d8e5272 Small correction. linagee 2012-05-20 11:09:07 -06:00
• 4d7fe7115f Changed M401 to M0/M1 as suggested, so they match normal CNC stop commands. Daid 2012-05-20 14:37:30 +02:00
• 9e9db65c3f Update Marlin/thermistortables.h linagee 2012-05-20 05:51:29 -06:00
• bd966ef389 Update Marlin/thermistortables.h linagee 2012-05-20 05:49:01 -06:00
• 775da3f103 Added top ratings and extended to ADC=1 for table 3 and 5. linagee 2012-05-20 05:35:57 -06:00
• 96a4baa0be Update Marlin/thermistortables.h linagee 2012-05-20 04:55:22 -06:00
• 2aa9f7b131 Update Marlin/thermistortables.h linagee 2012-05-20 04:35:28 -06:00
• c4490f5f3d Update Marlin/Configuration.h linagee 2012-05-20 04:27:52 -06:00
• dd9144994e Tested May 19 - It works! Verified with separate thermocouple TM-902C also. linagee 2012-05-20 04:13:29 -06:00
• 4c37d0d9f1 Extended range above 250C. (Operating range states up to 300C) linagee 2012-05-20 04:01:30 -06:00
• b59724e42b Add strigification for extruder amount in M115 report. Daid 2012-05-19 19:01:14 +02:00
• 16413bb8f2 Last M401 update, refresh the LCD during an M401 wait. Daid 2012-05-19 18:53:56 +02:00
• b3941fce5c Update after testing Daid 2012-05-19 18:48:43 +02:00
• d494688565 Do not initialize in the header file. Daid 2012-05-19 17:57:52 +02:00
• 516ec90242 Add M401 - Wait for user on LCD button press Daid 2012-05-19 17:54:07 +02:00
• 7244aa7eb7 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 Daid 2012-05-19 17:38:46 +02:00
• de2ca3b2e8 Grammar correction. linagee 2012-05-19 07:40:35 -06:00
• c2fc466e1b Update Marlin/Configuration.h linagee 2012-05-19 05:56:17 -06:00
• 241f5a4c0e Update Marlin/thermistortables.h linagee 2012-05-19 05:52:12 -06:00
• 9f9f498491 Update Marlin/Configuration.h linagee 2012-05-19 05:47:30 -06:00
• e31bef31ad Limit PID autotune PWM to PID_MAX Erik van der Zalm 2012-05-16 19:32:23 +02:00
• b2a9ccdb97 Merge pull request #159 from MaikStohn/Marlin_v1 ErikZalm 2012-05-16 12:32:35 -07:00
• d459fb41b7 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 Erik van der Zalm 2012-05-16 19:22:08 +02:00
• 804e0d6117 Merge pull request #164 from guanix/Marlin_v1 ErikZalm 2012-05-16 12:21:48 -07:00
• ba96059203 add additional dropsegments test Erik van der Zalm 2012-05-16 19:21:44 +02:00
• bb499421e9 Merge pull request #166 from zittix/Marlin_v1 ErikZalm 2012-05-16 12:00:22 -07:00
• fbd91ab0b5 Fixes #153 for bad call to abs() zittix 2012-05-16 18:17:34 +02:00
• b51c06e2b3 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 MaikStohn 2012-05-11 16:57:08 +02:00
• 159ae90874 bug fix for scrolling of main menu when using SMALL_DISPLAY (2 lines only) MaikStohn 2012-05-11 15:23:10 +02:00