Scott Lahteine 
							
						 
					 
					
						
						
							
						
						8332a15899 
					 
					
						
						
							
							Fix testing of runaway options in temperature.cpp  
						
						
						
						
					 
					
						2015-05-10 23:03:24 -07:00 
						 
				 
			
				
					
						
							
							
								Wurstnase 
							
						 
					 
					
						
						
							
						
						526ad82d20 
					 
					
						
						
							
							activate advanced_ok and no_timeout  
						
						
						
						
					 
					
						2015-05-11 08:01:51 +02:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						2b92b01afc 
					 
					
						
						
							
							Fix typo in SanityCheck.h  
						
						
						
						
					 
					
						2015-05-10 22:58:37 -07:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						2445ae3d3a 
					 
					
						
						
							
							Combine thermal runaway and watch-period  
						
						... 
						
						
						
						- Make thermal protection for all hotends and/or bed into simple
switches
- Now enable `WATCH_TEMP_PERIOD` when `THERMAL_PROTECTION_HOTENDS` is
enabled
- Move detailed thermal parameters to `Configuration_adv.h`
- Add sanity checks to warn about old configurations
- Change `WATCH_TEMP_PERIOD` to seconds instead of milliseconds 
						
						
					 
					
						2015-05-10 22:52:01 -07:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						4097207c75 
					 
					
						
						
							
							Merge pull request  #2041  from thinkyhead/watch_temp  
						
						... 
						
						
						
						More thermal protection 
						
						
					 
					
						2015-05-10 21:39:05 -07:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						45d64040fe 
					 
					
						
						
							
							Merge pull request  #2048  from Wurstnase/hit_bits  
						
						... 
						
						
						
						replace some bools 
						
						
					 
					
						2015-05-10 20:37:17 -07:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						9b3d4380d3 
					 
					
						
						
							
							Only watch the heater that was set  
						
						
						
						
					 
					
						2015-05-10 20:26:45 -07:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						52c0696e44 
					 
					
						
						
							
							Merge pull request  #2044  from thinkyhead/fix_servos_too  
						
						... 
						
						
						
						Make some z probe and servo code tweaks 
						
						
					 
					
						2015-05-10 20:10:42 -07:00 
						 
				 
			
				
					
						
							
							
								Wurstnase 
							
						 
					 
					
						
						
							
						
						b55f32f8a1 
					 
					
						
						
							
							replace some bools  
						
						... 
						
						
						
						this PR replaces some bools with one char. this will safe 3 bytes and should also be sometimes a little bit faster. 
						
						
					 
					
						2015-05-10 21:37:39 +02:00 
						 
				 
			
				
					
						
							
							
								Laurent DELAGE 
							
						 
					 
					
						
						
							
						
						e70e6e2b48 
					 
					
						
						
							
							Correction traductions  
						
						
						
						
					 
					
						2015-05-10 15:38:50 +02:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						f73f4ce555 
					 
					
						
						
							
							Make some z probe and servo code tweaks  
						
						
						
						
					 
					
						2015-05-09 19:11:19 -07:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						28c87ec81b 
					 
					
						
						
							
							Disable all heaters on temp error  
						
						
						
						
					 
					
						2015-05-08 23:17:25 -07:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						79106638a8 
					 
					
						
						
							
							Fix documentation of heating sanity check  
						
						
						
						
					 
					
						2015-05-08 22:50:08 -07:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						6110494a56 
					 
					
						
						
							
							Change default to 4°C in 16s  
						
						
						
						
					 
					
						2015-05-08 22:41:12 -07:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						54deb9eea3 
					 
					
						
						
							
							Enable WATCH_TEMP_PERIOD by default  
						
						
						
						
					 
					
						2015-05-08 22:36:02 -07:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						deedb00c18 
					 
					
						
						
							
							Document WATCH_TEMP_PERIOD  
						
						
						
						
					 
					
						2015-05-08 22:25:51 -07:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						be77cfd895 
					 
					
						
						
							
							Merge pull request  #2032  from Wurstnase/toshiba_for_all_stepper  
						
						... 
						
						
						
						We don't need the old standard one. The STEP_ADD and STEP_IF_COUNTER … 
						
						
					 
					
						2015-05-08 20:32:30 -07:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						cb4ea75fab 
					 
					
						
						
							
							Support for MKS BASE 1.0 board  
						
						
						
						
					 
					
						2015-05-08 19:07:37 -07:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						0e70511381 
					 
					
						
						
							
							Merge pull request  #2036  from brupje/mainline  
						
						... 
						
						
						
						Fixes for reprapworld's keypad 
						
						
					 
					
						2015-05-08 18:19:31 -07:00 
						 
				 
			
				
					
						
							
							
								Wurstnase 
							
						 
					 
					
						
						
							
						
						0cb87795a3 
					 
					
						
						
							
							advanced 'ok'  
						
						... 
						
						
						
						ok N(linenumber) P(bufferremaining)
