831 Commits (91db7930dc7c8e429f579549544183ac94c59200)

Author SHA1 Message Date
Erik van der Zalm ae3e7586c6 Added HOME_POS. This adds the posibility to make the center 0
Updated the Xsteps ... settings via the LCD menu
13 years ago
Erik van der Zalm 8816ef1c64 Small fixes after merge 13 years ago
Erik van der Zalm d298dd121f merged SBUBA82 and Justblair 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 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
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 154de69c02 Print configuration.h version during startup (thanks hairykiwi) 13 years ago
Erik van der Zalm 9173a5713b Teensylu support. 13 years ago
Erik van der Zalm bdb70c0509 Warning for 10k thermistor 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
Erik van der Zalm f9c5333f97 Made "stop heating wait" optional.
Default off.
13 years ago
Christian Thalhammer 13e2ad2831 - added info for using GEN7 configuration 13 years ago
Erik van der Zalm 9f139d6e0e Added MAX6675 support. (Thanks to gregfrost)
Needs some work to remove the blocking in read max6675.
13 years ago
Erik van der Zalm e45e5c68bb Added support for Gen3+ (Pins file only)
Added late z enable. (blddk request)
Only calculate look ahead if >2 moves in buffer.
Removed some FORCE_INLINE to save memory.

Signed-off-by: Erik van der Zalm <erik@vdzalm.eu>
13 years ago
Bernhard 212515148e added m240 photography support. default off 13 years ago
Bernhard 415aadf704 lcd panel bed support
advance and ultipanel not any more in default config
13 years ago
Erik van der Zalm 84d9cf7339 merging 13 years ago
Erik van der Zalm e017228569 Merged multiple extruder support.
Soft PWM. (Sanguinololu can also have PID temperature control)
Interrupt save WRITE for addresses > 0x0FF
13 years ago
Bernhard 01001b89d2 repaired nozzle runout prevention to not collide with automatic stepper disabeling. 13 years ago
Bernhard 88ee053af0 heating up santity, formarly knows as "watchdog", but renamed due to the existance of the real watchdog, works now. 13 years ago
Bernhard 2bc5e7ec9e prevent too long extrudes, or too cold extrudes 13 years ago
Bernhard aa4f9a6474 better values. 13 years ago
Bernhard 87fd249c43 made runout prevention independent of tempeorarily set esteps 13 years ago
Bernhard 1ec0c3b68a extruder runout prevention. 13 years ago
Bernhard 5b4625f79c added a partial release option to "m84" aka "stepper release". If you do tiny layers, you might want to keep the z-axis powered to not loose height positioning after homeing. 13 years ago
Denis B 4fd75dc813 Working version of multiple extruders (up to 3)
- The temperature control is pretty much complete
  (not sure what to do w/ autotemp though)
  Changed the pins assignment to clearly separate bed and extruder heaters
  and temp sensors, changed a bit how termistor tables are handled.
- The steppers control is rudimentary
  (only chanages what pins it uses depending on the active_extruder var,
   but that's enough for switching extruder in the start.gcode in the
   the profiles)
- Tested only w/ RAMPS 1.4
13 years ago
Erik van der Zalm b99c49ec3b Add option to only check endstop when homing 13 years ago
Erik van der Zalm 95a0b28acb Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 13 years ago
Erik van der Zalm af22e9cd38 Some advance modifications 13 years ago
Bernhard 4f909963e4 make QUICKHOME configureable 13 years ago
Erik van der Zalm 6b86f15686 More 2nd extruder implementation. (Not usable)
Advance (not tested)
13 years ago
Bernhard 59205ac5fc preliminiary implementation for the early heating finish.
Might be replaced by something more clever, e.g. by erik, and does not yet support the second extruder or the bed.
its kind of not so cool, because you need 6 more ints.
Maybe isheating() should use the degrees directly, as it is not used in time-critical anyways.
Then it would be much easier. to have the offsets without additional variables.
13 years ago
Erik van der Zalm f75f426dfa Removed interrupt nesting in the stepper ISR.
Add serial checkRx in stepper ISR.
Copied HardwareSerial to MarlinSerial (Needed for checkRx).
13 years ago
Erik van der Zalm aad4b75b94 First parts 2nd extruder 13 years ago
Bernhard a0dc66f7bf Home retract distance configureable per axis. 13 years ago
Bernhard 6d6f323535 make an option if sd-card stop should release the steppers. 13 years ago
Bernhard 74d0032e25 cooldown blocking selectable by #define. 13 years ago
Erik van der Zalm c0f8c9fd72 Seperate ENDSTOP_INVERTING for X Y and Z
Added simple endstop filter.
Corrected M114 count display.
13 years ago
Erik van der Zalm 2e43f9c809 Changed min max temperature code. 13 years ago
Bernhard Kubicek 8a1e719a3f overworked config file 13 years ago
Bernhard Kubicek f52e1a9571 autotemp working, default=disabled. 13 years ago
Bernhard Kubicek 70650c331d corrected the ultimaker default values, the previous had a calculation error: see: http://groups.google.com/group/ultimaker/browse_thread/thread/91906788639703cf 13 years ago
Erik van der Zalm b15902d3b5 Fixed bug in configuration.h 13 years ago
Erik van der Zalm e63e224a33 Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin.pde
13 years ago
Erik van der Zalm e7dca8614b Advance experiments. Not working yet. 13 years ago
Bernhard Kubicek 46f80e82d9 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Conflicts:
	Marlin/ultralcd.h
