2cc9a89830 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'SCUBA82/Marlin_v1' into Marlin_v1  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								a0a1f81913 
								
							
								 
							
						 
						
							
							
								
								various changes  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								8a8ea50f33 
								
							
								 
							
						 
						
							
							
								
								fixed manual axis movement lcd option  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								b976692d0f 
								
							
								 
							
						 
						
							
							
								
								Removed VS project files for tidyness stakes  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								fe940a142d 
								
							
								 
							
						 
						
							
							
								
								Added a structure that will allow easy translations/modifications to the LCD menu.  
							
							... 
							
							
 
							
							Signed-off-by: Blair Thompson <mail@justblair.co.uk> 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								b3fb09a20c 
								
							
								 
							
						 
						
							
							
								
								change preheat to ABS values of nozzle 227 and be 105 C  
							
							... 
							
							
 
							
							next try for manual axis movement 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								6a3f8cf23f 
								
							
								 
							
						 
						
							
							
								
								Infos about fuses to use; correct fuses in boards.txt  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								a05a261b72 
								
							
								 
							
						 
						
							
							
								
								Added a workaround.  Ramps SD card does not have sdcarddetect.  My temporary solution is to add a momentary swtich  
							
							... 
							
							
 
							
							that pulls down the SDCARDDETECT pin and mimicking the pull and reinsert ofa a SD card 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								1b6765ed12 
								
							
								 
							
						 
						
							
							
								
								Updated the pin config for RAMPS 1.3 to include ultimaker new style LCD/Rotary Encoder interface  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								1ff99ae25f 
								
							
								 
							
						 
						
							
							
								
								ATMega1284P support for Arduino IDE  
							
							... 
							
							
 
							
							replace $ARDUINO_HOME/hardware/tools/avr/etc/arduino.conf with this file 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								234fe8ea67 
								
							
								 
							
						 
						
							
							
								
								added infos for this fork  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								e661578c84 
								
							
								 
							
						 
						
							
							
								
								support for GEN7 1.1,1.2 and 1.3  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								73344e69c1 
								
							
								 
							
						 
						
							
							
								
								Added temperature offset/gain settings for AD595.  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								d309565b56 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1  
							
							... 
							
							
 
							
							Conflicts:
	Marlin/Configuration.h 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								3f20f37c78 
								
							
								 
							
						 
						
							
							
								
								Merge remote branch 'upstream/Marlin_v1' into Marlin_v1  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								0e3631ff4b 
								
							
								 
							
						 
						
							
							
								
								smaller changes  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								fa2e1be0ca 
								
							
								 
							
						 
						
							
							
								
								changed default EXTRUDE_MINTEMP to 170.  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								7699f250e3 
								
							
								 
							
						 
						
							
							
								
								Fixed small merge bug  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								11518a987f 
								
							
								 
							
						 
						
							
							
								
								merged with triffid fork  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								b447815de5 
								
							
								 
							
						 
						
							
							
								
								removed unused HEATING_EARLY_FINISH_DEG_OFFSET  
							
							... 
							
							
 
							
							Simplified stepper inactive time 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								bde30b2b48 
								
							
								 
							
						 
						
							
							
								
								Corrected e-length calculation in planner  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								13e185d330 
								
							
								 
							
						 
						
							
							
								
								removed unused HEATING_EARLY_FINISH_DEG_OFFSET  
							
							... 
							
							
 
							
							Simplified stepper inactive time 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								b58eae7657 
								
							
								 
							
						 
						
							
							
								
								Corrected e-length calculation in planner  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								3e7fcb813e 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #61  from daid/Marlin_v1  
							
							... 
							
							
 
							
							Updated SERIAL define to MYSERIAL, because Arduino 1.0 defines SERIAL as 0. 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								2a77c84c8f 
								
							
								 
							
						 
						
							
							
								
								Updated SERIAL define to MYSERIAL, because Arduino 1.0 defines SERIAL as 0.  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								d47a3e5950 
								
							
								 
							
						 
						
							
							
								
								Changed check i mtion_conrol  
							
							... 
							
							
 
							
							if (millimeters_of_travel == 0.0) => if (millimeters_of_travel < 0.001)
