Scott Lahteine 
							
						 
					 
					
						
						
							
						
						5fbef6bed2 
					 
					
						
						
							
							Merge pull request  #1409  from thinkyhead/rename_lastnr  
						
						... 
						
						
						
						Rename lastnr to autostart_index and... 
						
						
					 
					
						2015-01-27 22:07:23 -08:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						53eea611b8 
					 
					
						
						
							
							Fix MSG_NOZZLE  
						
						
						
						
					 
					
						2015-01-27 22:00:32 -08:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						d7211a5324 
					 
					
						
						
							
							Changes for Portuguese too  
						
						
						
						
					 
					
						2015-01-27 21:53:08 -08:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						0a21727c0a 
					 
					
						
						
							
							Portuguese (pt) and Brazilian Portuguese (pt-br)  
						
						
						
						
					 
					
						2015-01-27 21:45:21 -08:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						c90f2e77d8 
					 
					
						
						
							
							Remove language strings that only add a number  
						
						... 
						
						
						
						This won’t reduce the string storage in the end, but it makes the
language files smaller. Also removed remaining unused strings. 
						
						
					 
					
						2015-01-27 21:36:58 -08:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						2ce4a102ee 
					 
					
						
						
							
							Add support for Megatronics 3 a la  #1426  
						
						
						
						
					 
					
						2015-01-27 15:54:46 -08:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						ae4b348d77 
					 
					
						
						
							
							Make sure _Ex_PINS is defined  
						
						... 
						
						
						
						Also fix analogInputToDigitalPin so it uses proper C hex notation 
						
						
					 
					
						2015-01-27 15:36:47 -08:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						80be6f3f91 
					 
					
						
						
							
							tweak tweak  
						
						
						
						
					 
					
						2015-01-27 15:36:47 -08:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						ebe78cb36f 
					 
					
						
						
							
							tweak  
						
						
						
						
					 
					
						2015-01-27 15:36:47 -08:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Jérémie FRANCOIS 
							
						 
					 
					
						
						
							
						
						dd301be52d 
					 
					
						
						
							
							Added suport for multiline G-code commands in the LCD menus  
						
						
						
						
					 
					
						2015-01-26 18:50:29 +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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						6723388f7f 
					 
					
						
						
							
							Proposed fix to  #1379 . Printrboard I2C LCD support  
						
						
						
						
					 
					
						2015-01-24 05:01:02 -08:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						03c9cb60e8 
					 
					
						
						
							
							Rename lastnr to autostart_index and...  
						
						... 
						
						
						
						Replace instances of the number 13 with FILENAME_LENGTH where
appropriate. 
						
						
					 
					
						2015-01-24 04:57:44 -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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						06c3b37933 
					 
					
						
						
							
							Formatting cleanup of quiet sources  
						
						... 
						
						
						
						Formatting for code-folding plus minor style changes to less active
code. 
						
						
					 
					
						2015-01-23 22:26:52 -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