zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
2193 commits 1 branch 0 tags 156 MiB
Commit graph

1749 commits

Author SHA1 Message Date
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
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
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 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
Scott Lahteine 1258980832 Merge pull request #1429 from bq/Development 
Add bq Witbox 3D printer
 2015-01-29 01:14:18 -08:00
Victor Andueza 766762a4dc Change url link 2015-01-29 09:28:50 +01:00
Scott Lahteine 7df9ca051c Merge pull request #1428 from thinkyhead/issue_1388_eeprom 
Make EEPROM storage consistent
 2015-01-28 22:58:04 -08:00
Scott Lahteine fe3810f073 yeah, what he said 2015-01-28 22:27:15 -08:00
Scott Lahteine 6137bbd484 use eeprom read correctly 2015-01-28 22:10:31 -08:00
Scott Lahteine 9bc9051405 Flag EEPROM write errors on serial output 
- Also adds a language string for the error.
- Also adds SERIAL_EOL as an alias for SERIAL_ECHOLN(“”)
 2015-01-28 21:19:51 -08:00
Scott Lahteine ff99ca3040 Fix alignment of Restore following PIDTEMP 
Should be reading 4 x 4 PID values instead of 4 x 3
 2015-01-28 20:48:32 -08:00
Philip Schell 6c285930cb Fixing wrong pin to heater extruder 2 <-> 3 
Extruder 2 and 3 was swapped
 2015-01-28 23:57:22 +01:00
Victor Andueza 0d4ce27b79 Add pins_WITBOX file 2015-01-28 17:26:50 +01:00
Victor Andueza 13118cde33 Add bq Witbox 3D printer 2015-01-28 16:52:36 +01:00
Scott Lahteine 093fedfde8 Make EEPROM storage consistent 
Update ConfigurationStore to always write dummy values for disabled
options, including FWRETRACT, DELTA, and SCARA. Update the EEPROM
version to “V15.” Also fixes a buffer overrun with axis_scaling in
Config_ResetDefault.
 2015-01-28 01:08:48 -08:00
Scott Lahteine 34377ee512 Merge pull request #1427 from thinkyhead/fewer_preheat_strings 
Remove language strings that only add a number
 2015-01-27 22:10:08 -08:00
Scott Lahteine 7378a7fef4 Merge pull request #1408 from thinkyhead/cleanup_servo 
Formatting cleanup of quiet sources
 2015-01-27 22:09:04 -08:00
Scott Lahteine 5fbef6bed2 Merge pull request #1409 from thinkyhead/rename_lastnr 
Rename lastnr to autostart_index and...
 2015-01-27 22:07:23 -08:00
Scott Lahteine 53eea611b8 Fix MSG_NOZZLE 2015-01-27 22:00:32 -08:00
Scott Lahteine d7211a5324 Changes for Portuguese too 2015-01-27 21:53:08 -08:00
Scott Lahteine 0a21727c0a Portuguese (pt) and Brazilian Portuguese (pt-br) 2015-01-27 21:45:21 -08:00
Scott Lahteine c90f2e77d8 Remove language strings that only add a number 
This won’t reduce the string storage in the end, but it makes the
language files smaller. Also removed remaining unused strings.
 2015-01-27 21:36:58 -08:00
Scott Lahteine 2ce4a102ee Add support for Megatronics 3 a la #1426 2015-01-27 15:54:46 -08:00
Scott Lahteine ae4b348d77 Make sure _Ex_PINS is defined 
Also fix analogInputToDigitalPin so it uses proper C hex notation
 2015-01-27 15:36:47 -08:00
Scott Lahteine 80be6f3f91 tweak tweak 2015-01-27 15:36:47 -08:00
Scott Lahteine ebe78cb36f tweak 2015-01-27 15:36:47 -08:00
Scott Lahteine 82474fef8a Max endstop pins disabled by configuration 
There’s no need to ask users to uncomment Max Endstop pins when they
have them. These will be set to -1 later if the endstop option is
disabled.
 2015-01-27 15:33:21 -08:00
Scott Lahteine 8045e4d60d Add support for 4th extruder 
#1405 includes some changes to pins.h for a 4th extruder. This commit
applies those changes. It also deals with a possible problem with
SENSITIVE_PINS.
 2015-01-27 15:33:21 -08:00
Scott Lahteine df4f3e7712 cleanup 2015-01-27 15:32:34 -08:00
Scott Lahteine b6ecbd8cc4 cleanup 2015-01-27 15:32:34 -08:00
Scott Lahteine 4e573134de Cleanup heading 2015-01-27 15:32:34 -08:00
Scott Lahteine 574a5ab72a Split up pins to make it more manageable 
Hopefully this is helpful to organization and future expansion….
 2015-01-27 15:32:34 -08:00
