db2f157a22 
								
							
								 
							
						 
						
							
							
								
								Replace the <= to < in the Command M907, M350 and M351.  
							
							... 
							
							
 
							
							The for loop for Axis count over the Array.
Add a break after M907 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								a5cd582665 
								
							
								 
							
						 
						
							
							
								
								Support for 10 level deep SD folder hierarchy  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								e3bc420daa 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #464  from arnoudja/Marlin_v1  
							
							... 
							
							
 
							
							Solved minor bug in controllerFan() 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								fc4ab05157 
								
							
								 
							
						 
						
							
							
								
								Solved minor bug in controllerFan()  
							
							... 
							
							
 
							
							Extruder 2 was checked where extruder 1 should be checked. 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								0ef54f2f85 
								
							
								 
							
						 
						
							
							
								
								Make M303 silent when "S0" is sent  
							
							... 
							
							
 
							
							If S is left out perhaps it should be silent, but check the spec for
this M code. 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								a200521eab 
								
							
								 
							
						 
						
							
							
								
								Added CUSTOM_MENDEL_NAME option to Configuration.h and language.h  
							
							... 
							
							
 
							
							Also cosmetic comment changes and spelling corrections in printed
messages 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								727aa2a051 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #459  from martinxyz/fix-rounding-error  
							
							... 
							
							
 
							
							fix DEFAULT_AXIS_STEPS_PER_UNIT minor Z rounding error 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								1a397825f9 
								
							
								 
							
						 
						
							
							
								
								fix DEFAULT_AXIS_STEPS_PER_UNIT minor Z rounding error  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								289c02eda4 
								
							
								 
							
						 
						
							
							
								
								Remove unnecessary pin initialization in stepper.cpp  
							
							... 
							
							
 
							
							(duplicates initialization in Marlin_main.cpp) 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								d5ad7a0814 
								
							
								 
							
						 
						
							
							
								
								Rework change to incorporate CONTROLLERFAN  
							
							... 
							
							
 
							
							Also refactor extruder auto fan logic to simplify further and now only
check every 2.5 seconds 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								c3cdaceab3 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								1c127217df 
								
							
								 
							
						 
						
							
							
								
								Make DOGLCD merge neater.  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								7f57f28ccc 
								
							
								 
							
						 
						
							
							
								
								Add lcd_buzz function to ultralcd.h so that non-LCD code can make use of lcd's buzzer.  
							
							... 
							
							
 
							
							Argument order of lcd_buzz was set to mirror that on tone(). Change
default M300 frequency to something audible. 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								788d62bcc4 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1  
							
							... 
							
							
 
							
							Conflicts:
	Marlin/Marlin.pde
	Marlin/ultralcd.cpp
	Marlin/ultralcd_implementation_hitachi_HD44780.h 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								4f96ad5621 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #456  from Stefanowicz/Marlin_v1  
							
							... 
							
							
 
							
							Add (as an option) slower SD transfer mode 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								d71f1e9bf6 
								
							
								 
							
						 
						
							
							
								
								Add (as an option) slower SD transfer mode  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								db5bb8546d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #452  from MStohn/Marlin_v1  
							
							... 
							
							
 
							
							128x64 RepRapDiscount Full Graphic Smart Controller support 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								4b2ece159b 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #453  from brackendawson/Marlin_v1  
							
							... 
							
							
 
							
							Make Gen7 1.4+ heater temp sensort pins match silkscreen. 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								d5ee2a5a62 
								
							
								 
							
						 
						
							
							
								
								Make Gen7 1.4 heater pins match silkscreen  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								7ac6d7f78e 
								
							
								 
							
						 
						
							
							
								
								FIX: Speedup - no explicit display clear needed in u8glib  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								13596e8722 
								
							
								 
							
						 
						
							
							
								
								Added RepRapDiscount FULL GRAPHIC Smart Controller  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								3a6abe1d6e 
								
							
								 
							
						 
						
							
							
								
								Removed STB custom font hack from u8glib library and moved to marlin project  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								16afbf9bfa 
								
							
								 
							
						 
						
							
							
								
								FIX: adopted latest changes from hitachi implementation  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								c83863d5d6 
								
							
								 
							
						 
						
							
							
								
								add U8glib library to Arduino1.x includes  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								34bca48b98 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								ac52dcc174 
								
							
								 
							
						 
						
							
							
								
								Updated the card menu and watch messages to make it more informative.  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								84920e9c58 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #449  from Stefanowicz/Marlin_v1  
							
							... 
							
							
 
							
							Fix: Build error when EEPROM_SETTINGS is defined and PIDTEMP is undefined 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								31bb3fb297 
								
							
								 
							
						 
						
							
							
								
								Fix: Build error when EEPROM_SETTINGS is defined and PIDTEMP is undefined  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								c80a78bb70 
								
							
								 
							
						 
						
							
							
								
								Lower the default max E feedrate a bit. With the stepper fix this is much to high.  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								5d5909fc25 
								
							
								 
							
						 
						
							
							
								
								Fix failure to compile with heated bed: remove call to non-existant scaleBedPID().  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								93f0463b21 
								
							
								 
							
						 
						
							
							
								
								Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values  
							
							... 
							
							
 
							
							Add new 'callback' edit-menu types that call a function after the edit is done. Use this to display and edit Ki and Kd correctly (removing the scaling first and reapplying it after). Also use it to reset maximum stepwise acceleration rates, after updating mm/s^2 rates via menus. (Previously, changes did nothing to affect planner unless saved back to EEPROM, and the machine reset).
