MagoKimbra 
							
						 
					 
					
						
						
							
						
						986e723eeb 
					 
					
						
						
							
							Add 4th extruder  
						
						
						
						
					 
					
						2015-01-24 13:37:58 +01:00 
						 
				 
			
				
					
						
							
							
								Fourmi 
							
						 
					 
					
						
						
							
						
						af3e4d7510 
					 
					
						
						
							
							Update line 627 ,wrong number on thermistortables  
						
						... 
						
						
						
						Wrong number on line 627 > i change number "12" by the correct number "13"
Soory 
						
						
					 
					
						2014-10-06 14:21:44 +02:00 
						 
				 
			
				
					
						
							
							
								Fourmi 
							
						 
					 
					
						
						
							
						
						a664763e6f 
					 
					
						
						
							
							Update thermistortables.h  
						
						... 
						
						
						
						Add another thermistor table (13),it's a cartridge thermistor up to +300°C,use with Hotend "Simple ONE" & "All In ONE"
Thx 
						
						
					 
					
						2014-09-27 09:05:10 +02:00 
						 
				 
			
				
					
						
							
							
								Fourmi 
							
						 
					 
					
						
						
							
						
						c35736a140 
					 
					
						
						
							
							Update thermistortables.h  
						
						... 
						
						
						
						Add another thermistor table,use with hotend "Simple ONE" & "All in ONE" 
						
						
					 
					
						2014-09-26 21:49:07 +02:00 
						 
				 
			
				
					
						
							
							
								cocktailyogi 
							
						 
					 
					
						
						
							
						
						512f2a3136 
					 
					
						
						
							
							restore Branch from Backup  
						
						... 
						
						
						
						sorry for that 
						
						
					 
					
						2014-06-23 17:09:57 +02:00 
						 
				 
			
				
					
						
							
							
								Greg Tan 
							
						 
					 
					
						
						
							
						
						6e6e4e2143 
					 
					
						
						
							
							Added thermistor table for the 500C thermistor shipped with the Pico hot end.  
						
						
						
						
					 
					
						2014-06-08 09:35:04 +08:00 
						 
				 
			
				
					
						
							
							
								Cameron Lai 
							
						 
					 
					
						
						
							
						
						da6b536182 
					 
					
						
						
							
							Add 5DPrint D8 Driver Board info and temperature table for Makibox hot bed  
						
						
						
						
					 
					
						2014-04-24 16:49:42 +08:00 
						 
				 
			
				
					
						
							
							
								Nutz95 
							
						 
					 
					
						
						
							
						
						ed6f4a71c5 
					 
					
						
						
							
							fix wrong temptable index  
						
						
						
						
					 
					
						2014-04-13 18:00:55 +02:00 
						 
				 
			
				
					
						
							
							
								Nutz95 
							
						 
					 
					
						
						
							
						
						3161740df9 
					 
					
						
						
							
							This table is made for thermistor 3950 (can be found on ebay for cheap)  
						
						... 
						
						
						
						it's caracteristics are :
