baac6e242d
Merge pull request #1419 from AnHardt/bootsplash
repair Bootsplash
10 years ago
a425111eb7
Merge pull request #1421 from blubbfish/patch-2
Fixing the language files for the 4th extruder
10 years ago
75cf302da3
example configurations changed to meet Configuration.h
10 years ago
61fd45a0c2
Add 4th extruder
10 years ago
2650be4921
Add 4th extruder
10 years ago
a9763d894e
Add 4th extruder
10 years ago
4949088302
Add 4th extruder
10 years ago
fc5204bd42
Add 4th extruder
10 years ago
9834818ef7
Add 4th extruder
10 years ago
8696963154
Add 4th extruder
10 years ago
ee8a7419f4
Add 4th extruder
10 years ago
e18403235d
Add 4th extruder
10 years ago
7baee555f4
Add 4th extruder
10 years ago
cebc7daf2a
Add 4th extruder
10 years ago
ef4c7abb21
Update language_es.h
Add 4th extruder
10 years ago
22e591518a
Update language_de.h
Add 4th extruder
10 years ago
a20c35bb38
Update language_ca.h
Add 4th extruder
10 years ago
aa48056c03
Made centering of bootlogo work and removed contraproductiv setScale2x2() in dogm_lcd_implementation.h
10 years ago
0d219b3e14
Make centering of STRING_SPLASH work
10 years ago
59315330dd
Remove definition of VERSION_STRING and replace where usend with STRING_VERSION
10 years ago
8c792c7b22
Make STRING_VERSION and VERSION_STRING the same
10 years ago
a231764523
tweak tweak
10 years ago
acf4a12fc3
tweak
10 years ago
74b40b039a
Merge branch 'cleanup_pins' of https://github.com/thinkyhead/Marlin into cleanup_pins
Pull for divergence.
10 years ago
812fafac80
Max endstop pins disabled by configuration
There’s no need to ask users to uncomment Max Endstop pins when they
have them. These will be set to -1 later if the endstop option is
disabled.
10 years ago
a0a97c9c4c
cleanup
10 years ago
aa23e75eb8
Cleanup heading
10 years ago
89282ebaa6
Split up pins to make it more manageable
Hopefully this is helpful to organization and future expansion….
10 years ago
b87ec5da73
Max endstop pins disabled by configuration
There’s no need to ask users to uncomment Max Endstop pins when they
have them. These will be set to -1 later if the endstop option is
disabled.
10 years ago
e5a7f34fa4
Add support for 4th extruder
#1405 includes some changes to pins.h for a 4th extruder. This commit
applies those changes. It also deals with a possible problem with
SENSITIVE_PINS.
10 years ago
865ca0ef04
Merge pull request #1405 from MagoKimbra/4th-extruders
All the additions look proper. I can't think of any other extruder-count-related items that you might have missed. So, with some optimism, I will merge this for testing.
10 years ago
b51a583f08
cleanup
10 years ago
5347ac2766
cleanup
10 years ago
b684f7e92b
Cleanup heading
10 years ago
86f1d1cfc3
Split up pins to make it more manageable
Hopefully this is helpful to organization and future expansion….
10 years ago
3021f7f743
Fix PID_dT
Add PID_dT in temeprature.cpp
10 years ago
415d95a298
Merge pull request #1401 from thinkyhead/issue_1379_printrboard_lcd
Proposed fix to #1379 . Printrboard I2C LCD support
10 years ago
a7b02975b7
No TEMP1 or TEMP2 pins for TEENSYLU || PRINTRBOARD
Pins 2 and 3 are probably general-use pins, since the filament sensor
uses pin 2.
10 years ago
3ec0f7cfc0
Merge branch 'issue_1379_printrboard_lcd' of https://github.com/thinkyhead/Marlin into issue_1379_printrboard_lcd
Diverged from origin
10 years ago
6723388f7f
Proposed fix to #1379 . Printrboard I2C LCD support
10 years ago
09eff0c4db
Merge branch 'rename_lastnr' of https://github.com/thinkyhead/Marlin into rename_lastnr
Diverged from origin
10 years ago
03c9cb60e8
Rename lastnr to autostart_index and...
Replace instances of the number 13 with FILENAME_LENGTH where
appropriate.
10 years ago
ef5959a705
Fix Temperature
Githun insert this line when i merge with actual Branch development...
10 years ago
3d4ee6c868
Merge branch '4th-extruders' of https://github.com/MagoKimbra/Marlin into 4th-extruders
Conflicts:
Marlin/temperature.cpp
10 years ago
986e723eeb
Add 4th extruder
10 years ago
9552e59306
Merge pull request #1402 from thinkyhead/issue_1227_max6675_spi
Borrow from Ultimaker to fix MAX6675 SPI conflict
10 years ago
49765fc75d
Merge branch 'issue_1227_max6675_spi' of https://github.com/thinkyhead/Marlin into issue_1227_max6675_spi
Branches diverged
10 years ago
f16bdd2ff2
Borrow from Ultimaker to fix MAX6675 SPI conflict
Changes to temperature.cpp from Ultimaker fork, intended to address
#1226 and #1227
10 years ago
1ed3913333
Rename lastnr to autostart_index and...
Replace instances of the number 13 with FILENAME_LENGTH where
appropriate.
10 years ago
06c3b37933
Formatting cleanup of quiet sources
Formatting for code-folding plus minor style changes to less active
code.
10 years ago
Scott Lahteine
AnHardt
Philip Schell
Scott Lahteine
MagoKimbra