13 years ago
Bernhard Kubicek a9c7da06e3 and changed ultipanel to have the mm/sec and not mm/min
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1

Conflicts:
	Marlin/Marlin.pde
	Marlin/ultralcd.h
13 years ago
Bernhard Kubicek 7919a40d06 watchdog,percent done, 13 years ago
Erik van der Zalm 805d37f77b Fixed some small planner bugs 13 years ago
Erik van der Zalm 5fd41ae872 Some fixes in planner 13 years ago
Erik van der Zalm 95126c09c0 Added slowdown 13 years ago
Erik van der Zalm 331e82dcd3 Buffer size > 16 13 years ago
Erik van der Zalm c00eefb824 Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 13 years ago
Erik van der Zalm 1d0452f10c 250000 baud 13 years ago
Bernhard Kubicek c57906b627 fixed bug with adjusting ki in realtime. 13 years ago
Erik van der Zalm ac82411c73 Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 13 years ago
Erik van der Zalm 65934eee9c A lot of changes in the planner code 13 years ago
Bernhard Kubicek 36958ee305 minor changes and first not-well working version of autotemp 13 years ago
Bernhard Kubicek 27361e7cd0 beautified the config. ordered it into thematic sections. 13 years ago
Erik van der Zalm d3bfffcb6e Corrected thermistor naming 13 years ago
Bernhard Kubicek 163efdf1c7 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 13 years ago
Bernhard Kubicek 87aaf0f70a static'ified Marlin.pde. 13 years ago
Erik van der Zalm 76b3f805c0 Added teensylu pins 13 years ago
Bernhard Kubicek 1d171e9e52 reformating and some minor bugs/things found on the way. 13 years ago
Bernhard Kubicek 2afb7bd4cf refactured temperature.cpp so that there are now abstract functions to access temperatures. 13 years ago
Erik van der Zalm 0b82465168 First arcs version. (Arcs not working ok) 13 years ago
Erik van der Zalm 2e8e8878e5 Corrected temp variables. 13 years ago
Erik van der Zalm 04d3b5537f Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Conflicts:
	Marlin/Configuration.h
	Marlin/EEPROMwrite.h
	Marlin/Marlin.h
	Marlin/Marlin.pde
	Marlin/temperature.cpp
	Marlin/temperature.h
	Marlin/thermistortables.h
13 years ago
Erik van der Zalm d15f01e1b4 Temperature changes 13 years ago
Bernhard Kubicek 00674af3a8 merge from the branch bkubicek/Marlin/zalmmerge 13 years ago
Erik van der Zalm 95d3d9847c M109 now equal to sprinter 13 years ago
Erik van der Zalm bf879ceaa9 Added thermistor tables 13 years ago
Erik van der Zalm 094afe7c10 Merged Marlin, Marlin non gen6 and Ultimaker changes 13 years ago
Erik van der Zalm 8e017b81ab Sync with non-gen6 version 13 years ago
Erik van der Zalm b5f6482dce Fixed small feedrate bug.
Copied Camiels comments in the Configuration.h file
14 years ago
Erik van der Zalm 26bf57e22c first-commit 14 years ago
Erik van der Zalm 750f6c33e3 first commit 14 years ago