a5c059dcf5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'revert-1154-sd_sorting' into Marlin_v1  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								17de96ace7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'Marlin_v1' into revert-1154-sd_sorting  
							
							... 
							
							
 
							
							Conflicts:
	Marlin/cardreader.cpp
	Marlin/cardreader.h 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								7458bfe297 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1195  from thinkyhead/board_defines  
							
							... 
							
							
 
							
							Defines for electronics boards 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								6880e93b75 
								
							
								 
							
						 
						
							
							
								
								Happy configs  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								61d8e40712 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'board_defines' of  https://github.com/thinkyhead/Marlin  into board_defines  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								3b1f186c0c 
								
							
								 
							
						 
						
							
							
								
								Clean up configs  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								f83d0f2a68 
								
							
								 
							
						 
						
							
							
								
								Defines for electronics boards  
							
							... 
							
							
 
							
							Added boards.h which contains defines for all the board numbers, plus
some shorthand macros for less typing. 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								bd25e7393b 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1192  from thinkyhead/split_language  
							
							... 
							
							
 
							
							Split up languages.h. Use ISO language codes. 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								d201fe74c6 
								
							
								 
							
						 
						
							
							
								
								Clean up configs  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								0e23105e1e 
								
							
								 
							
						 
						
							
							
								
								Defines for electronics boards  
							
							... 
							
							
 
							
							Added boards.h which contains defines for all the board numbers, plus
some shorthand macros for less typing. 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								72da53c613 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1194  from boelle/Marlin_v1  
							
							... 
							
							
 
							
							Added example configs for printers from http://tvrrug.org.uk/  
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								174f8d3631 
								
							
								 
							
						 
						
							
							
								
								Added example configs for printers from  http://tvrrug.org.uk/  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								e970461adb 
								
							
								 
							
						 
						
							
							
								
								Clean up, move unused to the bottom, add headings  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								0c06e97e98 
								
							
								 
							
						 
						
							
							
								
								Split up languages.h, use ISO codes  
							
							... 
							
							
 
							
							Breaking up languages.h makes it easier to translate. Using language
codes makes it easier to select a language and sets the naming standard. 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								a9c334e8bc 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1191  from thinkyhead/code_shrink  
							
							... 
							
							
 
							
							Shrink and Optimize 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								842da54e68 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1187  from thinkyhead/fix_constants  
							
							... 
							
							
 
							
							A few constants where they belong 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								07c6b5ab71 
								
							
								 
							
						 
						
							
							
								
								Using axis constants  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								1857e611d3 
								
							
								 
							
						 
						
							
							
								
								Other small tweaks  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								63e1665fa9 
								
							
								 
							
						 
						
							
							
								
								Reduce ultralcd.cpp redundancies  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								e69313fc2b 
								
							
								 
							
						 
						
							
							
								
								Reduce dogm lcd code  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								bd22405412 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1190  from thinkyhead/sd_sorting  
							
							... 
							
							
 
							
							Wrap call to flush_presort 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								49791949af 
								
							
								 
							
						 
						
							
							
								
								Wrap call to flush_presort  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								140ce06692 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1188  from thinkyhead/lcd_longname  
							
							... 
							
							
 
							
							LCD Long Filename 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								28c3ad291a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'sd_freemem' of  https://github.com/thinkyhead/Marlin  into sd_freemem  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								0450e83fa5 
								
							
								 
							
						 
						
							
							
								
								Use SdFatUtil::FreeRam() for freeMemory() if there  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								f21cce0b28 
								
							
								 
							
						 
						
							
							
								
								Rebase to Marlin_v1  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								39b47ef5b0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'fix_constants' of  https://github.com/thinkyhead/Marlin  into fix_constants  
							
							... 
							
							
 
							
							Conflicts:
	Marlin/cardreader.h 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								e4b98011cf 
								
							
								 
							
						 
						
							
							
								
								And one more...  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								60598b4cdd 
								
							
								 
							
						 
						
							
							
								
								A few constants where they belong  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								f074706d2e 
								
							
								 
							
						 
						
							
							
								
								And one more...  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								b726511a3b 
								
							
								 
							
						 
						
							
							
								
								A few constants where they belong  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								4d61287807 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1186  from boelle/Marlin_v1  
							
							... 
							
							
 
							
							adding hardware files for OMC 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								b17b8583af 
								
							
								 
							
						 
						
							
							
								
								adding hardware files for OMC  
							
							... 
							
							
 
							
							for ide 1.0.6 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								280504e2e0 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #908  from alromh87/Marlin_v1  
							
							... 
							
							
 
							
							Support for Gen3 Monolithic electronics 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								341c7d080d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #996  from cbane/arduino-1.5  
							
							... 
							
							
 
							
							Add Arduino add-ons for Arduino 1.5 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								31ca3de72f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #819  from neildarlow/Marlin_v1  
							
							... 
							
							
 
							
							Activate LiquidTWI2 device detection and space-pad LCD status line. 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								e83cfc0a62 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1163  from thinkyhead/lcd_abort_message  
							
							... 
							
							
 
							
							LCD "Abort" Message 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								3ac8bd8de7 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1013  from mattrobbo10/Marlin_v1  
							
							... 
							
							
 
							
							Proposing adding gen7-dist from gen7 electronics repo - marlin now compiles for gen7 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								0b310ab6c5 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1153  from xinfab/negative_values_in_menu  
							
							... 
							
							
 
							
							Negative values in menu 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								91d740e128 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1141  from filipmu/Filament-Sensor  
							
							... 
							
							
 
							
							Display filament sensor data on a 20x4 LCD or Graphical LCD 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								00f279376f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1173  from boelle/Marlin_v1  
							
							... 
							
							
 
							
							Adding Melzi board 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								ab355a90d3 
								
							
								 
							
						 
						
							
							
								
								Revert "SD Sort and Buffer"  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								4297bcc89f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1154  from thinkyhead/sd_sorting  
							
							... 
							
							
 
							
							SD Sort and Buffer 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								d088b5f30f 
								
							
								 
							
						 
						
							
							
								
								Remove debug echo  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								1fad8e6a81 
								
							
								 
							
						 
						
							
							
								
								Proper long file name var  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								467f0ea6b7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'sd_sorting' of  https://github.com/thinkyhead/Marlin  into sd_sorting  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								29e854c535 
								
							
								 
							
						 
						
							
							
								
								Disable SDCARD_SORT_ALPHA by default  
							
							... 
							
							
 
							
							For legacy boards it’s better if this option is disabled. 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								6599adc184 
								
							
								 
							
						 
						
							
							
								
								Polish up a little...  
							
							
 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								a12eec33e2 
								
							
								 
							
						 
						
							
							
								
								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  
				
					
						
							
							
								 
						
							
							
								c9486ebb85 
								
							
								 
							
						 
						
							
							
								
								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