CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,084 Commits 1 Branch 0 Tags 107 MiB
aa6c58ad37
Commit Graph

1084 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
daid
63da4dc59a Merge pull request #398 from DanieleSdei/Marlin_v1 
Marlin v1, alignment of the Italian language
 2013-02-16 15:41:43 -08:00
daid
7eb9811958 Merge pull request #397 from codenamepawel/patch-1 
Update Marlin/language.h
 2013-02-16 15:41:07 -08:00
Daniele Sdei
82e28851bd Italian language: SD-Card change and SD-Card init 2013-02-16 12:17:29 +01:00
Daniele Sdei
aed5965ad8 Italian language: remove space and some fix 2013-02-16 12:14:50 +01:00
codenamepawel
d360846dd4 Update Marlin/language.h 
Update Polish language 	#define MSG_RESUMING "Wznawiam drukowanie"
 2013-02-16 03:42:53 +01:00
daid303
2f60e324dc Fixed #394 2013-02-14 14:04:26 +01:00
daid
5e2abfcdcd Merge pull request #391 from STB3/Marlin_with_SD-Card_Change_Menu 
Add SD-Card change and SD-Card init. for electronics equipped with LCD Display
 2013-02-13 08:56:00 -08:00
daid
fa5c45f515 Merge pull request #392 from mfeherpataky/Marlin_v1 
Update Marlin/ultralcd_implementation_hitachi_HD44780.h
 2013-02-13 08:54:58 -08:00
Dirk Eichel
a0d4e8e78e Add Messages for SD Card init. & change 2013-02-13 10:05:18 +01:00
mfeherpataky
bbf0cc1379 Update Marlin/ultralcd_implementation_hitachi_HD44780.h 
Fix to a bug that I just introduced - sorry. Forgot about offset of string length.
 2013-02-12 20:06:51 +01:00
Dirk Eichel
c8f1fbd9d8 Add SD-Card change and SD-Card init. 
Add SD-Card change and SD-Card init. for reprap electronics without
SD-Chard change detect pin.
 2013-02-12 17:35:46 +01:00
daid
be91fb9b47 Merge pull request #389 from mfeherpataky/Marlin_v1 
Update Marlin/ultralcd_implementation_hitachi_HD44780.h
 2013-02-12 07:56:15 -08:00
mfeherpataky
71ddb8dc60 Update Marlin/ultralcd_implementation_hitachi_HD44780.h 
Use all available characters in narrow LCDs < 20 characters.
 2013-02-12 00:03:40 +01:00
mfeherpataky
d2c547c407 Update Marlin/ultralcd_implementation_hitachi_HD44780.h 
Fix to a minor bug with hardcoded LCD_WIDTH that draws edited values outside of the 16 characters width LCDs.
 2013-02-11 23:25:24 +01:00
Denis B
70871715e4 Added support for extruder offset handling 
The extruder offset can be specified in the configuration
file or adjusted on the fly using the "M218 T# X# Y#" command.
The EEPROM support is not yet merged in.
The "T#" command can take option "F#" that specifies the feedrate
at which the printing head should be re-positioned. If not
specified the re-positioning move is not preformed immediately,
but the coordinates are adjusted for the printer to properly
position the head when the next movement happens.
 2013-02-04 23:05:45 -05:00
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