Erik van der Zalm
e3821bd86f
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
13 years ago
Erik van der Zalm
02af69911e
Added temperature window to M109. This is needed for systems with no overshoot PID.
13 years ago
ErikZalm
e203b8c754
Merge pull request #154 from daid/Marlin_v1
Added 2nd extruder temperature LCD readout and setting.
13 years ago
ErikZalm
362ddc4efc
Merge pull request #155 from Atntias/patch-1
adding M120 and 121 for turning on and off the endstops only for homing
13 years ago
ErikZalm
58cad83253
Merge pull request #156 from Atntias/patch-2
Fix to allow M120/M121
13 years ago
sefi
c27081aa4a
Fix to allow M120/M121
13 years ago
sefi
e11e072eca
adding M120 and 121 for turning on and off the endstops only for homing function
13 years ago
Daid
8e68c6cf89
Show proper temperature for extruder 2
13 years ago
Daid
8503b78876
Added support for 2nd extruder temperature to UltraLCD
13 years ago
Bernhard Kubicek
8446c9dc92
Merge pull request #152 from loganb/Marlin_v1
Fix compile error on boards without a bed heater.
I could not find why this problem was introduced.
Its quite obvious, so I think its in general interest to merge.
13 years ago
Logan Bowers
3eacb4c16d
Wrap the call to turn off the bed heater in a #if to prevent a compile error on boards that do not have a bed heater
13 years ago
Bernhard
e4d2138dbd
reinitialize the lcd, if the SD card is inserted or removed. It seems that LCDs can confused by electrical discharges from time to time.
Since a removal or insert of the sd card takes a long time in firmware, just reinitializing the lcd does not hurt.
actually, it solves a problem with the UltiControlle
13 years ago
Bernhard
464b755918
added support for the UltiController
13 years ago
Bernhard
44fd8d46d2
fixed quickhome
13 years ago
Bernhard
33bb044d7c
fixed catsting to (int)e in serial error messages.
see https://github.com/ErikZalm/Marlin/issues/148
13 years ago
Erik van der Zalm
ffea8008ca
Update readme file
13 years ago
ErikZalm
c2557abc03
Merge pull request #138 from triffid/fix-makefile
make should rebuild if configuration or Makefile is changed
13 years ago
Erik van der Zalm
67cf105bc6
Fixed AUTOTEMP (M109 S215 B260 F1 starts autotemp)
Changed SLOWDOWN. IF this does not work ok OLD_SLOWDOWN is the old algo.
13 years ago
Erik van der Zalm
8aee9d51b6
Disabled disable_heater in PID_autotune.
13 years ago
ErikZalm
939f1fab46
Merge pull request #140 from daid/Marlin_v1
Fix for wrong systax in #ifdef.
13 years ago
Daid
414408b2d0
Fix for wrong systax in #ifdef.
13 years ago
Michael Moon
77d503fa13
Fix Makefile
13 years ago
Erik van der Zalm
cf7c8c458f
Fixed MAX6675
13 years ago
ErikZalm
325f0651ac
Merge pull request #136 from grrf/patch-1
This breaks temperature readout for pronterface!
13 years ago
grrf
03b0850e63
This breaks temperature readout for pronterface!
13 years ago
ErikZalm
2a019a53d2
Merge pull request #134 from tgiphil/Marlin_v1
- Fixed a typo
13 years ago
tgiphil
ad8bc71d3e
- Fixed a typo
13 years ago
Erik van der Zalm
46feae79c6
Fixed typo in arc
13 years ago
Erik van der Zalm
4ca2f336f0
Changed default MINIMUM_PLANNER_SPEED -> 0.05
Fixed small bug in arcs
M105 prints now actual_temp/target_temp
13 years ago
Erik van der Zalm
ae0bf8068b
Fixed arc offset.
13 years ago
Erik van der Zalm
0c1b863755
Ignore ":" in comments.
13 years ago
Erik van der Zalm
63aec3c56e
Replaced Kill by Stop. If the printer is stopped. Fix the error and use M999 to restart.
Moved the PID_dT in the Ki and Kd calculation from the configuration.h to temperature.cpp
13 years ago
ErikZalm
8b785f75a6
Merge pull request #123 from buserror-uk/for-upstream
For upstream
13 years ago
ErikZalm
5b8758f42b
Merge pull request #126 from tommycheng/patch-1
Fix compilation error when PIDTEMP is undefined and ULTIPANEL is defined...
13 years ago
Tommy Cheng
520f1a54a8
Fix compilation error when PIDTEMP is undefined and ULTIPANEL is defined.
13 years ago
Michel Pollet
5550e893d5
New board variant, Open Motion Controller
Open Hardware board currently used by the group build of http://tvrrug.org.uk
The board can be found at http://solderpad.com/folknology/open-motion-controller/
Signed-off-by: Michel Pollet <buserror@gmail.com>
13 years ago
Michel Pollet
aa6e6e914e
Makefile: Redone
+ Removed most explicit pathnames, use the standard make "VPATH" to let
make find the files for itself.
+ Added a "hardware variant" variable that allows compiging Sanguino and
Gen7 as well as "generic" arduino.
+ Allows overriding the MOTHERBOARD define from the Makefile
+ Removed the 'preprocessor' bit that wasn't needed, now just "include" the
files that are needed, since it allows gcc to show the right file/line
when displaying error/warnings.
+ Uses gcc's own dependency generator to generate the .d files, and
and include these instead of self-patching the makefile
Signed-off-by: Michel Pollet <buserror@gmail.com>
13 years ago
Bernhard
0183e6332a
made prepare->autostart independent of current folder.
13 years ago
Bernhard
1532200435
found error in filenames.
One array was too short. This had nothing to do with long filenames, other than if they were 12 characters exactly, which could only happen if the extension and the text before were filled completely
13 years ago
ErikZalm
7f775c142c
Update README.md
13 years ago
Erik van der Zalm
b985e4a134
Fixed compile errors in ultralcd when no ultra_lcd is selected.
13 years ago
Erik van der Zalm
2e749d60c3
Added DISABLE_MAX_ENDSTOPS
13 years ago
Erik van der Zalm
33f5697888
PPID tune exports more constants.
13 years ago
Erik van der Zalm
b44055cc51
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
13 years ago
Erik van der Zalm
f5eae52098
Added more manage_inactivity checks
13 years ago
ErikZalm
19a47dae4a
Merge pull request #99 from Justblair/master
Better pin configuration for rotary encoder in RAMPS boards
13 years ago
Erik van der Zalm
910f4e77a2
Added 20MHz support.
13 years ago
ErikZalm
7cefad3744
Merge pull request #106 from bgamari/Marlin_v1
Make F_CPU dependence of stepper.cpp more explicit
13 years ago
Erik van der Zalm
87ff2f8867
Added CONTROLLERFAN. (Controlling a fan to cool down the steppper drivers)
13 years ago
Erik van der Zalm
387fe51a56
Do not disable steppers when there are moves in the queue.
13 years ago