clefranc d55c62bf9f Update ConfigurationStore.cpp 
Moved #endif to allow filament settings to print.
 2015-01-27 13:28:37 -05:00
clefranc e779641c73 Update ConfigurationStore.cpp 
Added PIDTEMP dummy write to align EEPROM read/write operation.
 2015-01-27 13:25:47 -05:00
Scott Lahteine baac6e242d Merge pull request #1419 from AnHardt/bootsplash 
repair Bootsplash
 2015-01-27 00:30:29 -08:00
AnHardt 75cf302da3 example configurations changed to meet Configuration.h 2015-01-27 00:01:33 +01:00
Philip Schell 61fd45a0c2 Add 4th extruder 2015-01-26 21:22:00 +01:00
Philip Schell 2650be4921 Add 4th extruder 2015-01-26 21:21:31 +01:00
Philip Schell a9763d894e Add 4th extruder 2015-01-26 21:20:56 +01:00
Philip Schell 4949088302 Add 4th extruder 2015-01-26 21:20:04 +01:00
Philip Schell fc5204bd42 Add 4th extruder 2015-01-26 21:17:35 +01:00
Philip Schell 9834818ef7 Add 4th extruder 2015-01-26 21:16:23 +01:00
Philip Schell 8696963154 Add 4th extruder 2015-01-26 21:15:24 +01:00
Philip Schell ee8a7419f4 Add 4th extruder 2015-01-26 21:14:18 +01:00
Philip Schell e18403235d Add 4th extruder 2015-01-26 21:12:55 +01:00
Philip Schell 7baee555f4 Add 4th extruder 2015-01-26 21:11:49 +01:00
Philip Schell cebc7daf2a Add 4th extruder 2015-01-26 21:10:42 +01:00
Philip Schell ef4c7abb21 Update language_es.h 
Add 4th extruder
 2015-01-26 21:09:24 +01:00
Philip Schell 22e591518a Update language_de.h 
Add 4th extruder
 2015-01-26 21:08:13 +01:00
Philip Schell a20c35bb38 Update language_ca.h 
Add 4th extruder
 2015-01-26 21:04:31 +01:00
Jérémie FRANCOIS dd301be52d Added suport for multiline G-code commands in the LCD menus 2015-01-26 18:50:29 +01:00
AnHardt aa48056c03 Made centering of bootlogo work and removed contraproductiv setScale2x2() in dogm_lcd_implementation.h 2015-01-26 17:26:22 +01:00
AnHardt 0d219b3e14 Make centering of STRING_SPLASH work 2015-01-26 16:00:10 +01:00
AnHardt 59315330dd Remove definition of VERSION_STRING and replace where usend with STRING_VERSION 2015-01-26 15:52:01 +01:00
AnHardt 8c792c7b22 Make STRING_VERSION and VERSION_STRING the same 2015-01-26 15:40:44 +01:00
Scott Lahteine 865ca0ef04 Merge pull request #1405 from MagoKimbra/4th-extruders 
All the additions look proper. I can't think of any other extruder-count-related items that you might have missed. So, with some optimism, I will merge this for testing.
 2015-01-25 19:30:51 -08:00
MagoKimbra 3021f7f743 Fix PID_dT 
Add PID_dT in temeprature.cpp
 2015-01-25 17:56:14 +01:00
Scott Lahteine a7b02975b7 No TEMP1 or TEMP2 pins for TEENSYLU || PRINTRBOARD 
Pins 2 and 3 are probably general-use pins, since the filament sensor
uses pin 2.
 2015-01-24 05:10:48 -08:00
Scott Lahteine 6723388f7f Proposed fix to #1379. Printrboard I2C LCD support 2015-01-24 05:01:02 -08:00
Scott Lahteine 03c9cb60e8 Rename lastnr to autostart_index and... 
Replace instances of the number 13 with FILENAME_LENGTH where
appropriate.
 2015-01-24 04:57:44 -08:00
MagoKimbra ef5959a705 Fix Temperature 
Githun insert this line when i merge with actual Branch development...
 2015-01-24 13:49:29 +01:00
MagoKimbra 3d4ee6c868 Merge branch '4th-extruders' of https://github.com/MagoKimbra/Marlin into 4th-extruders 
Conflicts:
	Marlin/temperature.cpp
 2015-01-24 13:41:15 +01:00