the host can use this to send the data much faster.
Some pseudo code:
If (bufferremaining > 0)  send command
## as long there is free buffer send command
Also
if (linenumber > lastsend - bufferremaining) send command
## as long last linenumber received is bigger than lastsend (host) - last bufferremaining received 
						
						
					 
					
						2015-05-08 22:28:51 +02:00 
						 
				 
			
				
					
						
							
							
								Wurstnase 
							
						 
					 
					
						
						
							
						
						182e0d99c9 
					 
					
						
						
							
							Merge remote-tracking branch 'Marlin8bit/Development' into serial_wait  
						
						
						
						
					 
					
						2015-05-08 21:27:18 +02:00 
						 
				 
			
				
					
						
							
							
								brupje 
							
						 
					 
					
						
						
							
						
						d1148a0198 
					 
					
						
						
							
							Rename Configuration_megatronics.h to Configuration.h  
						
						
						
						
					 
					
						2015-05-08 14:36:23 +02:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						7f3252eea9 
					 
					
						
						
							
							Merge pull request  #1999  from paclema/Filrunout_configurable_script  
						
						... 
						
						
						
						Added configurable script for filrunout from configuration.h 
						
						
					 
					
						2015-05-08 04:39:59 -07:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						181ccc884c 
					 
					
						
						
							
							Edit thermal runaway description  
						
						
						
						
					 
					
						2015-05-07 20:46:03 -07:00 
						 
				 
			
				
					
						
							
							
								Wurstnase 
							
						 
					 
					
						
						
							
						
						073e4af7e2 
					 
					
						
						
							
							We don't need the old standard one. The STEP_ADD and STEP_IF_COUNTER are also good for non-Toshiba stepper driver.  
						
						
						
						
					 
					
						2015-05-07 18:55:47 +02:00 
						 
				 
			
				
					
						
							
							
								brupje 
							
						 
					 
					
						
						
							
						
						b7fcb11580 
					 
					
						
						
							
							Added example configuration for Megatronics  
						
						
						
						
					 
					
						2015-05-07 13:18:05 +02:00 
						 
				 
			
				
					
						
							
							
								brupje 
							
						 
					 
					
						
						
							
						
						8f8174dc93 
					 
					
						
						
							
							Revert "Default configuration for megatronics."  
						
						... 
						
						
						
						This reverts commit 22e0d2afcb 
						
						
					 
					
						2015-05-07 13:12:17 +02:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						79633a74ab 
					 
					
						
						
							
							Fix MBL compile error  
						
						
						
						
					 
					
						2015-05-06 14:25:13 -07:00 
						 
				 
			
				
					
						
							
							
								brupje 
							
						 
					 
					
						
						
							
						
						ba9741139e 
					 
					
						
						
							
							Clean up pins file for megatronics  
						
						
						
						
					 
					
						2015-05-05 14:01:52 +02:00 
						 
				 
			
				
					
						
							
							
								brupje 
							
						 
					 
					
						
						
							
						
						22e0d2afcb 
					 
					
						
						
							
							Default configuration for megatronics.  
						
						
						
						
					 
					
						2015-05-05 14:01:20 +02:00 
						 
				 
			
				
					
						
							
							
								brupje 
							
						 
					 
					
						
						
							
						
						816aa19861 
					 
					
						
						
							
							Up/down buttons were reversed, swapped the assignments  
						
						
						
						
					 
					
						2015-05-05 13:04:46 +02:00 
						 
				 
			
				
					
						
							
							
								brupje 
							
						 
					 
					
						
						
							
						
						df4d50579a 
					 
					
						
						
							
							This is conflicting with the settings in ultralcd.h. Not sure why it' s redefined here anyway.  
						
						
						
						
					 
					
						2015-05-05 12:47:24 +02:00 
						 
				 
			
				
					
						
							
							
								brupje 
							
						 
					 
					
						
						
							
						
						8f8bf3a897 
					 
					
						
						
							
							Make Marlin actually compile when #define REPRAPWORLD_KEYPAD is uncommented  
						
						
						
						
					 
					
						2015-05-05 11:03:20 +02:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						777f2d3820 
					 
					
						
						
							
							Merge pull request  #2018  from fmalpartida/bugFixing  
						
						... 
						
						
						
						Bug corrected: persistent HOMING message when HOME button pressed for homing. 
						
						
					 
					
						2015-05-05 00:12:32 -07:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						ecb46de349 
					 
					
						
						
							
							Merge pull request  #2013  from bq/Fix_lowercase  
						
						... 
						
						
						
						Fixed lowercase change missing on commit a22a228b 
						
						
					 
					
						2015-05-04 23:50:56 -07:00 
						 
				 
			
				
					
						
							
							
								fmalpartida 
							
						 
					 
					
						
						
							
						
						150a35eff8 
					 
					
						
						
							
							Bug corrected:  
						
						... 
						
						
						
						Persistent homing message.
