73d41c10b9
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into jeff
...
Conflicts:
Marlin/language.h
Marlin/thermistortables.h
13 years ago
63da4dc59a
Merge pull request #398 from DanieleSdei/Marlin_v1
...
Marlin v1, alignment of the Italian language
13 years ago
7eb9811958
Merge pull request #397 from codenamepawel/patch-1
...
Update Marlin/language.h
13 years ago
82e28851bd
Italian language: SD-Card change and SD-Card init
13 years ago
aed5965ad8
Italian language: remove space and some fix
13 years ago
d360846dd4
Update Marlin/language.h
...
Update Polish language #define MSG_RESUMING "Wznawiam drukowanie"
13 years ago
2f60e324dc
Fixed #394
13 years ago
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
13 years ago
fa5c45f515
Merge pull request #392 from mfeherpataky/Marlin_v1
...
Update Marlin/ultralcd_implementation_hitachi_HD44780.h
13 years ago
a0d4e8e78e
Add Messages for SD Card init. & change
13 years ago
bbf0cc1379
Update Marlin/ultralcd_implementation_hitachi_HD44780.h
...
Fix to a bug that I just introduced - sorry. Forgot about offset of string length.
13 years ago
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.
13 years ago
be91fb9b47
Merge pull request #389 from mfeherpataky/Marlin_v1
...
Update Marlin/ultralcd_implementation_hitachi_HD44780.h
13 years ago
71ddb8dc60
Update Marlin/ultralcd_implementation_hitachi_HD44780.h
...
Use all available characters in narrow LCDs < 20 characters.
13 years ago
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.
13 years ago
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.
13 years ago
49b2ddc8c1
Cleaned up non-standard characters
13 years ago
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!
13 years ago
18fcc367d2
Merge pull request #371 from Banjer/Melzi_LED_PIN
...
Chenged LED_PIN for Melzi boards, added comment about broken versions of...
13 years ago
6b78edf7c5
Merge pull request #374 from kintel/quickstop
...
compile fix: quickStop() needs stepper.h
13 years ago
19ce90fe02
Added comment about M42 usage (clean)
13 years ago
00fed0a703
Revert "Extended comment explaining M42 usage"
...
This reverts commit 01541ee64c
13 years ago
e06d820909
Also skip .files and _files with long filenames
13 years ago
01541ee64c
Extended comment explaining M42 usage
13 years ago
f24f02e212
compile fix: quickStop() needs stepper.h
13 years ago
12c41423ad
Fixed typo in comment
13 years ago
0995eaa492
Chenged LED_PIN for Melzi boards, added comment about broken versions of the Sanguino libraries
13 years ago
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.
13 years ago
408b349a84
Fixed #368 . Commented out the wrong pin definition, but explained why it is there.
13 years ago
236bb2c110
Merge pull request #365 from DanieleSdei/Marlin_v1
...
Marlin v1, italian MSG_RESUMING and RepRapPro thermistor tables.
13 years ago
9ecb267b63
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
13 years ago
3cf59f6f9a
add RepRapPro Huxley thermistor tables
13 years ago
c1730e2b08
Merge pull request #363 from yuroller/sanguino_panelolu
...
Panelolu pin assignment for sanguinololu
13 years ago
86358dd6cd
Panelolu pin assignment for sanguinololu from http://reprap.org/wiki/Panelolu
13 years ago
0f3f5d083d
Minor cleanup of the new FAN_KICKSTART code. #334
13 years ago
6ec56fa923
Merge pull request #334 from KevinOConnor/FanKick
...
Add feature to briefly run the cooling fan at full speed when it first starts.
13 years ago
965baf2683
Merge pull request #362 from daid/Marlin_v1
...
Finnish language
13 years ago
4fde836d83
Merge pull request #8 from randomev/Marlin_v1
...
+ Finnish translation
13 years ago
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.
13 years ago
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.
13 years ago
7f30039d2a
+ Finnish translation
13 years ago
14e1d495ef
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
13 years ago
bbe7d3d0fe
Fixed #312
13 years ago
7ce509b9a7
Merge pull request #361 from yuroller/MakefileSanguino
...
Makefile sanguino
13 years ago
9c34c4f05b
fixes for ramps compilation using installed arduino ide
13 years ago
442ade15a6
Move Gen6 stuff into a proper location.
13 years ago
5fd4582cc8
Merge pull request #242 from Drakelive/Marlin_v1
...
Fixes issues # 216 and # 135 for Gen6 and Gen6 Deluxe board
13 years ago
8b88e3b386
Fixed #345 , Fixed #267 .
13 years ago
27843388c6
Merge pull request #360 from njprossi/Marlin_v1
...
Power signal control definitions for other power supplies
13 years ago
bfa5bb86e4
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
13 years ago
Denis Bakin