Commit Graph

15 Commits (f9412031725192c2a7c1b7709d72f01bf76b765e)

Author SHA1 Message Date
Erik van der Zalm bca353cc12 Fixed duplicate define in fastio.h
Steve Kelly b42d24e31e add additional pins to avr2560 for rambo lcd
Scott Lahteine 5dabc95409 Apply all changes from latest Marlin_V1
Diffed and merged, preserving my updates
Johann Rocholl 6aa87a7b67 Use the same fastio.h definition for AT90USB1286/7 and AT90USB646/7.
Johann Rocholl ce4b5bbeaa Add AT90USB646 support from Sprinter to fastio.h.
daid303 7a02ba361c Header multiple include protection should match the filename, not just _ARDUINO_H, which is almost bound to go wrong some day.
Christian Thalhammer d309565b56 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
Conflicts:
	Marlin/Configuration.h
Erik van der Zalm 9173a5713b Teensylu support.
Christian Thalhammer 59cc5f889e - added support for ATMega1284P
Erik van der Zalm e017228569 Merged multiple extruder support.
Soft PWM. (Sanguinololu can also have PID temperature control)
Interrupt save WRITE for addresses > 0x0FF
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
Bernhard Kubicek 40e8081623 changed end of line to windows, which seems to be the majority of developers main platform.
Bernhard Kubicek 00674af3a8 merge from the branch bkubicek/Marlin/zalmmerge
Erik van der Zalm 094afe7c10 Merged Marlin, Marlin non gen6 and Ultimaker changes
Erik van der Zalm 750f6c33e3 first commit