Commit Graph

15721 Commits

Author SHA1 Message Date
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
993bcd370f Merge pull request #1373 from MarlinFirmware/revert-1350-Development
Revert "Reduce PROGMEM warnings"
2015-01-16 16:48:41 +01:00
daid
53f971095d Revert "Reduce PROGMEM warnings" 2015-01-16 16:48:22 +01:00
Bo Herrmannsen
5c7e38478b Merge pull request #1369 from PxT/patch-1
Update printrboard pin assignments
2015-01-16 15:35:42 +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
Bo Herrmannsen
88fe6777bf Update README.md 2015-01-16 04:29:12 +01:00
galexander1
1a2f796dc7 Merge pull request #1368 from MarlinFirmware/revert-1357-SDlib
Revert "Move Sd library out into library"
2015-01-15 18:52:44 -05: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
Bo Herrmannsen
2d398393bd Merge pull request #1359 from PxT/patch-2
Update GCodes.md
2015-01-15 10:54:44 +01:00
PxT
9fd4292923 Fixes #1361 2015-01-13 10:59:50 -08:00
PxT
d4c8cfe1f2 Update GCodes.md
Removed remaining angle brackets which are not displayed properly in Github-flavored Markdown.
2015-01-13 09:23:13 -08:00
odewdney
cf50c0eff8 Arduino.h case sensitive include 2015-01-13 14:30:28 +00:00
odewdney
abdb974d7f Changed dir sep from windows to unix 2015-01-13 14:22:57 +00:00
odewdney
db3b4d0c98 Add library to build 2015-01-13 14:19:20 +00: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
Bo Herrmannsen
b6623a0d49 Merge pull request #1351 from PxT/patch-1
Update GCodes.md
2015-01-13 11:26:24 +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
PxT
848475a5b0 Update GCodes.md
Sort Gcodes numerically, other minor formatting changes
2015-01-12 13:28:31 -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
Bo Herrmannsen
46843bd927 adding back notes on servo power 2015-01-11 14:18:38 +01:00
Bo Herrmannsen
d9cd8e9e69 starting to add back note on ramps servo power 2015-01-11 14:16:33 +01: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
Bo Herrmannsen
1d4af46496 Merge pull request #1348 from stv0g/LogoLCD
Adding new Marlin to splash screen
2015-01-10 16:08:03 +01: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
Steffen Vogel
d74394369b Merge pull request #1343 from thinkyhead/dogm_progress_bar
DOGLCD and LCD_PROGRESS_BAR to coexist
2015-01-10 11:37:15 +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
Steffen Vogel
6e8e9bb41e added link to IRC web chat, archive and mailing list 2015-01-09 22:28:47 +01:00
Bo Herrmannsen
5b4daf2669 removed hangout... only one asked for it 2015-01-09 22:08:36 +01: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