Sergey Taranenko
205304ddee
Merge git://github.com/ErikZalm/Marlin into Marlin_v1
12 years ago
Erik vd Zalm
58bca87c72
fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '
12 years ago
Erik vd Zalm
febeb43197
Revert "fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '"
This reverts commit cb02c2f9d8
.
12 years ago
Sergey Taranenko
8178dec4c3
Fix num of digits on LCD for E and Z axis.
The number of steps per mm often contains 4 digits before the decimal point and does not require precision greater than 0.1
12 years ago
ErikZalm
70f57a6844
Merge pull request #273 from setar/Marlin_v1
fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '
12 years ago
ErikZalm
ff14199e58
Merge pull request #270 from jothan/Marlin_v1
Create an explicit rule for building applet/Marlin.cpp.
12 years ago
ErikZalm
bfdf0932c1
Merge pull request #274 from DanieleSdei/Marlin_v1
Italian language support
12 years ago
Daniele Sdei
695938ba3f
Italian language support
12 years ago
Sergey Taranenko
cb02c2f9d8
fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '
12 years ago
Jonathan Bastien-Filiatrault
e4a5e333ef
Generalize.
12 years ago
Jonathan Bastien-Filiatrault
e10d3136c8
Create an explicit rule for building applet/Marlin.cpp.
It would seem that the pattern matches do not work when the source
file is created when make is running. The result of this is that it is
necessary to run "make" twice to build the firmware.
This adds an explicit rule without a pattern match for building
applet/Marlin.cpp it corrects the make behaviour at the cost of adding
a little redundancy in the Makefile.
12 years ago
ErikZalm
9f089756b7
Merge pull request #265 from setar/Marlin_v1
Added Russian translation
12 years ago
ErikZalm
654387297f
Merge pull request #268 from brupje/Marlin_v1
Marlin v1
12 years ago
brupje
326423719f
Add support for Megatronics
12 years ago
brupje
d07b6e93d5
Add support for Megatronics
12 years ago
Sergey Taranenko
efcc28d347
Fix check for include LiquidCrystalRus.h
12 years ago
Sergey Taranenko
cfc193cdac
Enables support the Cyrillic alphabet for LCD
12 years ago
Sergey Taranenko
24bcc9647d
Added Russian translation
12 years ago
ErikZalm
bc27d809fb
Merge pull request #262 from markfinn/bedpid-clean3
Remove unwanted artifacts in merge of bed-pid tree
12 years ago
Mark Finn
bf7e453d02
Unwanted artifacts from unclean merge of bed-pid tree
12 years ago
ErikZalm
36a746d7d5
Merge pull request #244 from markfinn/pidbed
PID for heated bed
12 years ago
tonokip
ca811156a0
Merge pull request #1 from johnnyr/patch-1
fix max endstop pins
12 years ago
ErikZalm
50daf27e5a
Merge pull request #255 from elgambitero/Marlin_v1
Spanish language updated
12 years ago
elgambitero
df09e2adce
Spanish updated
12 years ago
elgambitero
ddf6603d81
Spanish language updated. Bug fixes on dialogs.
12 years ago
elgambitero
4bf8b1aeee
fesfas
12 years ago
drakelive
be1e099f1b
Union whit Erick version
12 years ago
elgambitero
7afd202b89
New dialogs translated to spanish. Bug fixes.
Dialogs from M119 translated, and "Set Preheat" dialogs adapted to the
screen size.
12 years ago
elgambitero
ebc4601185
Some new dialogs translated to Spanish
12 years ago
drakelive
c8ea9b0e58
Merge branch 'Marlin_v1' of https://github.com/Drakelive/Marlin
12 years ago
drakelive
ca7ca4572e
primo commit
12 years ago
ErikZalm
c0aad4c28a
Merge pull request #254 from ZetaPhoenix/Marlin_v1_bugfix
Changes to M119 response for easier visual comparison
12 years ago
johnnyr
8016f058bc
fix max endstop pins
12 years ago
Mark Finn
d197f8504b
clean up and changes from testing
12 years ago
Mark Finn
eb06a886c4
missed
12 years ago
Mark Finn
04631d2250
cleanup for pull
12 years ago
Mark Finn
0a5ad3ab85
move comment to correct place
12 years ago
ZetaPhoenix
8ac5b29e02
Changes to M119 response for easier visual comparison
Changed to report on individual lines with "TRIGGERED" or "open" instead of "H" or "L" on one line as H&L could be confused with logic levels High and Low which may be wrong if using inverted logic. Added strings to language.h.
Fixed typo "deu" in English language that was fixed in #134 but got added back in via 9f7f7354f5
12 years ago
ErikZalm
0a31ccb1d1
Merge pull request #251 from ZetaPhoenix/Marlin_v1_bugfix
Limit Switch locations based on MIN/MAX limits and homing direction
12 years ago
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.
12 years ago
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.
12 years ago
ErikZalm
ba898faa7d
Merge pull request #249 from gwelchc/patch-2
Slight modification for byte savings
12 years ago
ErikZalm
0152ee71a5
Merge pull request #248 from gwelchc/patch-1
Binary representation for characters in ultraldc.pde
12 years ago
ErikZalm
348d543425
Merge pull request #245 from andrey-vasilyev/patch-1
Fix M81 not working reliably on Gen7
12 years ago
G. W. C.
6ccbfeb80c
Update Marlin/Marlin.pde
Added function 'setTargetedHotend' that turns into a function an operation repeated 3 times through the M-codes processing.
This modification saves a few bytes that can be used to add support for new commands.
12 years ago
G. W. C.
c433142abf
Update Marlin/ultralcd.pde
The joris' char drawins are expressed in binary so to show their content's in a more visual fashion.
This is not a code modification as much as a readibility modification.
12 years ago
andrey-vasilyev
1d389ad3a8
Fix M81 not working reliably on Gen7
Some discussion of the issue is here http://forums.reprap.org/read.php?181,118329,page=1
12 years ago
Mark Finn
5bfccab650
readme
12 years ago
Mark Finn
9698f4ea64
bed pid
Conflicts:
Marlin/Configuration.h
12 years ago
ErikZalm
769796ed4c
Merge pull request #240 from ZetaPhoenix/Marlin_v1_bugfix
Missing #else in temperature.cpp prevented reading bed temp when TEMP_BE...
12 years ago