daid303
7e348fcb5f
By mistake enabled the watchdog by default. This should be off by default.
2012-11-06 13:20:08 +01:00
daid303
06b58a9c4f
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 12:06:41 +01:00
daid
539f3b3fe4
Merge pull request #284 from brackendawson/Marlin_v1
...
Use the right pins for Gen7 1.4
2012-11-06 01:06:24 -08:00
daid
2f20df3f55
Merge pull request #289 from buildrob/Marlin_v1
...
Marlin v1 configurable serial port
2012-11-06 01:00:50 -08:00
Robert F-C
65c9a0728f
Set default serial port back to 0.
2012-11-05 22:15:07 +11:00
Robert F-C
ab9d183024
Make serial port configurable.
...
This change makes the choice of serial port configurable so that
wireless capability can be easily added by connecting Bluetooth modules
(such as BlueSmirf or JY-MCU) to the expansion port pins.
2012-11-05 21:34:27 +11:00
Bracken Dawson
f5631a89e8
Add dummy Emergancy Pin to Gen7 1.4
...
Change required after pulling from ErikZalm.
2012-10-26 22:28:37 +01:00
Bracken Dawson
a4f9e1ebf2
Merge git://github.com/ErikZalm/Marlin into Marlin_v1
2012-10-26 22:20:35 +01:00
Bracken Dawson
2873d67b17
Put bogus temp override back in Gen7 up to 1.3
...
Took out the ifdef when I split 1.4 out and forgot to permanently
define it for <=1.3.
2012-10-26 22:17:26 +01:00
ErikZalm
a7e40b2903
Merge pull request #276 from setar/Marlin_v1
...
Fix num of digits on LCD for E and Z axis.
2012-10-23 09:48:55 -07:00
ErikZalm
23b0f8ed4b
Merge pull request #279 from MaikStohn/Marlin_v1
...
Fixed wrong code (will not even compile when EXTRUDERS>2)
2012-10-23 09:48:02 -07:00
MaikStohn
6ed02c86be
Fixed wrong code (will not even compile when EXTRUDERS>2)
2012-10-23 18:08:43 +02:00
Sergey Taranenko
2a67363e27
Fix ‘prog_uchar’ definition in LiquidCrystalRus.cpp
2012-10-22 11:05:17 +04:00
Sergey Taranenko
205304ddee
Merge git://github.com/ErikZalm/Marlin into Marlin_v1
2012-10-22 10:59:27 +04:00
Erik vd Zalm
58bca87c72
fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '
2012-10-21 14:40:06 +02:00
Erik vd Zalm
febeb43197
Revert "fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '"
...
This reverts commit cb02c2f9d8
2012-10-21 14:36:31 +02:00
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
2012-10-18 17:45:40 +04:00
ErikZalm
70f57a6844
Merge pull request #273 from setar/Marlin_v1
...
fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '
2012-10-17 04:10:18 -07:00
ErikZalm
ff14199e58
Merge pull request #270 from jothan/Marlin_v1
...
Create an explicit rule for building applet/Marlin.cpp.
2012-10-17 04:09:36 -07:00
ErikZalm
bfdf0932c1
Merge pull request #274 from DanieleSdei/Marlin_v1
...
Italian language support
2012-10-17 04:09:13 -07:00
Daniele Sdei
695938ba3f
Italian language support
2012-10-17 12:48:26 +02:00
Sergey Taranenko
cb02c2f9d8
fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '
2012-10-17 10:49:05 +04:00
Jonathan Bastien-Filiatrault
e4a5e333ef
Generalize.
2012-10-15 21:34:33 -04:00
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.
2012-10-15 21:16:25 -04:00
ErikZalm
9f089756b7
Merge pull request #265 from setar/Marlin_v1
...
Added Russian translation
2012-10-14 14:11:58 -07:00
ErikZalm
654387297f
Merge pull request #268 from brupje/Marlin_v1
...
Marlin v1
2012-10-14 08:55:01 -07:00
brupje
326423719f
Add support for Megatronics
2012-10-14 14:05:57 +03:00
brupje
d07b6e93d5
Add support for Megatronics
2012-10-14 14:05:12 +03:00
Sergey Taranenko
efcc28d347
Fix check for include LiquidCrystalRus.h
2012-10-13 00:29:34 +04:00
Sergey Taranenko
cfc193cdac
Enables support the Cyrillic alphabet for LCD
2012-10-12 19:06:43 +04:00
Sergey Taranenko
24bcc9647d
Added Russian translation
2012-10-12 18:33:05 +04:00
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
