melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,687 Commits 2 Branches 0 Tags
Commit Graph

10687 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bernhard
464b755918 added support for the UltiController 2012-04-22 20:55:56 +02:00
Bernhard
44fd8d46d2 fixed quickhome 2012-04-22 20:44:27 +02:00
Bernhard
33bb044d7c fixed catsting to (int)e in serial error messages. 
see https://github.com/ErikZalm/Marlin/issues/148
 2012-04-22 20:04:39 +02:00
Erik van der Zalm
ffea8008ca Update readme file 2012-04-15 22:44:03 +02:00
ErikZalm
c2557abc03 Merge pull request #138 from triffid/fix-makefile 
make should rebuild if configuration or Makefile is changed
 2012-04-15 10:21:46 -07:00
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.
 2012-04-15 19:17:33 +02:00
Erik van der Zalm
8aee9d51b6 Disabled disable_heater in PID_autotune. 2012-04-12 21:12:31 +02:00
ErikZalm
939f1fab46 Merge pull request #140 from daid/Marlin_v1 
Fix for wrong systax in #ifdef.
 2012-04-12 05:29:24 -07:00
Daid
414408b2d0 Fix for wrong systax in #ifdef. 2012-04-12 14:01:30 +02:00
Michael Moon
77d503fa13 Fix Makefile 2012-04-11 11:39:35 +10:00
Erik van der Zalm
cf7c8c458f Fixed MAX6675 2012-04-10 21:57:57 +02:00
ErikZalm
325f0651ac Merge pull request #136 from grrf/patch-1 
This breaks temperature readout for pronterface!
 2012-04-10 09:48:45 -07:00
grrf
03b0850e63 This breaks temperature readout for pronterface! 2012-04-09 23:37:34 +03:00
ErikZalm
2a019a53d2 Merge pull request #134 from tgiphil/Marlin_v1 
- Fixed a typo
 2012-04-08 05:16:29 -07:00
tgiphil
ad8bc71d3e - Fixed a typo 2012-04-07 20:01:31 -07:00
Erik van der Zalm
46feae79c6 Fixed typo in arc 2012-04-02 17:19:20 +02:00
Erik van der Zalm
4ca2f336f0 Changed default MINIMUM_PLANNER_SPEED -> 0.05 
Fixed small bug in arcs
M105 prints now actual_temp/target_temp
 2012-04-01 16:23:40 +02:00
Erik van der Zalm
ae0bf8068b Fixed arc offset. 2012-03-27 19:03:33 +02:00
Erik van der Zalm
0c1b863755 Ignore ":" in comments. 2012-03-25 14:41:26 +02:00
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
 2012-03-25 14:36:51 +02:00
ErikZalm
8b785f75a6 Merge pull request #123 from buserror-uk/for-upstream 
For upstream
 2012-03-23 11:54:58 -07:00
ErikZalm
5b8758f42b Merge pull request #126 from tommycheng/patch-1 
Fix compilation error when PIDTEMP is undefined and ULTIPANEL is defined...
 2012-03-23 11:54:37 -07:00
Tommy Cheng
520f1a54a8 Fix compilation error when PIDTEMP is undefined and ULTIPANEL is defined. 2012-03-24 02:26:59 +08:00
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>
 2012-03-22 13:51:21 +00:00
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>
 2012-03-22 13:48:10 +00:00
Bernhard
0183e6332a made prepare->autostart independent of current folder. 2012-03-19 20:24:40 +01:00
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
 2012-03-19 20:06:58 +01:00
ErikZalm
7f775c142c Update README.md 2012-03-18 15:59:14 +01:00
Erik van der Zalm
b985e4a134 Fixed compile errors in ultralcd when no ultra_lcd is selected. 2012-03-15 22:29:31 +01:00
Erik van der Zalm
2e749d60c3 Added DISABLE_MAX_ENDSTOPS 2012-03-12 20:32:14 +01:00
Erik van der Zalm
33f5697888 PPID tune exports more constants. 2012-03-11 22:18:25 +01:00
Erik van der Zalm
b44055cc51 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 2012-03-11 18:03:00 +01:00
Erik van der Zalm
f5eae52098 Added more manage_inactivity checks 2012-03-11 17:59:44 +01:00
ErikZalm
19a47dae4a Merge pull request #99 from Justblair/master 
Better pin configuration for rotary encoder in RAMPS boards
 2012-03-11 04:34:59 -07:00
Erik van der Zalm
910f4e77a2 Added 20MHz support. 2012-03-11 12:25:04 +01:00
ErikZalm
7cefad3744 Merge pull request #106 from bgamari/Marlin_v1 
Make F_CPU dependence of stepper.cpp more explicit
 2012-03-11 01:48:30 -08:00
Erik van der Zalm
87ff2f8867 Added CONTROLLERFAN. (Controlling a fan to cool down the steppper drivers) 2012-03-11 10:44:10 +01:00
Erik van der Zalm
387fe51a56 Do not disable steppers when there are moves in the queue. 2012-03-09 20:20:01 +01:00
Erik van der Zalm
421264e58a Fixed typo 2012-03-09 17:49:48 +01:00
Erik van der Zalm
15ad923310 Removed !!!. Stupid arduino bootloader can't handle this. 2012-03-09 17:42:32 +01:00
Erik van der Zalm
61e09e6be2 Added FAN_PIN -1 checks 2012-03-08 22:09:49 +01:00
Erik van der Zalm
87c4e06c24 Corrected active_extruder when autotemp is used. 2012-03-08 22:04:13 +01:00
Erik van der Zalm
7b1e295f34 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 2012-03-08 21:48:06 +01:00
Erik van der Zalm
c077316b2b Added PID autotune. (experimental) 
M303 Starts autotune. Wait till the Kp Ki and Kd constants are printed.
Put these values in Configuration.h
 2012-03-08 21:43:21 +01:00
Ben Gamari
49b228c4b3 Add instructions to regenerate speed_lookuptable when changing F_CPU 2012-03-07 18:11:03 -05:00
Ben Gamari
96509494f0 stepper: Clarify comment on timer-counter configuration 2012-03-07 18:11:01 -05:00
Ben Gamari
6d7e6a11fc Add create_speed_lookup 2012-03-07 18:11:01 -05:00
ErikZalm
f3095493b0 Merge pull request #100 from tommycheng/patch-1 
While Waiting for hotbed to warm up via M190, LCD Display and Click Enco...
 2012-03-05 09:56:50 -08:00
Tommy Cheng
ce07c9186d While Waiting for hotbed to warm up via M190, LCD Display and Click Encoder input freeze until target temperature is reached. 2012-03-05 23:12:26 +08:00
Erik van der Zalm
116dc86b8a Fixed type in e-jerk 2012-03-04 23:09:13 +01:00