zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
15230 commits 1 branch 0 tags 156 MiB
Commit graph

1080 commits

Author SHA1 Message Date
daid303 ffc69537aa Update on some comments, make the MOTHERBOARD list complete again. 2012-11-09 09:10:51 +01:00
Jonathan Bastien-Filiatrault 46b9988e26 Search and replace failure. 2012-11-07 16:09:30 -05:00
Jonathan Bastien-Filiatrault 36b452c7ac Remove abbrs. 2012-11-07 15:42:18 -05:00
Jonathan Bastien-Filiatrault 3cbaad9288 RepRapDiscount Smart Controller pin definitions. 2012-11-06 20:32:13 -05:00
Robert F-C 65c9a0728f Set default serial port back to 0. 2012-11-05 22:15:07 +11:00
Robert F-C ab9d183024 Make serial port configurable. 
This change makes the choice of serial port configurable so that
wireless capability can be easily added by connecting Bluetooth modules
(such as BlueSmirf or JY-MCU) to the expansion port pins.
 2012-11-05 21:34:27 +11:00
brupje 326423719f Add support for Megatronics 2012-10-14 14:05:57 +03:00
ErikZalm 36a746d7d5 Merge pull request #244 from markfinn/pidbed 
PID for heated bed
 2012-10-08 11:15:16 -07:00
Mark Finn 04631d2250 cleanup for pull 2012-09-17 14:17:24 -05:00
ZetaPhoenix c6caa45ae2 Limit Switch locations based on MIN/MAX limits and homing direction 
fixes #246
Added statements to set the limit switch positions to the maximum travel if homing in the positive direction as well as bed center at (0,0) if defined.
Relocated code based on feedback.
 2012-09-15 15:25:49 -07:00
ZetaPhoenix dc566d654f fixes #246 
Added statements to set the limit switch positions to the maximum travel if homing in the positive direction as well as bed center at (0,0) if defined.
 2012-09-14 21:48:49 -07:00
Mark Finn 9698f4ea64 bed pid 
Conflicts:

	Marlin/Configuration.h
 2012-09-12 21:18:59 -05:00
Erik vd Zalm e358a2d7af Added fix for SF Arc Point fillet procedure 2012-09-02 01:12:49 +02:00
tonokip 1c1fddc7ac Added support for the Rambo reprap electronics board. Added Mcodes to set 
motor current and microstepping pins.
 2012-08-30 00:16:57 -07:00
Erik vd Zalm 5406c533db Disable FAST_PWM by default. On some systems it does not work ok. 2012-08-11 15:51:04 +02:00
Dabble63 6b45e9f167 Add Duty Cycling to the Heater Bed 2012-08-11 09:17:47 +03:00
Chris Palmer 538189cc19 Fixed soft limits when the origin is in the middle. 
HOME_POS is now always where the endstop is and can be outside the limits.
The limits are now defined by MIN_POS and MAX_POS rather than HOME_POS and MAX_LENGTH.
The Z is axis now homed first if direction is away from the bed.

Saguinololu limit pins change from MIN to MAX according to the homing direction.
 2012-07-14 22:24:26 +02:00
Erik van der Zalm ea2c19f978 Added CoreXY support (Thanks Ilan Moyer) 2012-07-14 14:21:53 +02:00
Erik van der Zalm aa65fe22ed decoupled axes sucessfully at least on pure x or y jog 2012-07-14 13:43:19 +02:00
Bernhard 0c123950e9 __ header file replace 2012-06-02 20:44:17 +02:00
Bernhard 0e5e249ab5 added individual pullup setting option to have finer control in case there is a special z-min sensor, for example 2012-06-02 13:47:50 +02:00
Bernhard Kubicek 6b14f95b3e Merge pull request #170 from linagee/Marlin_v1 
Marlin v1
 2012-06-02 03:46:56 -07:00
