ErikZalm
bc27d809fb
Merge pull request #262 from markfinn/bedpid-clean3
...
Remove unwanted artifacts in merge of bed-pid tree
2012-10-09 13:18:58 -07:00
Mark Finn
bf7e453d02
Unwanted artifacts from unclean merge of bed-pid tree
2012-10-09 14:47:35 -05:00
ErikZalm
36a746d7d5
Merge pull request #244 from markfinn/pidbed
...
PID for heated bed
2012-10-08 11:15:16 -07:00
tonokip
ca811156a0
Merge pull request #1 from johnnyr/patch-1
...
fix max endstop pins
2012-10-01 23:55:08 -07:00
ErikZalm
50daf27e5a
Merge pull request #255 from elgambitero/Marlin_v1
...
Spanish language updated
2012-09-26 10:29:03 -07:00
elgambitero
df09e2adce
Spanish updated
2012-09-26 19:14:07 +02:00
elgambitero
ddf6603d81
Spanish language updated. Bug fixes on dialogs.
2012-09-26 19:11:45 +02:00
elgambitero
4bf8b1aeee
fesfas
2012-09-26 19:05:31 +02:00
drakelive
be1e099f1b
Union whit Erick version
2012-09-25 19:17:15 +02:00
elgambitero
7afd202b89
New dialogs translated to spanish. Bug fixes.
...
Dialogs from M119 translated, and "Set Preheat" dialogs adapted to the
screen size.
2012-09-25 19:16:57 +02:00
elgambitero
ebc4601185
Some new dialogs translated to Spanish
2012-09-25 19:08:44 +02:00
drakelive
c8ea9b0e58
Merge branch 'Marlin_v1' of https://github.com/Drakelive/Marlin
2012-09-25 18:51:20 +02:00
drakelive
ca7ca4572e
primo commit
2012-09-25 18:46:38 +02:00
ErikZalm
c0aad4c28a
Merge pull request #254 from ZetaPhoenix/Marlin_v1_bugfix
...
Changes to M119 response for easier visual comparison
2012-09-25 00:10:38 -07:00
johnnyr
8016f058bc
fix max endstop pins
2012-09-19 13:15:17 -05:00
Mark Finn
d197f8504b
clean up and changes from testing
2012-09-17 19:18:50 -05:00
Mark Finn
eb06a886c4
missed
2012-09-17 14:23:49 -05:00
Mark Finn
04631d2250
cleanup for pull
2012-09-17 14:17:24 -05:00
Mark Finn
0a5ad3ab85
move comment to correct place
2012-09-17 08:42:35 -05:00
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
2012-09-16 14:51:24 -07:00
ErikZalm
0a31ccb1d1
Merge pull request #251 from ZetaPhoenix/Marlin_v1_bugfix
...
Limit Switch locations based on MIN/MAX limits and homing direction
2012-09-16 01:47:51 -07: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
ErikZalm
ba898faa7d
Merge pull request #249 from gwelchc/patch-2
...
Slight modification for byte savings
2012-09-14 12:13:36 -07:00
ErikZalm
0152ee71a5
Merge pull request #248 from gwelchc/patch-1
...
Binary representation for characters in ultraldc.pde
2012-09-14 12:10:28 -07:00
ErikZalm
348d543425
Merge pull request #245 from andrey-vasilyev/patch-1
...
Fix M81 not working reliably on Gen7
2012-09-14 12:04:57 -07:00
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.
2012-09-14 16:38:54 +03:00
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.
2012-09-14 16:29:43 +03:00
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
2012-09-13 19:23:48 +04:00
Mark Finn
5bfccab650
readme
2012-09-12 21:52:16 -05:00
Mark Finn
9698f4ea64
bed pid
...
Conflicts:
Marlin/Configuration.h
2012-09-12 21:18:59 -05:00
ErikZalm
769796ed4c
Merge pull request #240 from ZetaPhoenix/Marlin_v1_bugfix
...
Missing #else in temperature.cpp prevented reading bed temp when TEMP_BE...
2012-09-11 02:10:39 -07:00
drakelive
e5c39b7c2a
commit
2012-09-10 14:25:49 +02:00
ZetaPhoenix
e8c92e0a95
Missing #else in temperature.cpp prevented reading bed temp when TEMP_BED_PIN <7. Thanks to Leland Wallace for helping me track this down via "Sesame Street" coding (what is not like the other)
2012-09-09 16:06:02 -07:00
drake
bf2071871c
Merge branch 'Marlin_v1' of https://github.com/Drakelive/Marlin
2012-09-08 23:08:34 +02:00
drake
fc32e20881
first commit
2012-09-08 22:26:23 +02:00
Erik vd Zalm
abf0693e8e
Added KILL_PIN -1 to gen7 boards
2012-09-04 08:20:27 +02:00
Erik vd Zalm
47319cf64e
Fixed typo in SF arc fix code.
2012-09-03 21:28:31 +02:00
Erik vd Zalm
e358a2d7af
Added fix for SF Arc Point fillet procedure
2012-09-02 01:12:49 +02:00
ErikZalm
044a64a1fb
Merge pull request #225 from Justblair/Marlin_v1
...
Added PDF file containing Menu Tree for documentation purposes.
2012-09-01 04:41:49 -07:00
ErikZalm
cd91e0e3e1
Merge pull request #228 from Drakelive/patch-1
...
Update Marlin/pins.h
2012-08-30 13:39:37 -07:00
Drakelive
d728e35658
Update Marlin/pins.h
2012-08-30 23:36:49 +03: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
Blair Thompson
dcd3e8a211
Tidy up
2012-08-29 22:53:41 +01:00
Blair Thompson
ddd9d0cfd4
Added PDF file containing Menu Tree for documentation purposes. Source xlsx document included.
2012-08-29 21:08:41 +01:00
Erik vd Zalm
0e58ef6805
Some dialogs are corrected
2012-08-29 21:15:59 +02:00
Erik vd Zalm
0e89022cc3
Correct temptable_55 name.
2012-08-28 19:47:22 +02:00
Bracken Dawson
47d4f55bc0
Fix Gen7 1.4 pinout
...
Gen7 1.4 uses very different pin assignments, might as well make a new
section and remove some of the conditionals from each. It's easier to change
your pin assingment this way if like me you don't wire it exactly to plan.
2012-08-22 23:15:46 +01:00
elgambitero
6cd150842f
Update Marlin/language.h
...
Some dialogs corrected and Default language set to 1
2012-08-22 21:46:22 +03:00
elgambitero
299c18596f
Update Marlin/language.h
...
Some dialogs are corrected
2012-08-22 21:44:57 +03:00
