melch
/
Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,039 Commits
2 Branches
0 Tags
2.0 GiB
x301
2.0.x
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '35a0c46f16'
${ noResults }
Commit Graph

6039 Commits (35a0c46f16d37931857a0ab024fa304c246474eb)
 

Author SHA1 Message Date
ZetaPhoenix 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.

Fixed typo "deu" in English language that was fixed in #134 but got added back in via 9f7f7354f5
 12 years ago
ErikZalm 0a31ccb1d1 Merge pull request #251 from ZetaPhoenix/Marlin_v1_bugfix 
Limit Switch locations based on MIN/MAX limits and homing direction
 12 years ago
ZetaPhoenix 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.
 12 years ago
ZetaPhoenix 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.
 12 years ago
ErikZalm ba898faa7d Merge pull request #249 from gwelchc/patch-2 
Slight modification for byte savings
 12 years ago
ErikZalm 0152ee71a5 Merge pull request #248 from gwelchc/patch-1 
Binary representation for characters in ultraldc.pde
 12 years ago
ErikZalm 348d543425 Merge pull request #245 from andrey-vasilyev/patch-1 
Fix M81 not working reliably on Gen7
 12 years ago
G. W. C. 6ccbfeb80c Update Marlin/Marlin.pde 
Added function 'setTargetedHotend' that turns into a function an operation repeated 3 times through the M-codes processing.

This modification saves a few bytes that can be used to add support for new commands.
 12 years ago
G. W. C. c433142abf Update Marlin/ultralcd.pde 
The joris' char drawins are expressed in binary so to show their content's in a more visual fashion.

This is not a code modification as much as a readibility modification.
 12 years ago
andrey-vasilyev 1d389ad3a8 Fix M81 not working reliably on Gen7 
Some discussion of the issue is here http://forums.reprap.org/read.php?181,118329,page=1
 12 years ago
Mark Finn 5bfccab650 readme 12 years ago
Mark Finn 9698f4ea64 bed pid 
Conflicts:

	Marlin/Configuration.h
 12 years ago
ErikZalm 769796ed4c Merge pull request #240 from ZetaPhoenix/Marlin_v1_bugfix 
Missing #else in temperature.cpp prevented reading bed temp when TEMP_BE...
 12 years ago
drakelive e5c39b7c2a commit 12 years ago
ZetaPhoenix 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) 12 years ago
drake bf2071871c Merge branch 'Marlin_v1' of https://github.com/Drakelive/Marlin 12 years ago
drake fc32e20881 first commit 12 years ago
Erik vd Zalm abf0693e8e Added KILL_PIN -1 to gen7 boards 12 years ago
Erik vd Zalm 47319cf64e Fixed typo in SF arc fix code. 12 years ago
Erik vd Zalm e358a2d7af Added fix for SF Arc Point fillet procedure 12 years ago
ErikZalm 044a64a1fb Merge pull request #225 from Justblair/Marlin_v1 
Added PDF file containing Menu Tree for documentation purposes.
 12 years ago
ErikZalm cd91e0e3e1 Merge pull request #228 from Drakelive/patch-1 
Update Marlin/pins.h
 12 years ago
Drakelive d728e35658 Update Marlin/pins.h 12 years ago
tonokip 1c1fddc7ac Added support for the Rambo reprap electronics board. Added Mcodes to set 
motor current and microstepping pins.
 12 years ago
Blair Thompson dcd3e8a211 Tidy up 12 years ago
Blair Thompson ddd9d0cfd4 Added PDF file containing Menu Tree for documentation purposes. Source xlsx document included. 12 years ago
Erik vd Zalm 0e58ef6805 Some dialogs are corrected 12 years ago
Erik vd Zalm 0e89022cc3 Correct temptable_55 name. 12 years ago
Bracken Dawson 47d4f55bc0 Fix Gen7 1.4 pinout 
Gen7 1.4 uses very different pin assignments, might as well make a new
section and remove some of the conditionals from each. It's easier to change
your pin assingment this way if like me you don't wire it exactly to plan.
 12 years ago
elgambitero 6cd150842f Update Marlin/language.h 
Some dialogs corrected and Default language set to 1
 12 years ago
elgambitero 299c18596f Update Marlin/language.h 
Some dialogs are corrected
 12 years ago
ErikZalm b86336c3f5 Merge pull request #221 from daid/Marlin_v1 
Long filename support for LCD display
 12 years ago
daid b69e75c89a Added long filename support. 12 years ago
ErikZalm 825adbd67b Merge pull request #220 from MaikStohn/1d224cc031 
Implemented support for KILL_PIN / Fixed compilation errors for incomplete/bad translations
 12 years ago
stohn 1d224cc031 merged with upstream and FIXED AGAIN bad translation commit 
PLEASE BE MORE CAREFUL WHEN SUBMITTING NEW TRANSLATIONS

When you add new menu items / messages always copy them to ALL
languages (just use english)
 12 years ago
stohn 06c03fe2f0 new method for message for making KILLED message visible 
The cli(); at the start of the kill() function also stops the internal
arduino timer which stops updating of millis() which prevents the
display of the "KILLED." message.
The new function updates the display directly without checking any
timers.
 12 years ago
daid 87ff61a8a6 Fix for #201 12 years ago
ErikZalm 8c94ad0d26 Merge pull request #219 from Justblair/Marlin_v1 
Added new function to the LCD menu.  Preheat settings now adjustable and can be stored
 12 years ago
Blair Thompson 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. 12 years ago
stohn 31873ec707 changed int to long to overcome overflow of number display 
- related bug reports: Issue #201, Issue #213
 12 years ago
stohn de0448343f added KILL_PIN support / cleaned up manage_inactivity function definition 12 years ago
stohn 69961dbba3 fixed incorrect menu messages from last commit... 
- removed several multiple definitions of same message
- fixed definition of missing messages in german and spanish
- tweaked german translation (a lot)
- added note about changing and testing this file
 12 years ago
ErikZalm f67feea093 Merge pull request #217 from Justblair/Marlin_v1 
Fixed broken Language file and pre-heat ABS and PLA options
 12 years ago
Blair Thompson 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 12 years ago
Blair Thompson 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. 12 years ago
elgambitero d38b96fff1 Update Marlin/language.h 12 years ago
Erik vd Zalm 9f7f7354f5 Set default language 1 12 years ago
ErikZalm d3b8edb6a2 Merge pull request #212 from elgambitero/Marlin_v1 
Spanish language included in the language.h file
 12 years ago
elgambitero aee475aa55 Update Marlin/language.h 
Spanish language included. It features the LCD screen messages and a small part of the Serial messages.
 12 years ago
Erik vd Zalm 9083966c22 Do not use feedrate multiiply on Z and E only moves. 12 years ago