Scott Lahteine
6d81968db5
Merge pull request #1450 from docdawning/Development
...
Normalized section headers, added some headers, added help URLs for newb...
2015-02-02 21:17:06 -08:00
DocDawning
5bb3933b21
Fixed n00bsauce
2015-02-02 14:18:53 -07:00
DocDawning
a507431400
Merge branch 'Development' of https://github.com/docdawning/Marlin into Development
2015-02-02 14:13:03 -07:00
DocDawning
d109cd940b
Normalized all configuration files to include my new section headers and the like.
2015-02-02 14:11:21 -07:00
DocDawning
055c4beaf9
Normalized section headers, added some headers, added help URLs for newbies
2015-02-02 14:11:09 -07:00
Scott Lahteine
137ba7b590
Merge pull request #1449 from AnHardt/LostInTranslation3
...
Solid improvements. Merging.
2015-02-01 18:37:20 -08:00
DocDawning
8e287c2762
Normalized section headers, added some headers, added help URLs for newbies
2015-02-01 17:06:38 -07:00
AnHardt
2dd43a82b1
Ups. #else added
2015-02-01 14:16:35 +01:00
AnHardt
26e55471f8
Update example configurations.
2015-02-01 13:46:32 +01:00
AnHardt
85385be132
Removed now automatic define of DISPLAY_CHARSET_DOGM + improved description.
2015-02-01 13:33:25 +01:00
AnHardt
0e40408ee5
Make exemplaric use of new display charsets in language_en.h and languag_de.h
2015-02-01 13:20:58 +01:00
AnHardt
8dce5a6644
Improve new charset featur.
...
Select DOGM-displays automaticly.
Give hint where to find charsets.
Add '²' and '³' characters.
2015-02-01 13:09:59 +01:00
Scott Lahteine
0cec0b73bc
Merge pull request #1446 from thinkyhead/bq_hephestos_support
...
Add support for BQ Prusa i3 "Hephestos"
2015-02-01 03:43:44 -08:00
Scott Lahteine
c009c81e65
make marlin-main the default
2015-01-31 23:11:28 -08:00
Scott Lahteine
f4ebc02555
marlin url
2015-01-31 23:09:12 -08:00
Scott Lahteine
0af9a0bf57
url to firmware downloads
2015-01-31 22:19:45 -08:00
Scott Lahteine
5f8dd92905
toss in a fix for .ru
2015-01-31 21:58:38 -08:00
Scott Lahteine
3f3ad9b3ad
typo
2015-01-31 21:42:53 -08:00
Scott Lahteine
07639053fb
Add support for BQ Prusa i3 "Hephestos"
2015-01-31 21:38:30 -08:00
Scott Lahteine
4f4cd7a2c0
Merge pull request #1445 from blubbfish/patch-3
...
Avoid compiling error
2015-01-31 21:03:18 -08:00
Philip Schell
fb7c636ecf
Avoid compiling error
...
Only a missing ","... now it will compile again
2015-02-01 01:33:04 +01:00
alexborro
787d6fb61a
Update RUMBA pins file
...
Add FAN1_PIN and SERVO0_PIN
2015-01-31 18:03:28 -02:00
Scott Lahteine
5fd5105d44
Merge pull request #1439 from clefranc/Development
...
Fix nozzle in temperature menu
2015-01-30 19:05:45 -08:00
Scott Lahteine
b40dd814b0
Merge pull request #1434 from AnHardt/LostInTranslation2
...
Introduction of a system to feed displays with the correct charsets. Example in language_de.h
2015-01-30 18:35:02 -08:00
AnHardt
76bf93efcb
Revert "get STR_THERMOMETER from ultralcd_implementation_hitachi_HD44780.h"
...
This reverts commit 4d5b0e2037
2015-01-30 22:42:44 +01:00
AnHardt
4d5b0e2037
get STR_THERMOMETER from ultralcd_implementation_hitachi_HD44780.h
2015-01-30 22:20:10 +01:00
Christian Lefrançois
33408a4dfc
Update ultralcd.cpp
...
Fix number of nozzle displayed in temperature menu.
2015-01-30 11:16:13 -05:00
AnHardt
6e6e3cf443
merged https://github.com/MarlinFirmware/Marlin.git
2015-01-30 11:05:29 +01:00
AnHardt
b3ca430a20
Inducted the defined placeholders in the translation table.
2015-01-30 10:35:14 +01:00
AnHardt
e045034c3f
Included Configuration.h to read the defined charsets.
...
Defined the charsets plus a default.
2015-01-30 10:31:58 +01:00
AnHardt
27c638803e
Defined three charsets.
2015-01-30 10:28:22 +01:00
Scott Lahteine
b033783e0f
Merge pull request #1438 from thinkyhead/cleanup_recent_additions
...
Clean up some formatting
2015-01-29 19:10:49 -08:00
Scott Lahteine
073c59c50a
Clean up some formatting
...
- Also partial cleanup of Marlin_main.cpp with a smidgen of Doxygen.
2015-01-29 18:52:21 -08:00
AnHardt
9a4d4b3a2f
translated Deltamenu
2015-01-29 13:19:32 +01:00
AnHardt
8aa6487b4b
MSG_ENDSTOP_ABORT = 'Endstop abort' > 'Endstop Abbr. Ein'
2015-01-29 13:12:55 +01:00
AnHardt
666ad7106b
Translated redundand: define MSG_INIT_SDCARD and MSG_CNG_SDCARD
2015-01-29 13:09:12 +01:00
AnHardt
e5c45fbe8c
Infoscreen messages end with a '.' if not to long.
...
MSG_NO_MOVE = 'Kein Zug.' > 'Motoren Eingesch.' hat mich grau Haare gekostet.
Die englisch Meldung will sagen - Du kannst jetz am Extruder arbeiten, die
Achsen sind bockiert, die Motoren sperren die Achsen weil sie unter Strom
stehen, weil sie eingeschaltet sind.
2015-01-29 13:02:21 +01:00
AnHardt
1e22137e27
MSG_STOP_PRINT = 'Druck stoppen' > 'SD-Druck Abbruch'
...
to work out that this can't be resumed.
2015-01-29 12:41:46 +01:00
AnHardt
05d2ebd118
MSG_WATCH > 'Beobachten' > 'Info'
2015-01-29 12:29:31 +01:00
AnHardt
06cba91c39
eye candy 2
2015-01-29 12:26:21 +01:00
AnHardt
9352c9547f
MSG_SPEED = 'Geschw' > 'Geschw.'
2015-01-29 12:13:44 +01:00
AnHardt
0dfb0162f3
eye candy.
2015-01-29 12:07:01 +01:00
AnHardt
7222b27501
MSG_MOVE_AXIS = 'Achsen bewegen' > 'Bewegen'. Is Extruder an axis?
2015-01-29 12:02:58 +01:00
AnHardt
a6f808c9b1
remove unused #define MSG_RETRACT
2015-01-29 11:58:50 +01:00
AnHardt
152fa579f5
MSG_SWITCH_PS_OFF = 'Switch Power Off' -> 'Netzteil Aus'
2015-01-29 11:55:36 +01:00
AnHardt
7a32b742f3
MSG_SWITCH_PS_ON = 'Switch Power On' ->'Netzteil Ein'
2015-01-29 11:50:51 +01:00
AnHardt
4e176d2ce8
MSG_SET_ORIGIN = 'Setze Nullpunkt' ->'Setze Null hier'
2015-01-29 11:45:18 +01:00
AnHardt
1f8c8ad3ed
MSG_SET_HOME_OFFSETS = 'Set home offsets' ->'Setze Home hier'
2015-01-29 11:39:35 +01:00
AnHardt
0e8836ce5e
MSG_AUTO_HOME = 'Auto Nullpunkt' ->'Home'
2015-01-29 11:36:07 +01:00
AnHardt
56d3e6615d
MSG_DISABLE_STEPPERS = 'Stepper abschalt.' -> 'Motoren Aus'#
2015-01-29 11:19:10 +01:00