R25℃ ;100KΩ±1%
B Value(R25/50℃):3990K 1%
Dissipation Factor(mW/℃):1.1~1.6 In still Air
Thermal Time Constant(S):10~17 In Still Air
Operating temperature range:  (-50~+260°C)
Dimension:  1.8mm Dia X4.1mm
Lead Length  :30mm
This table was found on the following blogs:
http://cae2100.wordpress.com/2014/03/08/beta3950-thermistor-table-for-marlin/ 
and
http://microfabricator.com/articles/view/id/531ad7e59aad9d3131000000/beta-3950-thermistor-table-for-marlin  
						
						
					 
					
						2014-04-13 17:03:20 +02:00 
						 
				 
			
				
					
						
							
							
								David Forrest 
							
						 
					 
					
						
						
							
						
						b0093a1513 
					 
					
						
						
							
							thermistortables.h: Add comments that table 60 uses beta=3950.  
						
						
						
						
					 
					
						2014-03-26 23:41:10 -04:00 
						 
				 
			
				
					
						
							
							
								Josef Pavlik 
							
						 
					 
					
						
						
							
						
						831fc2a952 
					 
					
						
						
							
							Pt100 and Pt1000 temperature sensors handling  
						
						
						
						
					 
					
						2014-02-14 12:26:27 +01:00 
						 
				 
			
				
					
						
							
							
								daid 
							
						 
					 
					
						
						
							
						
						df194f75e1 
					 
					
						
						
							
							Added PT100 support for Ultiboard2  
						
						
						
						
					 
					
						2014-01-06 11:20:03 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Rossi 
							
						 
					 
					
						
						
							
						
						4623e78ce0 
					 
					
						
						
							
							Added Honeywell thermistor 135-104LAF-J01  
						
						
						
						
					 
					
						2013-07-30 14:02:18 +02:00 
						 
				 
			
				
					
						
							
							
								ErikZalm 
							
						 
					 
					
						
						
							
						
						9f2862ce48 
					 
					
						
						
							
							Merge pull request  #414  from whosawhatsis/Marlin_v1  
						
						... 
						
						
						
						regenerated thermistor table 7 
						
						
					 
					
						2013-03-25 13:14:49 -07:00 
						 
				 
			
				
					
						
							
							
								Ryan Turner 
							
						 
					 
					
						
						
							
						
						7c47e7162d 
					 
					
						
						
							
							Adding Maker's Tool Works heated bed thermistor  
						
						
						
						
					 
					
						2013-03-18 22:53:37 -05:00 
						 
				 
			
				
					
						
							
							
								whosawhatsis 
							
						 
					 
					
						
						
							
						
						6a61a3c0b4 
					 
					
						
						
							
							missing comma in last commit  
						
						
						
						
					 
					
						2013-03-08 16:15:49 -08:00 
						 
				 
			
				
					
						
							
							
								whosawhatsis 
							
						 
					 
					
						
						
							
						
						f0aee4101a 
					 
					
						
						
							
							regenerated thermistor table 7  
						
						... 
						
						
						
						Generated with createTemperatureLookup.py. The old table crapped out at