linagee fbd282b3ba Update Marlin/Configuration.h 2012-05-20 13:19:28 -06:00
linagee c4490f5f3d Update Marlin/Configuration.h 2012-05-20 04:27:52 -06:00
Daid 7244aa7eb7 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2012-05-19 17:38:46 +02:00
linagee de2ca3b2e8 Grammar correction. 2012-05-19 07:40:35 -06:00
linagee c2fc466e1b Update Marlin/Configuration.h 2012-05-19 05:56:17 -06:00
linagee 9f9f498491 Update Marlin/Configuration.h 2012-05-19 05:47:30 -06:00
Guan Yang 602c8ee02b Melzi support 2012-05-09 18:37:07 -04:00
Erik de Bruijn e3fe1f0d00 Made a more granular configuration possible PREVENT_LENGTHY_EXTRUDE. You can now decide to allow/disallow large length of extrusions to be executed. 
Turning off the protection might be beneficial to those who want to do fast and long reversals.
 2012-05-08 17:44:08 +02:00
Erik van der Zalm 1874cb71a6 Added option to increase the FAN PWM frequency. 2012-05-02 19:26:14 +02:00
Erik van der Zalm e3821bd86f Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 2012-04-30 13:36:27 +02:00
Erik van der Zalm 02af69911e Added temperature window to M109. This is needed for systems with no overshoot PID. 2012-04-30 13:36:19 +02:00
Bernhard 464b755918 added support for the UltiController 2012-04-22 20:55:56 +02: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 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
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
Erik van der Zalm 2e749d60c3 Added DISABLE_MAX_ENDSTOPS 2012-03-12 20:32:14 +01:00
Erik van der Zalm 910f4e77a2 Added 20MHz support. 2012-03-11 12:25:04 +01:00
Erik van der Zalm e056bf8081 Added E-Jerk 2012-03-04 16:34:58 +01:00
Phil Hord b65ef8d66c Add support for upcoming Gen7 v1.4 
V1.4 moves thermistor power to the always-on 5v line.
The BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE is no longer
needed on this board.  Add a new motherboard type to
support this feature.
 2012-02-26 20:39:49 -05:00
Erik van der Zalm 97d42ca2b2 SDSUPPORT default disabled 2012-02-26 22:05:38 +01:00
Erik van der Zalm 018c567abf Moved SLOWDOWN function. (jetty840) 
Included AD595 calibration options. (daid)
 2012-02-26 16:23:47 +01:00
Erik van der Zalm 4fbda5c3f5 Merge remote-tracking branch 'daid/Marlin_v1' into Test 2012-02-26 16:10:59 +01:00
Erik van der Zalm 35e57bf149 Added gen6 deluxe. 2012-02-25 17:44:45 +01:00
Erik van der Zalm 84ea2d61e8 Moved gen7 boards to motherboard type 10, 11 and 12. 
Split ramps1.3 in Sprinter like config and multiextruder config.
 2012-02-24 23:34:41 +01:00
Erik van der Zalm 01d28c18ab Fixed casting warning in sanguino 2012-02-23 18:45:37 +01:00
Blair Thompson 2fd8c248fe Added Fan control to the pre-heat settings. 
I find that the PID routine works better when the cooling fan is switched on
at the beginning of a warm up routine.  Otherwise when you enable the fan
just before a print, you have a delay as the PIDre-adjusts.

This should also be safer as most cooling fans are directed at the hot -ends
thermal barrier!
 2012-02-22 23:05:52 +00:00
Blair Thompson d9f2f509d5 Added new menu items under the prepare submenu. 
Instead of a single pre-heat, now there is pre-heat ABS and PLA options
Added defines to the configuration file to adjust preheat temperatures for both
 2012-02-22 22:51:04 +00:00
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
 2012-02-22 18:07:56 +01:00
Erik van der Zalm 8816ef1c64 Small fixes after merge 2012-02-21 20:36:43 +01:00
Erik van der Zalm d298dd121f merged SBUBA82 and Justblair 2012-02-21 20:26:59 +01:00
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
 2012-02-18 23:56:31 +00:00
Blair Thompson 1b6765ed12 Updated the pin config for RAMPS 1.3 to include ultimaker new style LCD/Rotary Encoder interface 2012-02-18 18:25:04 +00:00
Christian Thalhammer e661578c84 support for GEN7 1.1,1.2 and 1.3 2012-02-17 10:46:48 +01:00
Daid 73344e69c1 Added temperature offset/gain settings for AD595. 2012-02-16 11:05:08 +01:00
Christian Thalhammer d309565b56 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 
Conflicts:
	Marlin/Configuration.h
 2012-02-13 13:07:55 +01:00
