melch
/
Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,077 Commits
2 Branches
0 Tags
2.0 GiB
x301
2.0.x
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '78df07ac71'
${ noResults }
Commit Graph

10077 Commits (78df07ac71801334fbe9878301e756d47a4f4863)
 

Author SHA1 Message Date
Erik van der Zalm 8816ef1c64 Small fixes after merge 13 years ago
Erik van der Zalm d298dd121f merged SBUBA82 and Justblair 13 years ago
Erik van der Zalm 2cc9a89830 Merge remote-tracking branch 'SCUBA82/Marlin_v1' into Marlin_v1 13 years ago
Erik van der Zalm a0a1f81913 various changes 13 years ago
Christian Thalhammer 8a8ea50f33 fixed manual axis movement lcd option 13 years ago
Blair Thompson b976692d0f Removed VS project files for tidyness stakes 13 years ago
Blair Thompson fe940a142d Added a structure that will allow easy translations/modifications to the LCD menu. 
Signed-off-by: Blair Thompson <mail@justblair.co.uk>
 13 years ago
Christian Thalhammer b3fb09a20c change preheat to ABS values of nozzle 227 and be 105 C 
next try for manual axis movement
 13 years ago
Christian Thalhammer 6a3f8cf23f Infos about fuses to use; correct fuses in boards.txt 13 years ago
Blair Thompson 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
 13 years ago
Blair Thompson 1b6765ed12 Updated the pin config for RAMPS 1.3 to include ultimaker new style LCD/Rotary Encoder interface 13 years ago
Christian Thalhammer 1ff99ae25f ATMega1284P support for Arduino IDE 
replace $ARDUINO_HOME/hardware/tools/avr/etc/arduino.conf with this file
 13 years ago
Christian Thalhammer 234fe8ea67 added infos for this fork 13 years ago
Christian Thalhammer e661578c84 support for GEN7 1.1,1.2 and 1.3 13 years ago
Daid 73344e69c1 Added temperature offset/gain settings for AD595. 13 years ago
Christian Thalhammer d309565b56 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 
Conflicts:
	Marlin/Configuration.h
 13 years ago
daid 3f20f37c78 Merge remote branch 'upstream/Marlin_v1' into Marlin_v1 13 years ago
Christian Thalhammer 0e3631ff4b smaller changes 13 years ago
Erik van der Zalm fa2e1be0ca changed default EXTRUDE_MINTEMP to 170. 13 years ago
Erik van der Zalm 7699f250e3 Fixed small merge bug 13 years ago
Erik van der Zalm 11518a987f merged with triffid fork 13 years ago
Erik van der Zalm b447815de5 removed unused HEATING_EARLY_FINISH_DEG_OFFSET 
Simplified stepper inactive time
 13 years ago
Erik van der Zalm bde30b2b48 Corrected e-length calculation in planner 13 years ago
Erik van der Zalm 13e185d330 removed unused HEATING_EARLY_FINISH_DEG_OFFSET 
Simplified stepper inactive time
 13 years ago
Erik van der Zalm b58eae7657 Corrected e-length calculation in planner 13 years ago
ErikZalm 3e7fcb813e Merge pull request #61 from daid/Marlin_v1 
Updated SERIAL define to MYSERIAL, because Arduino 1.0 defines SERIAL as 0.
 13 years ago
daid 2a77c84c8f Updated SERIAL define to MYSERIAL, because Arduino 1.0 defines SERIAL as 0. 13 years ago
Erik van der Zalm d47a3e5950 Changed check i mtion_conrol 
if (millimeters_of_travel == 0.0) => if (millimeters_of_travel < 0.001)
(thanks mooselake)
 13 years ago
Erik van der Zalm f87c80889f Fixed M109 timer overflow (reported by triffid) 13 years ago
Erik van der Zalm 154de69c02 Print configuration.h version during startup (thanks hairykiwi) 13 years ago
Erik van der Zalm 6ef8459494 Corrected distance calculation. (thanks jv4779) 13 years ago
Erik van der Zalm 598eb1d4f1 Fixed compilation for gcc-4.6.2 with avr-lib-1.8.0 (thanks daid) 13 years ago
Erik van der Zalm 9173a5713b Teensylu support. 13 years ago
Erik van der Zalm da040fd393 Fixed ultimaker heater 1 pins. (Thanks daid) 13 years ago
Erik van der Zalm bdb70c0509 Warning for 10k thermistor 13 years ago
Erik van der Zalm 5113513cb2 RC 1 13 years ago
Erik van der Zalm d8a0c6450f Split the configuration file in two parts. 
One for common settings.
One for advanced settings.
 13 years ago
Christian Thalhammer 4cc8e37bf1 lcd menue "move_axis" added 13 years ago
Christian Thalhammer b5fae1104b fixed sUICIDE_PIN disable 13 years ago
Erik van der Zalm f9c5333f97 Made "stop heating wait" optional. 
Default off.
 13 years ago
Erik van der Zalm 292ddd2edb Fix Z_LATE_ENABLE 13 years ago
Christian Thalhammer 25cd8af536 added arduino ide GEN7 support Files 13 years ago
Christian Thalhammer 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.
 13 years ago
Christian Thalhammer b51e8bf7e5 -disabled CARDDETECT if PIN is set to -1 
- redo disable Beeper if PIN is set to -1
 13 years ago
Christian Thalhammer 3183a14755 -added Configuration for GEN7 which worked for me 13 years ago
Christian Thalhammer 5edef148fe -disalbe beeper if BEEPER_PIN = -1 13 years ago
Christian Thalhammer 13e2ad2831 - added info for using GEN7 configuration 13 years ago
Christian Thalhammer 59cc5f889e - added support for ATMega1284P 13 years ago
Christian Thalhammer a11f3b2d2f - Pins for modified GEN7 assigned 
- Added support for ATMega1284
 13 years ago
Christian Thalhammer b0070a244a Merge remote-tracking branch 'upstream/master' into Marlin_v1 
Conflicts:
	README
 13 years ago