Christian Thalhammer
d309565b56
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
...
Conflicts:
Marlin/Configuration.h
13 years ago
Erik van der Zalm
11518a987f
merged with triffid fork
13 years ago
Erik van der Zalm
da040fd393
Fixed ultimaker heater 1 pins. (Thanks daid)
13 years ago
Christian Thalhammer
a11f3b2d2f
- Pins for modified GEN7 assigned
...
- Added support for ATMega1284
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
Michael Moon
ab01658fd2
local configuration stuff- WATCHPERIOD causes breakage, disable. few other misc changes
13 years ago
Michael Moon
71dc82e0b4
my local configuration
13 years ago
Bernhard
cee5f9020a
added suicide pin for a power supply to the arduino that is only active if the arduino is holding high for an output.
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
e017228569
Merged multiple extruder support.
...
Soft PWM. (Sanguinololu can also have PID temperature control)
Interrupt save WRITE for addresses > 0x0FF
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
Bernhard
b0c3871750
more fixing of the sanguino math round problem
13 years ago
Bernhard Kubicek
7b70caab7c
made progmem mainly, found one bug in cardreader, added a empty class for cardreader in case no sd support.
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
40e8081623
changed end of line to windows, which seems to be the majority of developers main platform.
13 years ago
Erik van der Zalm
d7c4f0780b
Added M42, M80 and M81
13 years ago
Erik van der Zalm
094afe7c10
Merged Marlin, Marlin non gen6 and Ultimaker changes
13 years ago
Erik van der Zalm
750f6c33e3
first commit
14 years ago