9698f4ea64
bed pid
...
Conflicts:
Marlin/Configuration.h
12 years ago
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
e5c39b7c2a
commit
12 years ago
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
bf2071871c
Merge branch 'Marlin_v1' of https://github.com/Drakelive/Marlin
12 years ago
fc32e20881
first commit
12 years ago
abf0693e8e
Added KILL_PIN -1 to gen7 boards
12 years ago
47319cf64e
Fixed typo in SF arc fix code.
12 years ago
e358a2d7af
Added fix for SF Arc Point fillet procedure
12 years ago
044a64a1fb
Merge pull request #225 from Justblair/Marlin_v1
...
Added PDF file containing Menu Tree for documentation purposes.
12 years ago
cd91e0e3e1
Merge pull request #228 from Drakelive/patch-1
...
Update Marlin/pins.h
12 years ago
d728e35658
Update Marlin/pins.h
12 years ago
1c1fddc7ac
Added support for the Rambo reprap electronics board. Added Mcodes to set
...
motor current and microstepping pins.
12 years ago
dcd3e8a211
Tidy up
12 years ago
ddd9d0cfd4
Added PDF file containing Menu Tree for documentation purposes. Source xlsx document included.
12 years ago
0e58ef6805
Some dialogs are corrected
12 years ago
0e89022cc3
Correct temptable_55 name.
12 years ago
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
6cd150842f
Update Marlin/language.h
...
Some dialogs corrected and Default language set to 1
12 years ago
299c18596f
Update Marlin/language.h
...
Some dialogs are corrected
12 years ago
b86336c3f5
Merge pull request #221 from daid/Marlin_v1
...
Long filename support for LCD display
12 years ago
b69e75c89a
Added long filename support.
12 years ago
825adbd67b
Merge pull request #220 from MaikStohn/1d224cc031
...
Implemented support for KILL_PIN / Fixed compilation errors for incomplete/bad translations
12 years ago
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
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
87ff61a8a6
Fix for #201
12 years ago
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
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
31873ec707
changed int to long to overcome overflow of number display
...
- related bug reports: Issue #201 , Issue #213
12 years ago
de0448343f
added KILL_PIN support / cleaned up manage_inactivity function definition
12 years ago
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
f67feea093
Merge pull request #217 from Justblair/Marlin_v1
...
Fixed broken Language file and pre-heat ABS and PLA options
12 years ago
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
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
d38b96fff1
Update Marlin/language.h
12 years ago
9f7f7354f5
Set default language 1
12 years ago
d3b8edb6a2
Merge pull request #212 from elgambitero/Marlin_v1
...
Spanish language included in the language.h file
12 years ago
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
9083966c22
Do not use feedrate multiiply on Z and E only moves.
12 years ago
5406c533db
Disable FAST_PWM by default. On some systems it does not work ok.
12 years ago
f92dc91c3d
Enable M503 also when eeprom is disabled
12 years ago
35a1dd081f
no message
12 years ago
5131ab19ca
Fixed Retract in LCD Menu
12 years ago
96f4f90cb3
Added pause and retract lcd menu items
12 years ago
e10355500d
Updated Language.h with pause, resume, and retract
12 years ago
a97c006bbf
Merge pull request #195 from kobaan/Marlin_v1
...
Updated german translations in language.h
12 years ago
f062794a0d
Merge pull request #208 from Enchiridion/Marlin_v1
...
Added support for dual Z axis stepper drivers
12 years ago
57468d3c21
Merge pull request #210 from Dabble63/Marlin_v1
...
Add Duty Cycling to the Heater Bed
12 years ago
22aae62ccd
Merge pull request #209 from ijackson/for-upstream
...
M206 fixes, and ancillary improvements
12 years ago
6b45e9f167
Add Duty Cycling to the Heater Bed
12 years ago
Mark Finn