(thanks mooselake) 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								f87c80889f 
								
							
								 
							
						 
						
							
							
								
								Fixed M109 timer overflow (reported by triffid)  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								154de69c02 
								
							
								 
							
						 
						
							
							
								
								Print configuration.h version during startup (thanks hairykiwi)  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								6ef8459494 
								
							
								 
							
						 
						
							
							
								
								Corrected distance calculation. (thanks jv4779)  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								598eb1d4f1 
								
							
								 
							
						 
						
							
							
								
								Fixed compilation for gcc-4.6.2 with avr-lib-1.8.0 (thanks daid)  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								9173a5713b 
								
							
								 
							
						 
						
							
							
								
								Teensylu support.  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								da040fd393 
								
							
								 
							
						 
						
							
							
								
								Fixed ultimaker heater 1 pins. (Thanks daid)  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								bdb70c0509 
								
							
								 
							
						 
						
							
							
								
								Warning for 10k thermistor  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								5113513cb2 
								
							
								 
							
						 
						
							
							
								
								RC 1  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								d8a0c6450f 
								
							
								 
							
						 
						
							
							
								
								Split the configuration file in two parts.  
							
							... 
							
							
 
							
							One for common settings.
One for advanced settings. 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								4cc8e37bf1 
								
							
								 
							
						 
						
							
							
								
								lcd menue "move_axis" added  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								b5fae1104b 
								
							
								 
							
						 
						
							
							
								
								fixed sUICIDE_PIN disable  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								f9c5333f97 
								
							
								 
							
						 
						
							
							
								
								Made "stop heating wait" optional.  
							
							... 
							
							
 
							
							Default off. 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								292ddd2edb 
								
							
								 
							
						 
						
							
							
								
								Fix Z_LATE_ENABLE  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								25cd8af536 
								
							
								 
							
						 
						
							
							
								
								added arduino ide GEN7 support Files  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								14702089ee 
								
							
								 
							
						 
						
							
							
								
								-disable TEMP Min MAX Kill while using PS_ON Pin  
							
							... 
							
							
 
							
							ON GEN7 there is no temperature reading when power is off.. so Marlin
would kill itself. There seems to be an update from "Traumflug" on GEN7
using standby VCC for thermistors. 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								b51e8bf7e5 
								
							
								 
							
						 
						
							
							
								
								-disabled CARDDETECT if PIN is set to -1  
							
							... 
							
							
 
							
							- redo disable Beeper if PIN is set to -1 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								3183a14755 
								
							
								 
							
						 
						
							
							
								
								-added Configuration for GEN7 which worked for me  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								5edef148fe 
								
							
								 
							
						 
						
							
							
								
								-disalbe beeper if BEEPER_PIN = -1  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								13e2ad2831 
								
							
								 
							
						 
						
							
							
								
								- added info for using GEN7 configuration  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								59cc5f889e 
								
							
								 
							
						 
						
							
							
								
								- added support for ATMega1284P  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								a11f3b2d2f 
								
							
								 
							
						 
						
							
							
								
								- Pins for modified GEN7 assigned  
							
							... 
							
							
 
							
							- Added support for ATMega1284 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								b0070a244a 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into Marlin_v1  
							
							... 
							
							
 
							
							Conflicts:
	README 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								abb7e63906 
								
							
								 
							
						 
						
							
							
								
								fixed z-disable bug.  
							
							
 
							
						 
						
							14 years ago  
				
					
						
							
							
								 
						
							
							
								9f139d6e0e 
								
							
								 
							
						 
						
							
							
								
								Added MAX6675 support. (Thanks to gregfrost)  
							
							... 
							
							
 
							
							Needs some work to remove the blocking in read max6675. 
							
						 
						
							14 years ago