Message was declared as an alert, therefore it was persistent.
Updated to message. 
						
						
					 
					
						2015-05-04 19:48:49 +02:00 
						 
				 
			
				
					
						
							
							
								Gina Häußge 
							
						 
					 
					
						
						
							
						
						ab246ab032 
					 
					
						
						
							
							Reverting changes to error messages on serial console  
						
						... 
						
						
						
						This reverts the changes done to the error message for line number mismatches done in commit d43cc2dd5f 
						
						
					 
					
						2015-05-04 15:03:00 +02:00 
						 
				 
			
				
					
						
							
							
								Ivan Galvez Junquera 
							
						 
					 
					
						
						
							
						
						59529b755d 
					 
					
						
						
							
							Fixed lowercase change missing on commit  a22a228b.  
						
						... 
						
						
						
						Servo.cpp and Servo.h were changed to lowercase in Makefile but not their actual filenames. 
						
						
					 
					
						2015-05-04 09:44:34 +02:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						df4c104637 
					 
					
						
						
							
							Merge pull request  #2012  from BrianGilbert/Development  
						
						... 
						
						
						
						Add example configuration for Boots Industries V2.5 Delta Printer 
						
						
					 
					
						2015-05-03 20:42:32 -07:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						1f039cde61 
					 
					
						
						
							
							Merge pull request  #1992  from thinkyhead/too_many_probes  
						
						... 
						
						
						
						Stow Z probe on M402 without extra raise 
						
						
					 
					
						2015-05-03 20:40:26 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Gilbert 
							
						 
					 
					
						
						
							
						
						1285784a49 
					 
					
						
						
							
							Add Boots Industries V2.5 example configuration  
						
						
						
						
					 
					
						2015-05-04 09:10:42 +10:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						35493e1af9 
					 
					
						
						
							
							Tweak to planner.cpp position.debug  
						
						
						
						
					 
					
						2015-05-03 16:03:05 -07:00 
						 
				 
			
				
					
						
							
							
								paclema 
							
						 
					 
					
						
						
							
						
						26015b02d8 
					 
					
						
						
							
							Fixed typo and updated Configuration.h of configurator  
						
						
						
						
					 
					
						2015-05-03 02:39:34 +02:00 
						 
				 
			
				
					
						
							
							
								paclema 
							
						 
					 
					
						
						
							
						
						aedd580911 
					 
					
						
						
							
							Updated all configuration.h examples  
						
						
						
						
					 
					
						2015-05-03 02:28:43 +02:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						2c892fca6a 
					 
					
						
						
							
							Cleanup of language.h  
						
						
						
						
					 
					
						2015-05-01 21:38:32 -07:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						2db384a21d 
					 
					
						
						
							
							Fix compile error in configuration_store.cpp  
						
						
						
						
					 
					
						2015-05-01 21:15:26 -07:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						ca8cec8e8a 
					 
					
						
						
							
							Merge pull request  #1998  from paclema/Filament_runout_fix  
						
						... 
						
						
						
						Fixed sintaxis error of filament runout 
						
						
					 
					
						2015-04-29 19:53:25 -07:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						425cd46c12 
					 
					
						
						
							
							Merge pull request  #1993  from AnHardt/TRP-bed  
						
						... 
						
						
						
						Enable TRP for the bed 
						
						
					 
					
						2015-04-29 19:44:50 -07:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						d4c74b8f8c 
					 
					
						
						
							
							Don't apply M428 if an error occurs  
						
						... 
						
						
						
						- Also move audio feedback into the command
- Added shorthand for `lcd_buzz` availability 
						
						
					 
					
						2015-04-29 19:05:48 -07:00 
						 
				 
			
				
					
						
							
							
								Scott Lahteine 
							
						 
					 
					
						
						
							
						
						d065d37822 
					 
					
						
						
							
							Add M428 to set home_offset logically  
						
						
						
						
					 
					
						2015-04-29 18:26:16 -07:00