Christian Thalhammer 0e3631ff4b smaller changes 2012-02-13 12:31:53 +01:00
Erik van der Zalm fa2e1be0ca changed default EXTRUDE_MINTEMP to 170. 2012-02-12 17:38:54 +01:00
Erik van der Zalm 154de69c02 Print configuration.h version during startup (thanks hairykiwi) 2012-02-09 20:26:17 +01:00
Erik van der Zalm 9173a5713b Teensylu support. 2012-02-09 19:27:45 +01:00
Erik van der Zalm bdb70c0509 Warning for 10k thermistor 2012-02-08 18:38:45 +01:00
Erik van der Zalm d8a0c6450f Split the configuration file in two parts. 
One for common settings.
One for advanced settings.
 2012-02-07 20:23:43 +01:00
Erik van der Zalm f9c5333f97 Made "stop heating wait" optional. 
Default off.
 2012-02-06 20:13:44 +01:00
Christian Thalhammer 13e2ad2831 - added info for using GEN7 configuration 2012-02-06 11:58:52 +01:00
Erik van der Zalm 9f139d6e0e Added MAX6675 support. (Thanks to gregfrost) 
Needs some work to remove the blocking in read max6675.
 2012-02-05 13:05:07 +01:00
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>
 2012-02-05 12:42:15 +01:00
Bernhard 212515148e added m240 photography support. default off 2011-12-22 12:11:39 +01:00
Bernhard 415aadf704 lcd panel bed support 
advance and ultipanel not any more in default config
 2011-12-22 11:45:52 +01:00
Erik van der Zalm 84d9cf7339 merging 2011-12-12 20:35:46 +01:00
Erik van der Zalm e017228569 Merged multiple extruder support. 
Soft PWM. (Sanguinololu can also have PID temperature control)
Interrupt save WRITE for addresses > 0x0FF
 2011-12-12 19:34:37 +01:00
Bernhard 01001b89d2 repaired nozzle runout prevention to not collide with automatic stepper disabeling. 2011-12-11 15:42:56 +01:00
Bernhard 88ee053af0 heating up santity, formarly knows as "watchdog", but renamed due to the existance of the real watchdog, works now. 2011-12-09 17:07:44 +01:00
Bernhard 2bc5e7ec9e prevent too long extrudes, or too cold extrudes 2011-12-09 15:09:52 +01:00
Bernhard aa4f9a6474 better values. 2011-12-09 14:09:34 +01:00
Bernhard 87fd249c43 made runout prevention independent of tempeorarily set esteps 2011-12-09 13:56:28 +01:00
Bernhard 1ec0c3b68a extruder runout prevention. 2011-12-09 13:39:00 +01:00
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. 2011-12-09 12:51:08 +01:00
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
 2011-12-06 00:09:16 -05:00
Erik van der Zalm b99c49ec3b Add option to only check endstop when homing 2011-12-04 20:17:21 +01:00
Erik van der Zalm 95a0b28acb Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 2011-12-04 19:54:43 +01:00
Erik van der Zalm af22e9cd38 Some advance modifications 2011-12-04 19:54:07 +01:00
Bernhard 4f909963e4 make QUICKHOME configureable 2011-12-04 09:02:09 +01:00
Erik van der Zalm 6b86f15686 More 2nd extruder implementation. (Not usable) 
Advance (not tested)
 2011-12-02 17:45:05 +01:00
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.
 2011-11-30 08:51:46 +01:00
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).
 2011-11-27 21:12:55 +01:00
Erik van der Zalm aad4b75b94 First parts 2nd extruder 2011-11-26 17:33:25 +01:00
Bernhard a0dc66f7bf Home retract distance configureable per axis. 2011-11-26 12:04:06 +01:00
Bernhard 6d6f323535 make an option if sd-card stop should release the steppers. 2011-11-26 11:51:38 +01:00
Bernhard 74d0032e25 cooldown blocking selectable by #define. 2011-11-26 09:03:12 +01:00
Erik van der Zalm c0f8c9fd72 Seperate ENDSTOP_INVERTING for X Y and Z 
Added simple endstop filter.
Corrected M114 count display.
 2011-11-25 13:43:06 +01:00
Erik van der Zalm 2e43f9c809 Changed min max temperature code. 2011-11-20 13:14:58 +01:00
Bernhard Kubicek 8a1e719a3f overworked config file 2011-11-19 20:52:43 +01:00
Bernhard Kubicek f52e1a9571 autotemp working, default=disabled. 2011-11-19 17:07:44 +01:00
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 2011-11-19 14:50:31 +01:00
Erik van der Zalm b15902d3b5 Fixed bug in configuration.h 2011-11-18 19:46:16 +01:00
Erik van der Zalm e63e224a33 Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin.pde
 2011-11-18 19:04:09 +01:00
Erik van der Zalm e7dca8614b Advance experiments. Not working yet. 2011-11-18 18:59:17 +01:00
Bernhard Kubicek 46f80e82d9 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 
Conflicts:
	Marlin/ultralcd.h
 2011-11-15 22:53:04 +01:00
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
 2011-11-15 22:50:43 +01:00
Bernhard Kubicek 7919a40d06 watchdog,percent done, 2011-11-15 20:54:40 +01:00
Erik van der Zalm 805d37f77b Fixed some small planner bugs 2011-11-15 18:14:00 +01:00
Erik van der Zalm 5fd41ae872 Some fixes in planner 2011-11-14 23:57:34 +01:00
Erik van der Zalm 95126c09c0 Added slowdown 2011-11-14 20:04:29 +01:00
Erik van der Zalm 331e82dcd3 Buffer size > 16 2011-11-14 18:53:09 +01:00
Erik van der Zalm c00eefb824 Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 2011-11-14 18:26:57 +01:00
Erik van der Zalm 1d0452f10c 250000 baud 2011-11-14 18:24:02 +01:00
Bernhard Kubicek c57906b627 fixed bug with adjusting ki in realtime. 2011-11-13 21:43:26 +01:00
Erik van der Zalm ac82411c73 Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 2011-11-13 20:46:44 +01:00
Erik van der Zalm 65934eee9c A lot of changes in the planner code 2011-11-13 20:42:08 +01:00
Bernhard Kubicek 36958ee305 minor changes and first not-well working version of autotemp 2011-11-09 22:09:16 +01:00
Bernhard Kubicek 27361e7cd0 beautified the config. ordered it into thematic sections. 2011-11-09 20:28:40 +01:00
Erik van der Zalm d3bfffcb6e Corrected thermistor naming 2011-11-06 22:37:43 +01:00
Bernhard Kubicek 163efdf1c7 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2011-11-06 19:49:04 +01:00
Bernhard Kubicek 87aaf0f70a static'ified Marlin.pde. 2011-11-06 19:48:37 +01:00
Erik van der Zalm 76b3f805c0 Added teensylu pins 2011-11-06 19:30:04 +01:00
Bernhard Kubicek 1d171e9e52 reformating and some minor bugs/things found on the way. 2011-11-06 19:23:08 +01:00
Bernhard Kubicek 2afb7bd4cf refactured temperature.cpp so that there are now abstract functions to access temperatures. 2011-11-06 14:03:41 +01:00
Erik van der Zalm 0b82465168 First arcs version. (Arcs not working ok) 2011-11-06 12:39:00 +01:00
Erik van der Zalm 2e8e8878e5 Corrected temp variables. 2011-11-05 20:21:09 +01:00
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
 2011-11-05 20:03:38 +01:00
Erik van der Zalm d15f01e1b4 Temperature changes 2011-11-05 19:21:36 +01:00
Bernhard Kubicek 00674af3a8 merge from the branch bkubicek/Marlin/zalmmerge 2011-11-05 14:13:20 +01:00
Erik van der Zalm 95d3d9847c M109 now equal to sprinter 2011-11-04 23:38:25 +01:00
Erik van der Zalm bf879ceaa9 Added thermistor tables 2011-11-04 22:51:14 +01:00
Erik van der Zalm 094afe7c10 Merged Marlin, Marlin non gen6 and Ultimaker changes 2011-11-04 18:02:56 +01:00
Erik van der Zalm 8e017b81ab Sync with non-gen6 version 2011-09-14 18:56:45 +02:00
Erik van der Zalm b5f6482dce Fixed small feedrate bug. 
Copied Camiels comments in the Configuration.h file
 2011-08-21 18:29:47 +02:00
Erik van der Zalm 26bf57e22c first-commit 2011-08-13 10:09:54 +02:00
Erik van der Zalm 750f6c33e3 first commit 2011-08-12 22:28:35 +02:00