MagoKimbra 986e723eeb Add 4th extruder 2015-01-24 13:37:58 +01:00
Scott Lahteine f16bdd2ff2 Borrow from Ultimaker to fix MAX6675 SPI conflict 
Changes to temperature.cpp from Ultimaker fork, intended to address
#1226 and #1227
 2015-01-24 03:49:15 -08:00
Scott Lahteine 06c3b37933 Formatting cleanup of quiet sources 
Formatting for code-folding plus minor style changes to less active
code.
 2015-01-23 22:26:52 -08:00
Scott Lahteine 23fcd1ecb2 Merge pull request #1407 from thinkyhead/cleanup_marlinserial 
Formatting cleanup of quiet sources
 2015-01-23 21:33:43 -08:00
Scott Lahteine fd78902194 Formatting cleanup of quiet sources 2015-01-23 21:11:50 -08:00
Scott Lahteine 5c1814383a Merge pull request #1390 from floyd871/Development 
Show Custom M_Code for Z-Probe Offset when entering M503
 2015-01-23 20:08:23 -08:00
MagoKimbra 0ebf896070 Add 4th extruder 2015-01-23 23:13:06 +01:00
Michael Neumann a9d7ab9530 Update ConfigurationStore.cpp 
Done
 2015-01-23 21:05:27 +01:00
Scott Lahteine 3a9a3e5ed8 Fix Issue #1356 – remove EXTRUDER1_Z_OFFSET 
This define is not used.
 2015-01-23 10:51:06 -08:00
Scott Lahteine 54d5b52a2e Merge pull request #1399 from beanz/use-bed-defines-not-extruder-ones 
Code wont compile with extruder but without bed runaway protection defined.
 2015-01-23 08:36:25 -08:00
Mark Hindess 0ce252ba7a This ifdef is for bed code so should use bed constants for testing. 
Without this fix, the code wont compile with extruder but without bed
runaway protection defined.
 2015-01-23 16:30:13 +00:00
Scott Lahteine 9040446780 Merge pull request #1395 from AnHardt/iss1394 
removed function step_wait() from stepper.cpp
 2015-01-23 06:58:10 -08:00
Scott Lahteine 25f79c5010 Merge pull request #1391 from CONSULitAS/Development-newBoard_K8200 
Add: Board for Vellemann K8200 (derived from 3Drag)
 2015-01-23 06:08:38 -08:00
Scott Lahteine 9ce75ab7de Merge pull request #1386 from roglio/Development 
Fixing a build error for melzi and gfx display
 2015-01-23 06:00:24 -08:00
Scott Lahteine 15a00a5a7c Add 1µs delay in other appropriate spots 2015-01-23 03:24:45 -08:00
AnHardt 23cb899c5a removed function step_wait() from stepper.cpp 
removed function step_wait() from stepper.cpp because its used nowhere.
 2015-01-21 16:30:45 +01:00
Scott Lahteine d9d4a78e0f Add proper delay in stepper.cpp 
Issue #1385 describes a delay that the compiler is optimizing out and
this solution.
 2015-01-21 01:51:29 -08:00
CONSULitAS d1322dafc9 Add: Example Configuration for Vellemann K8200 - based on new BOARD_K8200 #1391 
# Add: Example Configuration for Vellemann K8200 - based on new
BOARD_K8200 #1391

* K8200: new folder in example_configurations for Vellemann K8200 (3Drag
clone - should work with 3Drag http://reprap.org/wiki/3drag, too. Please
report)
* K8200/Configuration.h/Configuration_adv.h: updated manually with
parameters form genuine Vellemann Firmware "firmware_k8200_marlinv2"
based on the recent development branch

I tested the changes on my K8200 with 20x4-LCD and Arduino 1.0.5 for
Windows (SD library added to IDE manually) - everything works well
 2015-01-20 23:13:44 +01:00
CONSULitAS 3b50a5e2e6 Add: Board for Vellemann K8200 (derived from 3Drag) 
## Add: Board for Vellemann K8200 (derived from 3Drag)

* Boards.h: updated comment for board 3Drag - K8200 removed
* Boards.h: added `BOARD_K8200` with ID 78

* language.h.: machine name and firmware URL for new board

* pins.h: added `K8200` to any `#if` with `3Drag` and corresponding
comments
 2015-01-20 20:46:20 +01:00
Michael Neumann 2d454da3af Update ConfigurationStore.cpp 
Show Custom M Code when entering M503
 2015-01-20 16:21:44 +01:00
Scott Lahteine 4f35de991a Merge pull request #1383 from CONSULitAS/Development 
Update Boards.h for Vellemann K8200 - comment only
 2015-01-19 15:59:38 -08:00