Add calls to updatePID() so that PID loop uses updated values whether set by gcode (it already did this), or by restoring defaults, or loading from EEPROM (it didn't do those last two). Similarly, update the maximum step/s^2 accel rates when the mm/s^2 values are changed - whether by menu edits, restore defaults, or EEPROM read.
Refactor the acceleration rate update logic, and the PID scaling logic, into new functions that can be called from wherever, including the callbacks.
Add menu items to allow the z jerk and e jerk to be viewed/edited in the Control->Motion menu, as per xy jerk.
Conflicts:
	Marlin/language.h 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								1f74ef4157 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #441  from bkpsu/Marlin_v1  
							
							... 
							
							
 
							
							Fixed cardreader.h to resolve issue #440  (Pull Request  #425  missing file) 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								4fa2260a59 
								
							
								 
							
						 
						
							
							
								
								Fixed cardreader.h to resolve issue  #440  (Pull Request   #425  missing file)  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								038d405254 
								
							
								 
							
						 
						
							
							
								
								Corrected #endif in language.h  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								2438b34df9 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #439  from STB3/Marlin-language.h-repair  
							
							... 
							
							
 
							
							Removed GIT fragments from language.h 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								443aaa30bf 
								
							
								 
							
						 
						
							
							
								
								Removed GIT fragments  
							
							... 
							
							
 
							
							Seems that there was something wrong while merging 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								7f622467fc 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #425  from kefir-/m928_logging  
							
							... 
							
							
 
							
							M928 logging 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								86867928ac 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #434  from DDRBoxman/Marlin_v1  
							
							... 
							
							
 
							
							Add support for M300: Play beep sound 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								9a38cad6f0 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #430  from STB3/GLCD_128x64_dots  
							
							... 
							
							
 
							
							Final task of the 128x64dots GLCD implementation 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								7a5c474d91 
								
							
								 
							
						 
						
							
							
								
								Update Configuration.h  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								4e448b700a 
								
							
								 
							
						 
						
							
							
								
								Merged fetched files from Marlin_v1 branch  
							
							... 
							
							
 
							
							Pull requests: #414  #433  #432  #428  
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								fa58be3cb8 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								9f2862ce48 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #414  from whosawhatsis/Marlin_v1  
							
							... 
							
							
 
							
							regenerated thermistor table 7 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								9fb8bd5685 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #433  from whosawhatsis/bang-mode  
							
							... 
							
							
 
							
							Separate PID_MAX from BANG_MAX 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								aa816ee81c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #432  from blddk/Marlin_v1  
							
							... 
							
							
 
							
							HTML removed, Rumba added 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								0d075378d5 
								
							
								 
							
						 
						
							
							
								
								Add LARGE_FLASH define and enable it for some of the beefier boards  
							
							... 
							
							
 
							
							The LARGE_FLASH flag allows superfluous features to be excluded
on boards with less memory 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								9a1c90471f 
								
							
								 
							
						 
						
							
							
								
								Ignore unused beeper pins  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								1a0f889803 
								
							
								 
							
						 
						
							
							
								
								Add support for M300: Play beep sound  
							
							
 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								9322c408c6 
								
							
								 
							
						 
						
							
							
								
								Updated for LiquidTWI2 library version 1.2.3  
							
							... 
							
							
 
							
							The new version of the library means that PANELOLU no longer needs to be
defined in LiquidTWI.h (the library file can be used as is) and the new
version of the library also enables the buzzer on the Panucatt VIKI
panel. 
							
						 
						
							13 years ago  
				
					
						
							
							
								 
						
							
							
								fd5b7e0cec 
								
							
								 
							
						 
						
							
							
								
								Separate PID_MAX from BANG_MAX  
							
							... 
							
							
 
							
							This allows PID_FUNCTIONAL_RANGE to use a maximum duty cycle higher
than PID_MAX. This is useful for powerful heaters to heat quickly in
bang-bang mode, but use a lower duty cycle that is easier to stabilize
in PID mode. 
							
						 
						
							13 years ago