2427d0b683 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'sd_sorting' of  https://github.com/thinkyhead/Marlin  into sd_sorting  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								8ebefe6d35 
								
							
								 
							
						 
						
							
							
								
								Completed SORT_USES_MORE_RAM implementation  
							
							... 
							
							
 
							
							For the MORE_RAM option we need to buffer both the short and long
names, even though long names are sometimes redundant. Worst case, all
the names are max length. We can save some RAM by not storing these. We
could save more RAM by only storing the visible part of the long name. 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								725ba8d01e 
								
							
								 
							
						 
						
							
							
								
								Improvements, more SORT_USES_MORE_RAM  
							
							... 
							
							
 
							
							With this option, always keeps the dir in RAM, doubling as a cache for
getfilename. A board with only 8K of SRAM is cutting it very close. 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								2b54eeb897 
								
							
								 
							
						 
						
							
							
								
								Expand on More RAM concept, address minor bugs  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								14187dae6c 
								
							
								 
							
						 
						
							
							
								
								SD Card Alpha Sorting  
							
							... 
							
							
 
							
							First iteration of alphabetical sorting for SD cards, both
slow+efficient and fast+rammy. Option for folders to sort first, last,
or not at all. 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								662fe8288b 
								
							
								 
							
						 
						
							
							
								
								kill DEADJOE  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								aad336eb81 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'lcd_wait_better' of  https://github.com/thinkyhead/Marlin  into lcd_wait_better  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								5874852501 
								
							
								 
							
						 
						
							
							
								
								get latest Marlin_v1 changes  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								12b51d6060 
								
							
								 
							
						 
						
							
							
								
								Ignore S and P if no value >0 is included.  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								d12b24758a 
								
							
								 
							
						 
						
							
							
								
								Clear LCD to welcome_msg if not printing  
							
							... 
							
							
 
							
							The welcome message is more appropriate than “resuming print” if
nothing is printing. 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								3f54c9ba33 
								
							
								 
							
						 
						
							
							
								
								Relocate click ignore code into info screen  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								92e21d3ee2 
								
							
								 
							
						 
						
							
							
								
								M0-M1 Enhancements  
							
							... 
							
							
 
							
							Allow M0 and M1 to include a message string. Ignore clicks on “Wait for
user” so that the Info Screen stays up. 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								5714f64927 
								
							
								 
							
						 
						
							
							
								
								get latest Marlin_v1 changes  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								d407a43ac1 
								
							
								 
							
						 
						
							
							
								
								Ignore S and P if no value >0 is included.  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								eaa788e076 
								
							
								 
							
						 
						
							
							
								
								Completed SORT_USES_MORE_RAM implementation  
							
							... 
							
							
 
							
							For the MORE_RAM option we need to buffer both the short and long
names, even though long names are sometimes redundant. Worst case, all
the names are max length. We can save some RAM by not storing these. We
could save more RAM by only storing the visible part of the long name. 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								6901445592 
								
							
								 
							
						 
						
							
							
								
								Improvements, more SORT_USES_MORE_RAM  
							
							... 
							
							
 
							
							With this option, always keeps the dir in RAM, doubling as a cache for
getfilename. A board with only 8K of SRAM is cutting it very close. 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								0d35b1d0b8 
								
							
								 
							
						 
						
							
							
								
								Allow negative values in menus  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								87fc00c182 
								
							
								 
							
						 
						
							
							
								
								Expand on More RAM concept, address minor bugs  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								7681711e7e 
								
							
								 
							
						 
						
							
							
								
								Clear LCD to welcome_msg if not printing  
							
							... 
							
							
 
							
							The welcome message is more appropriate than “resuming print” if
nothing is printing. 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								aa4160ba62 
								
							
								 
							
						 
						
							
							
								
								Relocate click ignore code into info screen  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								cd769781a1 
								
							
								 
							
						 
						
							
							
								
								M0-M1 Enhancements  
							
							... 
							
							
 
							
							Allow M0 and M1 to include a message string. Ignore clicks on “Wait for
user” so that the Info Screen stays up. 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								f40cff59f3 
								
							
								 
							
						 
						
							
							
								
								SD Card Alpha Sorting  
							
							... 
							
							
 
							
							First iteration of alphabetical sorting for SD cards, both
slow+efficient and fast+rammy. Option for folders to sort first, last,
or not at all. 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								90eb266139 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1148  from krasin/travis  
							
							... 
							
							
 
							
							Add Travis CI config to build Marlin firmware. 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								d078c7c29f 
								
							
								 
							
						 
						
							
							
								
								Add Travis CI config to build Marlin firmware.  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								3dc9e478ad 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1143  from Silly105/Marlin_v1  
							
							... 
							
							
 
							
							Changed graphic LCD info screen to match the set # of extruders 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								0d97dec434 
								
							
								 
							
						 
						
							
							
								
								Adaption of LCD info screen  
							
							... 
							
							
 
							
							Here comes a compile-time operation to match the extruder symbols on the