roglio 22571ca13d Revert "Configuration for Aurora Z605" 
This reverts commit 935ee968a7.
 2015-01-19 15:02:11 +01:00
roglio 935ee968a7 Configuration for Aurora Z605 
Still not fine tuned but working.
 2015-01-19 11:18:52 +01:00
roglio ccdbeda526 Fixing a build error for melzi and gfx display 
When a melzi board and a full gfx are both selected, the build fails
blaming for some missing defines.

This is a fix for the issue: now my configuration works.
 2015-01-19 10:43:26 +01:00
CONSULitAS e13f159343 Update Boards.h for Vellemann K8200 - comment only 
## Update Boards.h for Vellemann K8200 - comment only

* Boards.h: updated comment for board 3Drag - K8200 uses same board
 2015-01-19 00:53:17 +01:00
CONSULitAS 51c7f2fd5a Revert "## Add: Example Configuration for Vellemann K8200" 
This reverts commit 5333590ac2.
 2015-01-19 00:37:57 +01:00
CONSULitAS 5333590ac2 ## Add: Example Configuration for Vellemann K8200 
* K8200: new folder in example_configurations for Vellemann K8200 (3Drag
clone - should work with 3Drag too, please report)

* K8200/language.h: updated machine name and URL for K8200

* K8200/Configuration.h/Configuration_adv.h: updated manually with
parameters
form genuine Vellemann Firmware "firmware_k8200_marlinv2" based on the
recent development branch

* K8200/files by Vellemann: added folder with original files from
Vellemann homepage, since there is no GitHub fork you could link to by
them

I tested the changes on my K8200 with 20x4-LCD and Arduino 1.0.5 for
Windows - everything works well
 2015-01-19 00:28:55 +01:00
Denis Chertykov ba3ac40b9d Remove hardcoded programmer option (-cwiring). Use variable AVRDUDE_PROGRAMMER. 
Change default value of AVRDUDE_PROGRAMMER to 'wiring'.
 2015-01-18 20:18:43 +03:00
daid 53f971095d Revert "Reduce PROGMEM warnings" 2015-01-16 16:48:22 +01:00
PxT 67b597ad46 Update printrboard pin assignments 
Backported from Printrbot branch, allows the fan to work correctly.
 2015-01-15 19:48:40 -08:00
galexander1 d4880a9e60 Revert "Move Sd library out into library" 2015-01-15 18:52:10 -05:00
Bo Herrmannsen ccdb086fc8 Merge pull request #1363 from PxT/patch-1 
Fixes #1361
 2015-01-15 10:57:44 +01:00
Bo Herrmannsen 5151db5c2f Merge pull request #1349 from msutas/patch-2 
Improvement - G29 Option for Not Retracting Servo
 2015-01-15 10:56:31 +01:00
Bo Herrmannsen 1746b2582b Merge pull request #1332 from Sniffle/Development 
Rambo FAN_PIN documentation and servo support
 2015-01-15 10:56:17 +01:00
Bo Herrmannsen 4b51b5a46d Merge pull request #1357 from odewdney/SDlib 
Move Sd library out into library
 2015-01-15 10:56:07 +01:00
Bo Herrmannsen f2cb4a3655 Merge pull request #1353 from thawkins/Development 
fix avrdude upload in makefile
 2015-01-15 10:55:33 +01:00
PxT 9fd4292923 Fixes #1361 2015-01-13 10:59:50 -08:00
odewdney f84ff4ba7d Move SD Fat library out of main src 2015-01-13 13:31:55 +00:00
Bo Herrmannsen ab074dac17 Merge pull request #1344 from grob6000/independent_pid 
Independent PID parameters for each extruder
 2015-01-13 12:10:37 +01:00
Bo Herrmannsen d4a665694a Merge pull request #1350 from odewdney/Development 
Reduce PROGMEM warnings
 2015-01-13 11:26:50 +01:00
odewdney 9d9c859ac1 First move of SdFat library 2015-01-13 08:04:32 +00:00
Tim Hawkins 5045d17a39 fix avrdude upload in makefile 2015-01-13 13:01:43 +08:00
msutas 3a5a6f42fb Corrected the ABL grid option 
G29 E was not retracting the probe on the last probe point when used with ABL grid. Corrected.
 2015-01-12 11:07:46 +02:00
