daid303
5d471e0f34
Also reset the PID values to defaults. Fixes #281
hace 12 años
daid303
d3ebc34958
Hopefully also support chips with a single UART in MarlinSerial now.
hace 12 años
daid303
b6ff45254e
Better explain the watchdog "problem" and rename the config define so it explains that the feature belongs to the watchdog.
hace 12 años
daid303
7e348fcb5f
By mistake enabled the watchdog by default. This should be off by default.
hace 12 años
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.
hace 12 años
daid
539f3b3fe4
Merge pull request #284 from brackendawson/Marlin_v1
Use the right pins for Gen7 1.4
hace 12 años
daid
2f20df3f55
Merge pull request #289 from buildrob/Marlin_v1
Marlin v1 configurable serial port
hace 12 años
Robert F-C
65c9a0728f
Set default serial port back to 0.
hace 12 años
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.
hace 12 años
Bracken Dawson
f5631a89e8
Add dummy Emergancy Pin to Gen7 1.4
Change required after pulling from ErikZalm.
hace 12 años
Bracken Dawson
a4f9e1ebf2
Merge git://github.com/ErikZalm/Marlin into Marlin_v1
hace 12 años
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.
hace 12 años
ErikZalm
a7e40b2903
Merge pull request #276 from setar/Marlin_v1
Fix num of digits on LCD for E and Z axis.
hace 12 años
ErikZalm
23b0f8ed4b
Merge pull request #279 from MaikStohn/Marlin_v1
Fixed wrong code (will not even compile when EXTRUDERS>2)
hace 12 años
MaikStohn
6ed02c86be
Fixed wrong code (will not even compile when EXTRUDERS>2)
hace 12 años
Sergey Taranenko
2a67363e27
Fix ‘prog_uchar’ definition in LiquidCrystalRus.cpp
hace 12 años
Sergey Taranenko
205304ddee
Merge git://github.com/ErikZalm/Marlin into Marlin_v1
hace 12 años
Erik vd Zalm
58bca87c72
fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '
hace 12 años
Erik vd Zalm
febeb43197
Revert "fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '"
This reverts commit cb02c2f9d8 .
hace 12 años
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
hace 12 años
ErikZalm
70f57a6844
Merge pull request #273 from setar/Marlin_v1
fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '
hace 12 años
ErikZalm
ff14199e58
Merge pull request #270 from jothan/Marlin_v1
Create an explicit rule for building applet/Marlin.cpp.
hace 12 años
ErikZalm
bfdf0932c1
Merge pull request #274 from DanieleSdei/Marlin_v1
Italian language support
hace 12 años
Daniele Sdei
695938ba3f
Italian language support
hace 12 años
Sergey Taranenko
cb02c2f9d8
fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '
hace 12 años
Jonathan Bastien-Filiatrault
e4a5e333ef
Generalize.
hace 12 años
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.
hace 12 años
ErikZalm
9f089756b7
Merge pull request #265 from setar/Marlin_v1
Added Russian translation
hace 12 años
ErikZalm
654387297f
Merge pull request #268 from brupje/Marlin_v1
Marlin v1
hace 12 años
brupje
326423719f
Add support for Megatronics
hace 12 años
brupje
d07b6e93d5
Add support for Megatronics
hace 12 años
Sergey Taranenko
efcc28d347
Fix check for include LiquidCrystalRus.h
hace 12 años
Sergey Taranenko
cfc193cdac
Enables support the Cyrillic alphabet for LCD
hace 12 años
Sergey Taranenko
24bcc9647d
Added Russian translation
hace 12 años
ErikZalm
bc27d809fb
Merge pull request #262 from markfinn/bedpid-clean3
Remove unwanted artifacts in merge of bed-pid tree
hace 12 años
Mark Finn
bf7e453d02
Unwanted artifacts from unclean merge of bed-pid tree
hace 12 años
ErikZalm
36a746d7d5
Merge pull request #244 from markfinn/pidbed
PID for heated bed
hace 12 años
tonokip
ca811156a0
Merge pull request #1 from johnnyr/patch-1
fix max endstop pins
hace 12 años
ErikZalm
50daf27e5a
Merge pull request #255 from elgambitero/Marlin_v1
Spanish language updated
hace 12 años
elgambitero
df09e2adce
Spanish updated
hace 12 años
elgambitero
ddf6603d81
Spanish language updated. Bug fixes on dialogs.
hace 12 años
elgambitero
4bf8b1aeee
fesfas
hace 12 años
drakelive
be1e099f1b
Union whit Erick version
hace 12 años
elgambitero
7afd202b89
New dialogs translated to spanish. Bug fixes.
Dialogs from M119 translated, and "Set Preheat" dialogs adapted to the
screen size.
hace 12 años
elgambitero
ebc4601185
Some new dialogs translated to Spanish
hace 12 años
drakelive
c8ea9b0e58
Merge branch 'Marlin_v1' of https://github.com/Drakelive/Marlin
hace 12 años
drakelive
ca7ca4572e
primo commit
hace 12 años
ErikZalm
c0aad4c28a
Merge pull request #254 from ZetaPhoenix/Marlin_v1_bugfix
Changes to M119 response for easier visual comparison
hace 12 años
johnnyr
8016f058bc
fix max endstop pins
hace 12 años
Mark Finn
d197f8504b
clean up and changes from testing
hace 12 años