info screen to the set number of extruders in configuration.h.
When only one extruder is selected, the "1" on the symbol will not be
displayed. 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								1651ccc0cc 
								
							
								 
							
						 
						
							
							
								
								Added Filament Sensor to the README  
							
							... 
							
							
 
							
							Added some background on the filament sensor to explain it better. 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								3b1ab84536 
								
							
								 
							
						 
						
							
							
								
								Display Filament Sensor data on graphic LCD  
							
							... 
							
							
 
							
							Added support to show the filament width on the status line of the
graphic LCD.  The status will show for 5 sec and then switch over to
data.  Status can be seen by clicking the button. 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								d84934d8c5 
								
							
								 
							
						 
						
							
							
								
								Display Filament Sensor data on 20x4 LCD  
							
							... 
							
							
 
							
							Changes to support displaying the real-time filament width and the
volume factor on a 20x4 LCD.  The data is displayed on the 4th line.
First the status message is displayed for 5 seconds, and then the
filament data is displayed.  The status message can be seen by
re-selecting the info screen in the menu. 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								4ffdbcbd4e 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1138  from filipmu/Marlin_v1  
							
							... 
							
							
 
							
							Comment out the FILAMENT_SENSOR define by default in config. 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								5c8107bcdd 
								
							
								 
							
						 
						
							
							
								
								Commented out FILAMENT_SENSOR #define  
							
							... 
							
							
 
							
							Commented out the FILAMENT_SENSOR define so that it is not enabled by
default.  Code does not work on all hardware variants. 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								df7c80335a 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3  from filipmu/Marlin_v1  
							
							... 
							
							
 
							
							Sync up from my Marlin_v1 to Filament-sensor 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								b014fd1ad2 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2  from ErikZalm/Marlin_v1  
							
							... 
							
							
 
							
							Sync up to Marlin 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								443b648863 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1133  from monkeydave/update_delta_config  
							
							... 
							
							
 
							
							Updated example configurations for Delta printers 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								377dfb182f 
								
							
								 
							
						 
						
							
							
								
								Updated example configurations for Delta printers  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								b81021f475 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/ErikZalm/Marlin  into Marlin_v1  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								724197454c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1104  from ch100/Marlin_v1  
							
							... 
							
							
 
							
							Fixed typo. 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								058e446531 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1037  from filipmu/Filament-Sensor  
							
							... 
							
							
 
							
							Support for a filament diameter sensor 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								110c5dcf23 
								
							
								 
							
						 
						
							
							
								
								Fixed typo.  
							
							... 
							
							
 
							
							Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com> 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								256c25a843 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1101  from MattStultz/patch-1  
							
							... 
							
							
 
							
							Fix "add_homeing" to "add_homing" to match changes 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								ca30aee903 
								
							
								 
							
						 
						
							
							
								
								Fix "add_homeing" to "add_homing" to match changes  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								0733825fb1 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1099  from Fourmi/Marlin_v1  
							
							... 
							
							
 
							
							Update line 627 ,wrong number on thermistortables 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								af3e4d7510 
								
							
								 
							
						 
						
							
							
								
								Update line 627 ,wrong number on thermistortables  
							
							... 
							
							
 
							
							Wrong number on line 627 > i change number "12" by the correct number "13"
Soory 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								aaaf8fe8dd 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1068  from darkjavi/Marlin_v1  
							
							... 
							
							
 
							
							Added profile for RAMPS with 2 extruders and 1 fan, no heated bed 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								b360306881 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1073  from WingTangWong/wing-fix-float-delta  
							
							... 
							
							
 
							
							Wing fix float delta 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								ce85515428 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1082  from Fourmi/Marlin_v1  
							
							... 
							
							
 
							
							Add thermistor table 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								764921bdbf 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1091  from Aldert/patch-1  
							
							... 
							
							
 
							
							Update motion_control.cpp 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								c40c7b589b 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1095  from thinkyhead/codeclean  
							
							... 
							
							
 
							
							Simple code cleanup. Rename "homeing" to homing. 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								0f2e0525df 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1096  from thinkyhead/set-home  
							
							... 
							
							
 
							
							Proposed feature: Set Home Offsets 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								5ae02a361b 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1097  from thinkyhead/round-up-xyz  
							
							... 
							
							
 
							
							Adjust the Z display to hide float rounding errors 
							
						 
						
							11 years ago