Commit Graph

1592 Commits

Author SHA1 Message Date
82474fef8a 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.
2015-01-27 15:33:21 -08:00
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
df4f3e7712 cleanup 2015-01-27 15:32:34 -08:00
b6ecbd8cc4 cleanup 2015-01-27 15:32:34 -08:00
4e573134de Cleanup heading 2015-01-27 15:32:34 -08:00
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
d55c62bf9f Update ConfigurationStore.cpp
Moved #endif to allow filament settings to print.
2015-01-27 13:28:37 -05:00
e779641c73 Update ConfigurationStore.cpp
Added PIDTEMP dummy write to align EEPROM read/write operation.
2015-01-27 13:25:47 -05:00
baac6e242d Merge pull request #1419 from AnHardt/bootsplash
repair Bootsplash
2015-01-27 00:30:29 -08:00
75cf302da3 example configurations changed to meet Configuration.h 2015-01-27 00:01:33 +01:00
61fd45a0c2 Add 4th extruder 2015-01-26 21:22:00 +01:00
2650be4921 Add 4th extruder 2015-01-26 21:21:31 +01:00
a9763d894e Add 4th extruder 2015-01-26 21:20:56 +01:00
4949088302 Add 4th extruder 2015-01-26 21:20:04 +01:00
fc5204bd42 Add 4th extruder 2015-01-26 21:17:35 +01:00
9834818ef7 Add 4th extruder 2015-01-26 21:16:23 +01:00
8696963154 Add 4th extruder 2015-01-26 21:15:24 +01:00
ee8a7419f4 Add 4th extruder 2015-01-26 21:14:18 +01:00
e18403235d Add 4th extruder 2015-01-26 21:12:55 +01:00
7baee555f4 Add 4th extruder 2015-01-26 21:11:49 +01:00
cebc7daf2a Add 4th extruder 2015-01-26 21:10:42 +01:00
ef4c7abb21 Update language_es.h
Add 4th extruder
2015-01-26 21:09:24 +01:00
22e591518a Update language_de.h
Add 4th extruder
2015-01-26 21:08:13 +01:00
a20c35bb38 Update language_ca.h
Add 4th extruder
2015-01-26 21:04:31 +01:00
aa48056c03 Made centering of bootlogo work and removed contraproductiv setScale2x2() in dogm_lcd_implementation.h 2015-01-26 17:26:22 +01:00
0d219b3e14 Make centering of STRING_SPLASH work 2015-01-26 16:00:10 +01:00
59315330dd Remove definition of VERSION_STRING and replace where usend with STRING_VERSION 2015-01-26 15:52:01 +01:00
8c792c7b22 Make STRING_VERSION and VERSION_STRING the same 2015-01-26 15:40:44 +01:00
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
3021f7f743 Fix PID_dT
Add PID_dT in temeprature.cpp
2015-01-25 17:56:14 +01:00
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
6723388f7f Proposed fix to #1379. Printrboard I2C LCD support 2015-01-24 05:01:02 -08:00
ef5959a705 Fix Temperature
Githun insert this line when i merge with actual Branch development...
2015-01-24 13:49:29 +01:00
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
986e723eeb Add 4th extruder 2015-01-24 13:37:58 +01:00
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
23fcd1ecb2 Merge pull request #1407 from thinkyhead/cleanup_marlinserial
Formatting cleanup of quiet sources
2015-01-23 21:33:43 -08:00
fd78902194 Formatting cleanup of quiet sources 2015-01-23 21:11:50 -08:00
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
0ebf896070 Add 4th extruder 2015-01-23 23:13:06 +01:00
a9d7ab9530 Update ConfigurationStore.cpp
Done
2015-01-23 21:05:27 +01:00
3a9a3e5ed8 Fix Issue #1356 – remove EXTRUDER1_Z_OFFSET
This define is not used.
2015-01-23 10:51:06 -08:00
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
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.
2015-01-23 16:30:13 +00:00
9040446780 Merge pull request #1395 from AnHardt/iss1394
removed function step_wait() from stepper.cpp
2015-01-23 06:58:10 -08:00
25f79c5010 Merge pull request #1391 from CONSULitAS/Development-newBoard_K8200
Add: Board for Vellemann K8200 (derived from 3Drag)
2015-01-23 06:08:38 -08:00
9ce75ab7de Merge pull request #1386 from roglio/Development
Fixing a build error for melzi and gfx display
2015-01-23 06:00:24 -08:00
15a00a5a7c Add 1µs delay in other appropriate spots 2015-01-23 03:24:45 -08:00
23cb899c5a removed function step_wait() from stepper.cpp
removed function step_wait() from stepper.cpp because its used nowhere.
2015-01-21 16:30:45 +01:00
d9d4a78e0f Add proper delay in stepper.cpp
Issue #1385 describes a delay that the compiler is optimizing out and
this solution.
2015-01-21 01:51:29 -08:00