270C, which was a problem for polycarbonate. 
						
						
					 
					
						2013-03-08 13:41:49 -08:00 
						 
				 
			
				
					
						
							
							
								Denis B 
							
						 
					 
					
						
						
							
						
						49b2ddc8c1 
					 
					
						
						
							
							Cleaned up non-standard characters  
						
						
						
						
					 
					
						2013-02-04 01:41:40 -05:00 
						 
				 
			
				
					
						
							
							
								Daniele Sdei 
							
						 
					 
					
						
						
							
						
						3cf59f6f9a 
					 
					
						
						
							
							add RepRapPro Huxley thermistor tables  
						
						
						
						
					 
					
						2013-01-14 15:36:08 +01:00 
						 
				 
			
				
					
						
							
							
								daid303 
							
						 
					 
					
						
						
							
						
						7577717b59 
					 
					
						
						
							
							Fixed   #336  
						
						
						
						
					 
					
						2012-12-12 13:08:26 +01:00 
						 
				 
			
				
					
						
							
							
								daid303 
							
						 
					 
					
						
						
							
						
						52158dffcc 
					 
					
						
						
							
							Big temperature code update. No longer converts back and forwards between temperature and raw sample value. Reducing complexity, removing code. Also named some variables better. While keeping the safety intact and functionality the same.  
						
						
						
						
					 
					
						2012-12-09 23:00:06 +01:00 
						 
				 
			
				
					
						
							
							
								MaikStohn 
							
						 
					 
					
						
						
							
						
						2b7b1e52b1 
					 
					
						
						
							
							allow marlin internal 0°C represenation  
						
						
						
						
					 
					
						2012-11-13 14:37:08 +01:00 
						 
				 
			
				
					
						
							
							
								Erik vd Zalm 
							
						 
					 
					
						
						
							
						
						0e89022cc3 
					 
					
						
						
							
							Correct temptable_55 name.  
						
						
						
						
					 
					
						2012-08-28 19:47:22 +02:00 
						 
				 
			
				
					
						
							
							
								Bernhard Kubicek 
							
						 
					 
					
						
						
							
						
						6b14f95b3e 
					 
					
						
						
							
							Merge pull request  #170  from linagee/Marlin_v1  
						
						... 
						
						
						
						Marlin v1 
						
						
					 
					
						2012-06-02 03:46:56 -07:00 
						 
				 
			
				
					
						
							
							
								Bernhard Kubicek 
							
						 
					 
					
						
						
							
						
						b7fc14bc65 
					 
					
						
						
							
							repaired thermistortable_6 by graphcial fitting of the off-slope values. see issue 179.  Erik, I know you asked for no changes, but this file probably is not related and hopefully allright.  
						
						
						
						
					 
					
						2012-05-30 14:14:36 +03:00 
						 
				 
			
				
					
						
							
							
								linagee 
							
						 
					 
					
						
						
							
						
						2e8c5049c5 
					 
					
						
						
							
							Update Marlin/thermistortables.h  
						
						
						
						
					 
					
						2012-05-20 13:18:45 -06:00 
						 
				 
			
				
					
						
							
							
								linagee 
							
						 
					 
					
						
						
							
						
						2d0d8e5272 
					 
					
						
						
							
							Small correction.  
						
						
						
						
					 
					
						2012-05-20 11:09:07 -06:00 
						 
				 
			
				
					
						
							
							
								linagee 
							
						 
					 
					
						
						
							
						
						9e9db65c3f 
					 
					
						
						
							
							Update Marlin/thermistortables.h  
						
						
						
						
					 
					
						2012-05-20 05:51:29 -06:00 
						 
				 
			
				
					
						
							
							
								linagee 
							
						 
					 
					
						
						
							
						
						bd966ef389 
					 
					
						
						
							
							Update Marlin/thermistortables.h  
						
						
						
						
					 
					
						2012-05-20 05:49:01 -06:00 
						 
				 
			
				
					
						
							
							
								linagee 
							
						 
					 
					
						
						
							
						
						775da3f103 
					 
					
						
						
							
							Added top ratings and extended to ADC=1 for table 3 and 5.  
						
						
						
						
					 
					
						2012-05-20 05:35:57 -06:00 
						 
				 
			
				
					
						
							
							
								linagee 
							
						 
					 
					
						
						
							
						
						96a4baa0be 
					 
					
						
						
							
							Update Marlin/thermistortables.h  
						
						
						
						
					 
					
						2012-05-20 04:55:22 -06:00 
						 
				 
			
				
					
						
							
							
								linagee 
							
						 
					 
					
						
						
							
						
						2aa9f7b131 
					 
					
						
						
							
							Update Marlin/thermistortables.h  
						
						
						
						
					 
					
						2012-05-20 04:35:28 -06:00 
						 
				 
			
				
					
						
							
							
								linagee 
							
						 
					 
					
						
						
							
						
						dd9144994e 
					 
					
						
						
							
							Tested May 19 - It works! Verified with separate thermocouple TM-902C also.  
						
						
						
						
					 
					
						2012-05-20 04:13:29 -06:00 
						 
				 
			
				
					
						
							
							
								linagee 
							
						 
					 
					
						
						
							
						
						4c37d0d9f1 
					 
					
						
						
							
							Extended range above 250C. (Operating range states up to 300C)  
						
						
						
						
					 
					
						2012-05-20 04:01:30 -06:00 
						 
				 
			
				
					
						
							
							
								linagee 
							
						 
					 
					
						
						
							
						
						241f5a4c0e 
					 
					
						
						
							
							Update Marlin/thermistortables.h  
						
						
						
						
					 
					
						2012-05-19 05:52:12 -06:00 
						 
				 
			
				
					
						
							
							
								Bernhard 
							
						 
					 
					
						
						
							
						
						57f9359a41 
					 
					
						
						
							
							simplified the includes, makefile now works with arduino23  
						
						
						
						
					 
					
						2011-12-22 14:55:45 +01:00 
						 
				 
			
				
					
						
							
							
								Denis B 
							
						 
					 
					
						
						
							
						
						4fd75dc813 
					 
					
						
						
							
							Working version of multiple extruders (up to 3)  
						
						... 
						
						
						
						- The temperature control is pretty much complete
  (not sure what to do w/ autotemp though)
  Changed the pins assignment to clearly separate bed and extruder heaters
  and temp sensors, changed a bit how termistor tables are handled.
- The steppers control is rudimentary
  (only chanages what pins it uses depending on the active_extruder var,
   but that's enough for switching extruder in the start.gcode in the
   the profiles)
- Tested only w/ RAMPS 1.4 
						
						
					 
					
						2011-12-06 00:09:16 -05:00 
						 
				 
			
				
					
						
							
							
								Bernhard Kubicek 
							
						 
					 
					
						
						
							
						
						a9c7da06e3 
					 
					
						
						
							
							and changed ultipanel to have the mm/sec and not mm/min  
						
						... 
						
						
						
						Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin  into Marlin_v1
Conflicts:
	Marlin/Marlin.pde
	Marlin/ultralcd.h 
						
						
					 
					
						2011-11-15 22:50:43 +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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						750f6c33e3 
					 
					
						
						
							
							first commit  
						
						
						
						
					 
					
						2011-08-12 22:28:35 +02:00