Bernhard Kubicek
							
						 
					 | 
					
						
						
							
						
						163efdf1c7
					 | 
					
						
						
							
							Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
						
						
						
						
						
						
					 | 
					
						2011-11-06 19:49:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bernhard Kubicek
							
						 
					 | 
					
						
						
							
						
						87aaf0f70a
					 | 
					
						
						
							
							static'ified Marlin.pde.
						
						
						
						
						
						
					 | 
					
						2011-11-06 19:48:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik van der Zalm
							
						 
					 | 
					
						
						
							
						
						5cf349a24a
					 | 
					
						
						
							
							Fixed some arc bugs
						
						
						
						
						
						
					 | 
					
						2011-11-06 19:37:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bernhard Kubicek
							
						 
					 | 
					
						
						
							
						
						79d1bfb5c0
					 | 
					
						
						
							
							made many possible variables static, so they cannot be used extern.
						
						
						
						
						
						
					 | 
					
						2011-11-06 19:36:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik van der Zalm
							
						 
					 | 
					
						
						
							
						
						76b3f805c0
					 | 
					
						
						
							
							Added teensylu pins
						
						
						
						
						
						
					 | 
					
						2011-11-06 19:30:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bernhard Kubicek
							
						 
					 | 
					
						
						
							
						
						1d171e9e52
					 | 
					
						
						
							
							reformating and some minor bugs/things found on the way.
						
						
						
						
						
						
					 | 
					
						2011-11-06 19:23:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bernhard Kubicek
							
						 
					 | 
					
						
						
							
						
						900e0c9bf2
					 | 
					
						
						
							
							overworked the serial responses. Quite difficult, since many texts are Pronterface protocol.
						
						
						
						
						
						
					 | 
					
						2011-11-06 17:33:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bernhard Kubicek
							
						 
					 | 
					
						
						
							
						
						1740a83e11
					 | 
					
						
						
							
							correcting commit errors.
						
						
						
						
						
						
					 | 
					
						2011-11-06 15:10:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bernhard Kubicek
							
						 
					 | 
					
						
						
							
						
						7cc358b56b
					 | 
					
						
						
							
							wrong file location
						
						
						
						
						
						
					 | 
					
						2011-11-06 14:58:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bernhard Kubicek
							
						 
					 | 
					
						
						
							
						
						e8092898b1
					 | 
					
						
						
							
							watchdog into dedicated file
						
						
						
						
						
						
					 | 
					
						2011-11-06 14:22:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bernhard Kubicek
							
						 
					 | 
					
						
						
							
						
						2afb7bd4cf
					 | 
					
						
						
							
							refactured temperature.cpp so that there are now abstract functions to access temperatures.
						
						
						
						
						
						
					 | 
					
						2011-11-06 14:03:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik van der Zalm
							
						 
					 | 
					
						
						
							
						
						0b82465168
					 | 
					
						
						
							
							First arcs version. (Arcs not working ok)
						
						
						
						
						
						
					 | 
					
						2011-11-06 12:39:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik van der Zalm
							
						 
					 | 
					
						
						
							
						
						2e8e8878e5
					 | 
					
						
						
							
							Corrected temp variables.
						
						
						
						
						
						
					 | 
					
						2011-11-05 20:21:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik van der Zalm
							
						 
					 | 
					
						
						
							
						
						04d3b5537f
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
						
						
						
						
						
						
						
						Conflicts:
	Marlin/Configuration.h
	Marlin/EEPROMwrite.h
	Marlin/Marlin.h
	Marlin/Marlin.pde
	Marlin/temperature.cpp
	Marlin/temperature.h
	Marlin/thermistortables.h 
						
						
					 | 
					
						2011-11-05 20:03:38 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik van der Zalm
							
						 
					 | 
					
						
						
							
						
						d15f01e1b4
					 | 
					
						
						
							
							Temperature changes
						
						
						
						
						
						
					 | 
					
						2011-11-05 19:21:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bernhard Kubicek
							
						 
					 | 
					
						
						
							
						
						ea86a5e10f
					 | 
					
						
						
							
							moved the variables in the ISR, thats the most normal use case of static.
						
						
						
						
						
						
					 | 
					
						2011-11-05 16:53:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bernhard Kubicek
							
						 
					 | 
					
						
						
							
						
						b9ea0651ec
					 | 
					
						
						
							
							Revert "this is not working. Do you maybe know why?"
						
						
						
						
						
						
						
						This reverts commit 8bcdb9f5f0. 
						
						
					 | 
					
						2011-11-05 16:49:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bernhard Kubicek
							
						 
					 | 
					
						
						
							
						
						8bcdb9f5f0
					 | 
					
						
						
							
							this is not working. Do you maybe know why?
						
						
						
						
						
						
					 | 
					
						2011-11-05 16:43:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bernhard Kubicek
							
						 
					 | 
					
						
						
							
						
						40e8081623
					 | 
					
						
						
							
							changed end of line to windows, which seems to be the majority of developers main platform.
						
						
						
						
						
						
					 | 
					
						2011-11-05 14:19:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bernhard Kubicek
							
						 
					 | 
					
						
						
							
						
						00674af3a8
					 | 
					
						
						
							
							merge from the branch bkubicek/Marlin/zalmmerge
						
						
						
						
						
						
					 | 
					
						2011-11-05 14:13:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik van der Zalm
							
						 
					 | 
					
						
						
							
						
						d7c4f0780b
					 | 
					
						
						
							
							Added M42, M80 and M81
						
						
						
						
						
						
					 | 
					
						2011-11-05 11:18:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik van der Zalm
							
						 
					 | 
					
						
						
							
						
						95d3d9847c
					 | 
					
						
						
							
							M109 now equal to sprinter
						
						
						
						
						
						
					 | 
					
						2011-11-04 23:38:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik van der Zalm
							
						 
					 | 
					
						
						
							
						
						bf879ceaa9
					 | 
					
						
						
							
							Added thermistor tables
						
						
						
						
						
						
					 | 
					
						2011-11-04 22:51:14 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik van der Zalm
							
						 
					 | 
					
						
						
							
						
						094afe7c10
					 | 
					
						
						
							
							Merged Marlin, Marlin non gen6 and Ultimaker changes
						
						
						
						
						
						
					 | 
					
						2011-11-04 18:02:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik van der Zalm
							
						 
					 | 
					
						
						
							
						
						0b1423c303
					 | 
					
						
						
							
							Fixed crashes.
						
						
						
						
						
						
					 | 
					
						2011-10-18 19:13:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik van der Zalm
							
						 
					 | 
					
						
						
							
						
						27664c6da6
					 | 
					
						
						
							
							Software endstps added
						
						
						
						
						
						
					 | 
					
						2011-09-15 17:37:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik van der Zalm
							
						 
					 | 
					
						
						
							
						
						b099fe142c
					 | 
					
						
						
							
							Merge branch 'master' of github.com:ErikZalm/Marlin
						
						
						
						
						
						
					 | 
					
						2011-09-14 18:57:32 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik van der Zalm
							
						 
					 | 
					
						
						
							
						
						8e017b81ab
					 | 
					
						
						
							
							Sync with non-gen6 version
						
						
						
						
						
						
					 | 
					
						2011-09-14 18:56:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ErikZalm
							
						 
					 | 
					
						
						
							
						
						67967a4b60
					 | 
					
						
						
							
							Edited README via GitHub
						
						
						
						
						
						
					 | 
					
						2011-08-29 00:09:18 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik van der Zalm
							
						 
					 | 
					
						
						
							
						
						b5f6482dce
					 | 
					
						
						
							
							Fixed small feedrate bug.
						
						
						
						
						
						
						
						Copied Camiels comments in the Configuration.h file 
						
						
					 | 
					
						2011-08-21 18:29:47 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik van der Zalm
							
						 
					 | 
					
						
						
							
						
						0024a26ccf
					 | 
					
						
						
							
							Fixed lookup table bug.
						
						
						
						
						
						
					 | 
					
						2011-08-15 19:26:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik van der Zalm
							
						 
					 | 
					
						
						
							
						
						5a1787b2f4
					 | 
					
						
						
							
							Fix M109
						
						
						
						
						
						
					 | 
					
						2011-08-14 22:15:33 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik van der Zalm
							
						 
					 | 
					
						
						
							
						
						26bf57e22c
					 | 
					
						
						
							
							first-commit
						
						
						
						
						
						
					 | 
					
						2011-08-13 10:09:54 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik van der Zalm
							
						 
					 | 
					
						
						
							
						
						f850af5c1c
					 | 
					
						
						
							
							Signed-off-by: Erik van der Zalm <erik@vdzalm.eu>
						
						
						
						
						
						
					 | 
					
						2011-08-12 22:31:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik van der Zalm
							
						 
					 | 
					
						
						
							
						
						750f6c33e3
					 | 
					
						
						
							
							first commit
						
						
						
						
						
						
					 | 
					
						2011-08-12 22:28:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik van der Zalm
							
						 
					 | 
					
						
						
							
						
						99653ff805
					 | 
					
						
						
							
							first commit
						
						
						
						
						
						
					 | 
					
						2011-08-12 22:23:37 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |