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

11219 commits

This branch
This branch
All branches
Author SHA1 Message Date
Denis B 49b2ddc8c1 Cleaned up non-standard characters 2013-02-04 01:41:40 -05:00
Bernhard Kubicek f8876a7958 Merge pull request #376 from kintel/skip_longfilenames 
Also skip .files and _files with long filenames. I think its better than before. If somebody dislikes it, or wants additional configuration, it can be done in a future step. Thanks, Marius, and nice to have you helping!
 2013-02-03 03:05:31 -08:00
daid 18fcc367d2 Merge pull request #371 from Banjer/Melzi_LED_PIN 
Chenged LED_PIN for Melzi boards, added comment about broken versions of...
 2013-02-02 03:23:43 -08:00
daid 6b78edf7c5 Merge pull request #374 from kintel/quickstop 
compile fix: quickStop() needs stepper.h
 2013-02-01 13:54:12 -08:00
Bas Spaans 19ce90fe02 Added comment about M42 usage (clean) 2013-01-31 18:20:23 +01:00
Bas Spaans 00fed0a703 Revert "Extended comment explaining M42 usage" 
This reverts commit 01541ee64c.
 2013-01-31 18:11:13 +01:00
Marius Kintel e06d820909 Also skip .files and _files with long filenames 2013-01-31 12:07:42 -05:00
Bas Spaans 01541ee64c Extended comment explaining M42 usage 2013-01-31 18:00:25 +01:00
Marius Kintel f24f02e212 compile fix: quickStop() needs stepper.h 2013-01-31 10:43:03 -05:00
Bas Spaans 12c41423ad Fixed typo in comment 2013-01-30 22:54:04 +01:00
Bas Spaans 0995eaa492 Chenged LED_PIN for Melzi boards, added comment about broken versions of the Sanguino libraries 2013-01-30 22:25:01 +01:00
Bernhard 1d06b10962 Added a feature to have filament change by gcode or display trigger. 
[default off for now]
syntax: M600  X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal]

if enabled, after a M600, the printer will retract by E, lift by Z, move to XY, retract even more filament.
Oh, and it will display "remove filament" and beep like crazy.

You are then supposed to insert a new filament (other color, e.g.) and click the display to continue.
After having the nozzle cleaned manually, aided by the disabled e-steppers.
After clicking, the printer will then go back the whole shebang, and continue printing with a fancy new color.
 2013-01-27 13:21:34 +01:00
daid303 408b349a84 Fixed #368. Commented out the wrong pin definition, but explained why it is there. 2013-01-21 15:46:17 +01:00
daid 236bb2c110 Merge pull request #365 from DanieleSdei/Marlin_v1 
Marlin v1, italian MSG_RESUMING and RepRapPro thermistor tables.
 2013-01-14 08:29:55 -08:00
Daniele Sdei 9ecb267b63 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 2013-01-14 15:47:40 +01:00
Daniele Sdei 3cf59f6f9a add RepRapPro Huxley thermistor tables 2013-01-14 15:36:08 +01:00
daid c1730e2b08 Merge pull request #363 from yuroller/sanguino_panelolu 
Panelolu pin assignment for sanguinololu
 2013-01-10 07:19:37 -08:00
Yuri Valentini 86358dd6cd Panelolu pin assignment for sanguinololu from http://reprap.org/wiki/Panelolu 2013-01-10 12:23:20 +01:00
daid303 0f3f5d083d Minor cleanup of the new FAN_KICKSTART code. #334 2013-01-10 11:08:45 +01:00
daid 6ec56fa923 Merge pull request #334 from KevinOConnor/FanKick 
Add feature to briefly run the cooling fan at full speed when it first starts.
 2013-01-09 02:47:59 -08:00
daid 965baf2683 Merge pull request #362 from daid/Marlin_v1 
Finnish language
 2013-01-09 02:42:09 -08:00
daid 4fde836d83 Merge pull request #8 from randomev/Marlin_v1 
+ Finnish translation
 2013-01-09 02:39:43 -08:00
Kevin O'Connor 3d91bd486c Add "kick fan" feature - briefly run fan at full speed on start. 
Add a feature to run the cooling fan at full speed for a small period
(default 100ms) when first starting the fan.  Some fans wont reliably
start spinning at low power, and many fans have issue with the PWM at
low power.  However, once the fan starts spinning it can reliably be
set to a wide range of PWM values.
 2013-01-08 18:50:15 -05:00
Kevin O'Connor 3f2f94ef28 Be consistent in setting of the fan PWM. 
Always set the FAN PWM value in check_axes_activity() and always use
the value of the active move if a move is active.
 2013-01-08 18:49:18 -05:00
Henry Palonen 7f30039d2a + Finnish translation 2013-01-08 19:21:34 +02:00
daid303 14e1d495ef Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 2013-01-08 17:10:30 +01:00
daid303 bbe7d3d0fe Fixed #312 2013-01-08 17:09:57 +01:00
daid 7ce509b9a7 Merge pull request #361 from yuroller/MakefileSanguino 
Makefile sanguino
 2013-01-08 06:22:27 -08:00
Yuri Valentini 9c34c4f05b fixes for ramps compilation using installed arduino ide 2013-01-08 12:54:31 +01:00
daid303 442ade15a6 Move Gen6 stuff into a proper location. 2013-01-08 12:31:28 +01:00
daid 5fd4582cc8 Merge pull request #242 from Drakelive/Marlin_v1 
Fixes issues # 216 and # 135 for Gen6 and Gen6 Deluxe board
 2013-01-08 03:29:20 -08:00
daid303 8b88e3b386 Fixed #345, Fixed #267. 2013-01-08 12:14:55 +01:00
daid 27843388c6 Merge pull request #360 from njprossi/Marlin_v1 
Power signal control definitions for other power supplies
 2013-01-08 02:58:02 -08:00
daid303 bfa5bb86e4 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 2013-01-08 11:54:13 +01:00
daid303 921273baa0 Added optional feature to stop printing when an endstop is hit. Made the Z display on the LCD in 3.2 format instead of 3.1. Added LCD message when and endstop is hit. 2013-01-08 11:53:18 +01:00
Yuri Valentini 7d20ec706e Added libraries from Arduino 1.0.3 for sanguino build 2013-01-07 17:26:50 +01:00
Nicolas Rossi 437eb3bafc Initialize PS_ON at startup 2013-01-07 14:57:51 +01:00
Nicolas Rossi f3c1fc70a9 Power signal control definitions for ATX and others 2013-01-07 14:33:30 +01:00
Yuri Valentini dad7691df9 makefile for sanguino standalone compilation 2013-01-07 11:08:10 +01:00
Erik vd Zalm 6752cb2d9c PID now per extruder. Fixed typo 2013-01-06 14:26:23 +01:00
Erik vd Zalm 0ac452e252 Disable is now multi extruder compatible. M84 got a T option. 2013-01-06 13:37:01 +01:00
daid 3a1cd30ce1 Merge pull request #358 from yuroller/sanguino_spi 
Definitions for Sanguino SPI
 2013-01-04 11:53:10 -08:00
Yuri Valentini 69582042d7 Definitions for Sanguino SPI 2013-01-04 18:32:08 +01:00
Johann Rocholl 9e7b5056a0 {X,Y,Z}_{MIN,MAX}_POS are actually in Gcode coordinates. 2012-12-28 16:20:10 -08:00
Daniele Sdei 5f82f03ff3 Add italian MSG_RESUMING. 2012-12-28 11:44:35 +01:00
daid303 5e3873c8db Add german MSG_RESUMING. 2012-12-25 20:53:11 +01:00
daid303 01aac2a142 Small changes on the LCD panel, let the speed control work better, line up the parameter edit the same as the menu, remove some unused defines, and remove the Z from the 10mm move menu. 2012-12-21 16:14:47 +01:00
daid303 b69cb9fbd9 Change the end of SD cart print message from minutes/seconds to hours/minutes. 2012-12-19 12:26:40 +01:00
daid 30254e3388 Merge pull request #350 from jcrocholl/Marlin_v1 
Automatically set *_MIN_PIN and *_MAX_PIN according to *_HOME_DIR.
 2012-12-17 02:16:31 -08:00
daid303 38ee395ac7 Replace the 1ms delay for 2 nops to get a 100ns delay. #259 2012-12-17 11:12:11 +01:00