odewdney cd55a93a13 re-add blank line 2015-01-11 19:22:35 +00:00
odewdney 23bfe30036 moved include themister to temperature.c 2015-01-11 18:18:32 +00:00
odewdney 538859669d Removing compiler warnings for progmem 2015-01-11 18:14:21 +00:00
grob6000 bf2c923db5 Make multiple PID parameters a config option 
* Adds config parameter `PID_PARAMS_PER_EXTRUDER` - allows single PID
parameters to be used where this would be preferable (e.g. dual
identical extruders)
* When disabled, will use `float Kp, Ki, Kd, Kc;` as before.
Preprocessor macros used to switch between.
* ultralcd.cpp defines extra menus for extra parameters only where
required
* M301 reports `e:xx` only if independent pid parameters enabled
* EEPROM structure still leaves space for 3 extruders worth, when undef
will save single parameter to all extruder positions, but only read the
first
* Switching off saves approx 330 B with no LCD enabled, 2634B with LCD
(RRD) enabled: this is significant.
* LCD modifications should be tested.
 2015-01-11 13:50:17 +11:00
grob6000 0877aa0fe0 Merge remote-tracking branch 'upstream/Development' into independent_pid 2015-01-11 11:32:58 +11:00
msutas e0beb98fd3 Improvement - G29 Option for Not Retracting Servo 
This change introduces an improvement to G29 command on Marlin.

Auto bed leveling operation's reliability is based on the repeatability of the Z-probe switch and the servo. This change introduces an option to G29 command. When the G29 command is sent with an "e" option, during auto bed levelling the servo is not retracted between probes which decreases the bias on auto bed levelling resulting from servo.

G29 command does the auto bed probing as it is.

G29 E command engages the servo on first probing point, probes all points and retracts the servo after probing the last point.

Please comment your opinions, test on your printer and check the code on a programmer's perspective. (I am not a good programmer.)
 2015-01-10 17:25:39 +02:00
grob6000 7d32c7f36d Multiple PID parameter edit for ultralcd 
* Depending on extruder count, will add menu items for ultralcd to edit
individual PID parameters for each extruder
* Added menu items to each language_xx.h
* Builds OK, but recommend testing with typical LCD
 2015-01-11 01:14:02 +11:00
Steffen Vogel 69dc411ae0 Merge branch 'Development' of github.com:MarlinFirmware/Marlin into LogoLCD 
Conflicts:
	Marlin/dogm_lcd_implementation.h
 2015-01-10 14:57:11 +01:00
grob6000 3e2af67ce3 Fix R-H compatibility 
* R-H reads incorrect M301 line from EEPROM output if more than one is
present. Reverted to original output format, using only E0 value.
 2015-01-10 16:44:28 +11:00
grob6000 37c7e8300f Independent PID parameters for each extruder 
* Variables Kp, Ki, Kd, Kc now arrays of size EXTRUDERS
* M301 gains (optional, default=0) E parameter to define which
extruder's settings to modify. Tested, works with Repetier Host's EEPROM
config window, albeit only reads/updates settings for E0.
* All Kp, Ki, Kd, Kc parameters saved in EEPROM (version now v14), up to
3 extruders supported (same as Marlin in general)
 2015-01-10 16:35:12 +11:00
Scott Lahteine 326b925557 DOGLCD and LCD_PROGRESS_BAR to coexist 
Small changes (and formatting to confuse the diff’er) which first
allows DOGLCD and LCD_PROGRESS_BAR to be enabled in tandem, then a
#warning (rather than error) that the extra progress bar / message
options don’t apply to graphical displays at this time. This leaves
open perhaps combining the progress bar and message area in some future
(or forked custom) graphical LCD display arrangement (at which time the
relevant variables may be moved into ultralcd.cpp with externs in
ultralcd.h). I also added a conditional error that the progress bar and
the filament display may not work well together.
 2015-01-09 18:16:56 -08:00
Erik van der Zalm 1aade4a8e2 Merge branch 'Development' of https://github.com/MarlinFirmware/Marlin into Development 2015-01-09 21:33:29 +01:00
Erik van der Zalm 8a2e84e3f1 Possible fix for FWRETRACT with 0 zlift. 2015-01-09 21:33:02 +01:00
Steffen Vogel 905aab3b85 added missing #endif 2015-01-09 20:23:38 +01:00
Steffen Vogel b9cf1465a7 updated LCD bouts with new strings and bitmaps 
new version is pretty generic and should work in most scenarios
 2015-01-09 18:49:59 +01:00
Steffen Vogel c7632be5cc added high and low resolutions version of splash screen logo (saving code size) 2015-01-09 18:49:24 +01:00
Steffen Vogel 8f0dba7cbf adding string for bouts splash string to config 2015-01-09 18:48:30 +01:00