Philip Schell
e18403235d
Add 4th extruder
9 лет назад
Philip Schell
7baee555f4
Add 4th extruder
9 лет назад
Philip Schell
cebc7daf2a
Add 4th extruder
9 лет назад
Philip Schell
ef4c7abb21
Update language_es.h
Add 4th extruder
9 лет назад
Philip Schell
22e591518a
Update language_de.h
Add 4th extruder
9 лет назад
Philip Schell
a20c35bb38
Update language_ca.h
Add 4th extruder
9 лет назад
Jérémie FRANCOIS
dd301be52d
Added suport for multiline G-code commands in the LCD menus
9 лет назад
AnHardt
aa48056c03
Made centering of bootlogo work and removed contraproductiv setScale2x2() in dogm_lcd_implementation.h
9 лет назад
AnHardt
0d219b3e14
Make centering of STRING_SPLASH work
9 лет назад
AnHardt
59315330dd
Remove definition of VERSION_STRING and replace where usend with STRING_VERSION
9 лет назад
AnHardt
8c792c7b22
Make STRING_VERSION and VERSION_STRING the same
9 лет назад
Scott Lahteine
a231764523
tweak tweak
9 лет назад
Scott Lahteine
acf4a12fc3
tweak
9 лет назад
Scott Lahteine
74b40b039a
Merge branch 'cleanup_pins' of https://github.com/thinkyhead/Marlin into cleanup_pins
Pull for divergence.
9 лет назад
Scott Lahteine
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.
9 лет назад
Scott Lahteine
a0a97c9c4c
cleanup
9 лет назад
Scott Lahteine
aa23e75eb8
Cleanup heading
9 лет назад
Scott Lahteine
89282ebaa6
Split up pins to make it more manageable
Hopefully this is helpful to organization and future expansion….
9 лет назад
Scott Lahteine
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.
9 лет назад
Scott Lahteine
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.
9 лет назад
Scott Lahteine
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.
9 лет назад
Scott Lahteine
b51a583f08
cleanup
9 лет назад
Scott Lahteine
5347ac2766
cleanup
9 лет назад
Scott Lahteine
b684f7e92b
Cleanup heading
9 лет назад
Scott Lahteine
86f1d1cfc3
Split up pins to make it more manageable
Hopefully this is helpful to organization and future expansion….
9 лет назад
MagoKimbra
3021f7f743
Fix PID_dT
Add PID_dT in temeprature.cpp
9 лет назад
Scott Lahteine
415d95a298
Merge pull request #1401 from thinkyhead/issue_1379_printrboard_lcd
Proposed fix to #1379 . Printrboard I2C LCD support
9 лет назад
Scott Lahteine
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.
9 лет назад
Scott Lahteine
3ec0f7cfc0
Merge branch 'issue_1379_printrboard_lcd' of https://github.com/thinkyhead/Marlin into issue_1379_printrboard_lcd
Diverged from origin
9 лет назад
Scott Lahteine
6723388f7f
Proposed fix to #1379 . Printrboard I2C LCD support
9 лет назад
Scott Lahteine
09eff0c4db
Merge branch 'rename_lastnr' of https://github.com/thinkyhead/Marlin into rename_lastnr
Diverged from origin
9 лет назад
Scott Lahteine
03c9cb60e8
Rename lastnr to autostart_index and...
Replace instances of the number 13 with FILENAME_LENGTH where
appropriate.
9 лет назад
MagoKimbra
ef5959a705
Fix Temperature
Githun insert this line when i merge with actual Branch development...
9 лет назад
MagoKimbra
3d4ee6c868
Merge branch '4th-extruders' of https://github.com/MagoKimbra/Marlin into 4th-extruders
Conflicts:
Marlin/temperature.cpp
9 лет назад
MagoKimbra
986e723eeb
Add 4th extruder
9 лет назад
Scott Lahteine
9552e59306
Merge pull request #1402 from thinkyhead/issue_1227_max6675_spi
Borrow from Ultimaker to fix MAX6675 SPI conflict
9 лет назад
Scott Lahteine
49765fc75d
Merge branch 'issue_1227_max6675_spi' of https://github.com/thinkyhead/Marlin into issue_1227_max6675_spi
Branches diverged
9 лет назад
Scott Lahteine
f16bdd2ff2
Borrow from Ultimaker to fix MAX6675 SPI conflict
Changes to temperature.cpp from Ultimaker fork, intended to address
#1226 and #1227
9 лет назад
Scott Lahteine
1ed3913333
Rename lastnr to autostart_index and...
Replace instances of the number 13 with FILENAME_LENGTH where
appropriate.
9 лет назад
Scott Lahteine
06c3b37933
Formatting cleanup of quiet sources
Formatting for code-folding plus minor style changes to less active
code.
9 лет назад
Scott Lahteine
23fcd1ecb2
Merge pull request #1407 from thinkyhead/cleanup_marlinserial
Formatting cleanup of quiet sources
9 лет назад
Scott Lahteine
fd78902194
Formatting cleanup of quiet sources
9 лет назад
Scott Lahteine
5c1814383a
Merge pull request #1390 from floyd871/Development
Show Custom M_Code for Z-Probe Offset when entering M503
9 лет назад
MagoKimbra
0ebf896070
Add 4th extruder
9 лет назад
Michael Neumann
a9d7ab9530
Update ConfigurationStore.cpp
Done
9 лет назад
Scott Lahteine
a244bcb953
Merge pull request #1403 from thinkyhead/issue_1356
Fix Issue #1356 – remove EXTRUDER1_Z_OFFSET
9 лет назад
Scott Lahteine
3a9a3e5ed8
Fix Issue #1356 – remove EXTRUDER1_Z_OFFSET
This define is not used.
9 лет назад
Scott Lahteine
e770489f27
Borrow from Ultimaker to fix MAX6675 SPI conflict
Changes to temperature.cpp from Ultimaker fork, intended to address
#1226 and #1227
9 лет назад
Scott Lahteine
54d5b52a2e
Merge pull request #1399 from beanz/use-bed-defines-not-extruder-ones
Code wont compile with extruder but without bed runaway protection defined.
9 лет назад
Mark Hindess
0ce252ba7a
This ifdef is for bed code so should use bed constants for testing.
Without this fix, the code wont compile with extruder but without bed
runaway protection defined.
9 лет назад