Commit Graph

1988 Commits

Author SHA1 Message Date
Scott Lahteine
8045e4d60d 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.
2015-01-27 15:33:21 -08:00
Scott Lahteine
df4f3e7712 cleanup 2015-01-27 15:32:34 -08:00
Scott Lahteine
b6ecbd8cc4 cleanup 2015-01-27 15:32:34 -08:00
Scott Lahteine
4e573134de Cleanup heading 2015-01-27 15:32:34 -08:00
Scott Lahteine
574a5ab72a Split up pins to make it more manageable
Hopefully this is helpful to organization and future expansion….
2015-01-27 15:32:34 -08:00
Scott Lahteine
ab1ddcd89d Merge pull request #1425 from clefranc/Development
EEPROM data not aligned
2015-01-27 14:26:11 -08:00
clefranc
d55c62bf9f Update ConfigurationStore.cpp
Moved #endif to allow filament settings to print.
2015-01-27 13:28:37 -05:00
clefranc
e779641c73 Update ConfigurationStore.cpp
Added PIDTEMP dummy write to align EEPROM read/write operation.
2015-01-27 13:25:47 -05:00
Scott Lahteine
baac6e242d Merge pull request #1419 from AnHardt/bootsplash
repair Bootsplash
2015-01-27 00:30:29 -08:00
Scott Lahteine
a425111eb7 Merge pull request #1421 from blubbfish/patch-2
Fixing the language files for the 4th extruder
2015-01-27 00:04:23 -08:00
AnHardt
75cf302da3 example configurations changed to meet Configuration.h 2015-01-27 00:01:33 +01:00
Philip Schell
61fd45a0c2 Add 4th extruder 2015-01-26 21:22:00 +01:00
Philip Schell
2650be4921 Add 4th extruder 2015-01-26 21:21:31 +01:00
Philip Schell
a9763d894e Add 4th extruder 2015-01-26 21:20:56 +01:00
Philip Schell
4949088302 Add 4th extruder 2015-01-26 21:20:04 +01:00
Philip Schell
fc5204bd42 Add 4th extruder 2015-01-26 21:17:35 +01:00
Philip Schell
9834818ef7 Add 4th extruder 2015-01-26 21:16:23 +01:00
Philip Schell
8696963154 Add 4th extruder 2015-01-26 21:15:24 +01:00
Philip Schell
ee8a7419f4 Add 4th extruder 2015-01-26 21:14:18 +01:00
Philip Schell
e18403235d Add 4th extruder 2015-01-26 21:12:55 +01:00
Philip Schell
7baee555f4 Add 4th extruder 2015-01-26 21:11:49 +01:00
Philip Schell
cebc7daf2a Add 4th extruder 2015-01-26 21:10:42 +01:00
Philip Schell
ef4c7abb21 Update language_es.h
Add 4th extruder
2015-01-26 21:09:24 +01:00
Philip Schell
22e591518a Update language_de.h
Add 4th extruder
2015-01-26 21:08:13 +01:00
Philip Schell
a20c35bb38 Update language_ca.h
Add 4th extruder
2015-01-26 21:04:31 +01:00
AnHardt
aa48056c03 Made centering of bootlogo work and removed contraproductiv setScale2x2() in dogm_lcd_implementation.h 2015-01-26 17:26:22 +01:00
AnHardt
0d219b3e14 Make centering of STRING_SPLASH work 2015-01-26 16:00:10 +01:00
AnHardt
59315330dd Remove definition of VERSION_STRING and replace where usend with STRING_VERSION 2015-01-26 15:52:01 +01:00
AnHardt
8c792c7b22 Make STRING_VERSION and VERSION_STRING the same 2015-01-26 15:40:44 +01:00
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.
2015-01-25 19:30:51 -08:00
MagoKimbra
3021f7f743 Fix PID_dT
Add PID_dT in temeprature.cpp
2015-01-25 17:56:14 +01:00
Scott Lahteine
415d95a298 Merge pull request #1401 from thinkyhead/issue_1379_printrboard_lcd
Proposed fix to #1379. Printrboard I2C LCD support
2015-01-24 16:38:09 -08:00
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.
2015-01-24 05:10:48 -08:00
Scott Lahteine
3ec0f7cfc0 Merge branch 'issue_1379_printrboard_lcd' of https://github.com/thinkyhead/Marlin into issue_1379_printrboard_lcd
Diverged from origin
2015-01-24 05:01:26 -08:00
Scott Lahteine
6723388f7f Proposed fix to #1379. Printrboard I2C LCD support 2015-01-24 05:01:02 -08:00
MagoKimbra
ef5959a705 Fix Temperature
Githun insert this line when i merge with actual Branch development...
2015-01-24 13:49:29 +01:00
MagoKimbra
3d4ee6c868 Merge branch '4th-extruders' of https://github.com/MagoKimbra/Marlin into 4th-extruders
Conflicts:
	Marlin/temperature.cpp
2015-01-24 13:41:15 +01:00
MagoKimbra
986e723eeb Add 4th extruder 2015-01-24 13:37:58 +01:00
Scott Lahteine
9552e59306 Merge pull request #1402 from thinkyhead/issue_1227_max6675_spi
Borrow from Ultimaker to fix MAX6675 SPI conflict
2015-01-24 04:06:42 -08:00
Scott Lahteine
49765fc75d Merge branch 'issue_1227_max6675_spi' of https://github.com/thinkyhead/Marlin into issue_1227_max6675_spi
Branches diverged
2015-01-24 03:50:04 -08:00
Scott Lahteine
f16bdd2ff2 Borrow from Ultimaker to fix MAX6675 SPI conflict
Changes to temperature.cpp from Ultimaker fork, intended to address
#1226 and #1227
2015-01-24 03:49:15 -08:00
Scott Lahteine
23fcd1ecb2 Merge pull request #1407 from thinkyhead/cleanup_marlinserial
Formatting cleanup of quiet sources
2015-01-23 21:33:43 -08:00
Scott Lahteine
fd78902194 Formatting cleanup of quiet sources 2015-01-23 21:11:50 -08:00
Scott Lahteine
5c1814383a Merge pull request #1390 from floyd871/Development
Show Custom M_Code for Z-Probe Offset when entering M503
2015-01-23 20:08:23 -08:00
MagoKimbra
0ebf896070 Add 4th extruder 2015-01-23 23:13:06 +01:00
Michael Neumann
a9d7ab9530 Update ConfigurationStore.cpp
Done
2015-01-23 21:05:27 +01:00
Scott Lahteine
a244bcb953 Merge pull request #1403 from thinkyhead/issue_1356
Fix Issue #1356 – remove EXTRUDER1_Z_OFFSET
2015-01-23 10:51:39 -08:00
Scott Lahteine
3a9a3e5ed8 Fix Issue #1356 – remove EXTRUDER1_Z_OFFSET
This define is not used.
2015-01-23 10:51:06 -08:00
Scott Lahteine
e770489f27 Borrow from Ultimaker to fix MAX6675 SPI conflict
Changes to temperature.cpp from Ultimaker fork, intended to address
#1226 and #1227
2015-01-23 10:37:39 -08:00
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.
2015-01-23 08:36:25 -08:00