SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
2537 commits 1 branch 0 tags 119 MiB
Commit graph

2039 commits

Author SHA1 Message Date
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
Bo Herrmannsen
d94109e886 updated logo post and ver info 2015-01-09 15:51:15 +01:00
Bo Herrmannsen
cd33b5b062 changed logo and ver info 
logo is now 110 pixels wide and starts 9 pixels in from top left corner and also 9 pixels down from same corner... this will give a 9 pixel border all way round

ver info is placed centered and there is a 9 pixel from bottom of display to ver info
 2015-01-09 15:44:47 +01:00
Bo Herrmannsen
9b6c1cfda6 removed unneeded lines in welcome msg 2015-01-09 15:20:41 +01:00
Bo Herrmannsen
ffa09f86f4 moved ver info 5 spaces to the right 2015-01-09 13:31:23 +01:00
Alex Borro
2bbb68be8a Fix calculation of BAL grid fitting into the bed 
The previous calc was wrong. Between N points there are only N-1 gaps,
not N.

So changing AUTO_BED_LEVELING_GRID_POINTS to
(AUTO_BED_LEVELING_GRID_POINTS-1)
 2015-01-09 10:17:33 -02:00
Bo Herrmannsen
590caafa2d changed ver info 2015-01-09 13:17:08 +01:00
Bo Herrmannsen
3bb9b31515 changed boot logo a bit to test if fat wall goes away 2015-01-09 12:51:21 +01:00
Steffen Vogel
da192c521f Merge pull request #1333 from andrewsil1/development 
Fix grammar/typos in new Configuration.h option
 2015-01-08 00:34:01 +01:00
Erik van der Zalm
3a30d45c2e Revert "issue 968 for dev branch" 2015-01-07 23:40:17 +01:00
andrewsil1
269ec9f87f Fix grammar/typos in new Configuration.h option 
(For the SLOW_PWM_HEATERS option)
 2015-01-07 12:41:09 -08:00
Todd Swindoll
506353892e Rambo Pin documentation and servo support 
Updated pins reference and servo support.

cross referenced between Rambo 1.1, 1.2, and 1.3
 2015-01-07 11:02:05 -06:00
Steffen Vogel
8d7bfd03d8 moved/renamed documentation stuff to top-level directory 2015-01-07 15:33:50 +01:00
Bo Herrmannsen
3c9e6b7b62 added link for pic to hex converter 2015-01-07 14:28:51 +01:00
Bo Herrmannsen
0e760274bd changed reprap logo to marlin logo 2015-01-07 14:27:51 +01:00
Bo Herrmannsen
b291a422e9 added square png version of logo 
406*406 pixels
 2015-01-07 13:00:37 +01:00
Luis E Alvarado
7ae548cf34 Update Marlin Firmware URL 2015-01-07 05:26:47 -06:00
Erik van der Zalm
8f9067faa6 Added marlin logos. (Designed by Ahmet Cem TURAN) 2015-01-07 12:21:16 +01:00
Bo Herrmannsen
addf52fd4a Merge pull request #1328 from DinoMesina/development 
Some corrections and new features
 2015-01-06 23:52:32 +01:00
Dino Del Favero
5cfe13f240 Correct some mistakes 2015-01-06 21:55:08 +01:00
Dino Del Favero
c7e2d73039 Merge branch 'development' 
ok
 2015-01-06 20:18:03 +01:00
Alex Borro
422a958a34 Fix CoreXY speed calculation 
For cartesian bots, the X_AXIS is the real X movement and same for
Y_AXIS.
But for corexy bots, that is not true. The "X_AXIS" and "Y_AXIS" motors
(that should be named to A_AXIS
and B_AXIS) cannot be used for X and Y length, because A=X+Y and B=X-Y.
So we need to create other 2 "AXIS", named X_HEAD and Y_HEAD, meaning
the real displacement of the Head.
Having the real displacement of the head, we can calculate the total
movement length and apply the desired speed.
 2015-01-06 16:39:48 -02:00
Dino Del Favero
038fccd7a1 I have added some code in the "temperature.cpp" for have the possibility of control the time of the states with the heater drived by relays, with this feature now it is possible use PID function in conjunction with relay to control the temperature. I have made some tests and the temperature stay always in the range of +-1°C from the setted temp. 
There is the possibility of turn on this features adding "#define SLOW_PWM_HEATERS" in Configuration.h
 2015-01-06 18:32:17 +01:00
DinoMesina
6730335657 Update Configuration.h 2015-01-06 18:06:02 +01:00
Bo Herrmannsen
4ffecdbf7d Merge pull request #1313 from wgm4321/Development 
Re-enable filament menu with recalc fix when enabling/disabling mm3
 2015-01-06 13:47:49 +01:00
Steffen Vogel
672f764b4d replaced ASCII GPL v3 license by markdown version 
moved new COPYING file to top-level directory to make it more visible and remove clutter from Marlin subduer
 2015-01-06 11:49:05 +01:00
Steffen Vogel
f25e793cff rename stepper lookup table scipt to be consistent with termistor lookup table script 2015-01-06 10:30:20 +01:00
Steffen Vogel
df17a6a1b4 fix #1305 by proposed workaround (thanks gaby64) 2015-01-06 10:29:26 +01:00
Steffen Vogel
f7e65935fb make use of power operator 2015-01-06 10:28:43 +01:00
Steffen Vogel
4e02aff9b5 automatically determine min/max temp for terminator 2015-01-06 10:28:19 +01:00
Steffen Vogel
81363bc441 more cleanups 2015-01-06 10:27:40 +01:00
Steffen Vogel
95f4a55820 refactored termistor table calculation to be in line with wikipedia's article about Steinhart-Hart coefficients 2015-01-06 08:24:59 +01:00
Steffen Vogel
21205cc3d8 more cleanups in the termistorTable generation script 2015-01-06 08:23:51 +01:00
Steffen Vogel
fb0996b5db improved output aligment and precision 2015-01-06 08:20:52 +01:00
Steffen Vogel
538231edfd cosmetic whitespace cleanup and comments added/updated 2015-01-06 08:20:20 +01:00
wgm4321
067b509479 Re-enable filament menu with recalc fix when enabling/disabling mm3 2015-01-05 22:29:29 -05:00
wgm4321
a19f2f8ae7 Disable volumetric menu item due to missing recalc of of multipliers when enabled/disabled 2015-01-04 22:15:16 -05:00
wgm4321
f24dda9700 Revert "Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3" 
This reverts commit dd7e4ee97f.
 2015-01-04 22:08:41 -05:00
wgm4321
ec4681ab6b Revert "Add "Detailed Z Probe" menu item with ABL is defined." 
This reverts commit 2b9722f387.
 2015-01-04 21:53:37 -05:00
wgm4321
dd7e4ee97f Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3 2015-01-04 21:44:55 -05:00
wgm4321
2b9722f387 Add "Detailed Z Probe" menu item with ABL is defined. 2015-01-04 21:42:16 -05:00
Dan Royer
9472bbe51d issue 968 for dev branch 
try, try again.

If 'OK' is garbled on sending PC won't receive it.  Both machines will
wait on each other forever.  This resends OK if nothing is heard from PC
for a while to avoid this bad case.
 2015-01-04 12:17:46 -08:00
alexborro
d2b6e62996 Merge pull request #1309 from philfifi/fix_temp_runaway 
temp runaway: proper cast to prevent any overflow.
 2015-01-04 12:55:58 -02:00
Philippe L
30248214c7 temp runaway: proper cast to prevent any overflow. 2015-01-04 14:23:31 +01:00
Bo Herrmannsen
c5f138ea07 Merge pull request #1291 from alhirzel/Development 
Define analogInputToDigitalPin only if needed
 2015-01-04 12:53:41 +01:00
odewdney
652895d656 try different proproc for CI failure 2015-01-04 11:15:23 +00:00
Bo Herrmannsen
3d9f4ac757 Merge pull request #1303 from wgm4321/Development 
Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER ...
 2015-01-04 01:29:26 +01:00
wgm4321
04fb34c7ff Add English defines for filament menu to non-English to prevent compile errors until translated 2015-01-03 17:28:05 -05:00
wgm4321
f8aa5ff771 Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER defined 2015-01-03 17:10:13 -05:00
odewdney
39fae9e3a3 Fix progmem warning 
Borrow code from https://github.com/arduino/Arduino/issues/1793
 2015-01-03 21:30:16 +00:00
Alexander Hirzel
f36fd3ddec Merge branch 'Development' of https://github.com/ErikZalm/Marlin into Development 2015-01-02 12:39:39 -05:00
Scott Lahteine
b5e50cdd4e Move scripts and documentation to subfolders 2015-01-02 08:53:09 -08:00
Alexander Hirzel
eed451e034 rework analogInputToDigitalPin definition 2015-01-02 11:14:20 -05:00
Lane Roberts
1f520a5a8c Due to the fix for #1248, X and Y probe offsets must not be floats. 
The compiler does not support comparing float values: "error: floating constant in preprocessor expression"
The loss in X/Y precision shouldn't matter for Z probes, as most microswitches or inductive sensors are larger than 1mm square anyway.
 2015-01-02 11:12:16 -05:00
wgm4321
b32be2dc64 Fix syntax error caused by previous changes. 2015-01-02 11:12:16 -05:00
wgm4321
edac64e7d2 Add Filament menu and add Filament/Retract settings to config store. 2015-01-02 11:12:15 -05:00
Alexander Hirzel
ecda6cdc0a Fix typo, PID_BED_POWER -> MAX_BED_POWER 2015-01-02 11:12:15 -05:00
David Forrest
f3e503e725 temperature.cpp: Fix typo of PID_MAX to MAX_BED_POWER for the bed. 2015-01-02 11:12:15 -05:00
David Forrest
1d5d853c9a temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER. 2015-01-02 11:12:15 -05:00
Bo Herrmannsen
63da6900b0 Merge pull request #1282 from vandarin/Development 
Due to the fix for #1248, X and Y probe offsets must not be floats.
 2015-01-02 15:35:40 +01:00
Bo Herrmannsen
a18b625534 Merge pull request #1261 from wgm4321/Development 
Add Filament menu and add Filament/Retract settings to config store.
 2015-01-02 15:35:29 +01:00
Alexander Hirzel
ae12ad0d6c Fix typo, PID_BED_POWER -> MAX_BED_POWER 2015-01-02 01:38:03 -05:00
alexborro
80b17ab573 Merge pull request #1285 from drf5n/PID_CI_v2 
temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.
 2015-01-01 22:56:21 -02:00
David Forrest
625860f086 temperature.cpp: Fix typo of PID_MAX to MAX_BED_POWER for the bed. 2015-01-01 19:24:42 -05:00
David Forrest
6583bb781d temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER. 2015-01-01 19:11:42 -05:00
Lane Roberts
2701dd8a17 Due to the fix for #1248, X and Y probe offsets must not be floats. 
The compiler does not support comparing float values: "error: floating constant in preprocessor expression"
The loss in X/Y precision shouldn't matter for Z probes, as most microswitches or inductive sensors are larger than 1mm square anyway.
 2014-12-31 12:34:59 -06:00
Grogyan
6b82415c81 Update pins.h 
Somehow the pin definitions for the MAX6675 Slave Select/Chip Select got changed back to the hardware SPI SS/CS.  
Pin 49 cannot be used as that is used by the SD card socket to detect if an SD card is present.
Pin 53 is the Hardware SPI SS, which is dedicated, nicely, to the SD card SS and therefore cannot be used as the MAX6675 SS
Pin 66 is in Aux2 port adjacent to the Hardware SPI interface port on RAMPS 1.4, and is currently not used for anything.
 2014-12-31 13:04:16 +13:00
Bo Herrmannsen
692a01b1c7 Merge pull request #1277 from thinkyhead/fix_regressions 
Fix regressions affecting compilation
 2014-12-30 16:49:08 +01:00
Scott Lahteine
2ec2bf1564 Fix regressions affecting compilation 
This fixes two regressions, caused by #1167 and #1191 .
 2014-12-30 07:36:18 -08:00
Scott Lahteine
e7db8ee9e5 ftostr32np > ftostr32sp 
sp=space-padded, similar to: ns=no-sign
 2014-12-30 07:26:25 -08:00
Scott Lahteine
10e1b6ef8b Least stack-usage self-contained ftostr32np() 
This is the optimal code for a self-contained formatter, although the
original code is crafty in being smaller and simpler, and can be
evaluated as using the original output as a scratch pad for state,
making the final formatter more straightforward. While this code is
longer, all code-paths are minimal.
 2014-12-30 07:26:25 -08:00
Scott Lahteine
d1f21d1189 As it should be 2014-12-30 07:26:25 -08:00
Scott Lahteine
449dad71f2 Least stack-usage self-contained ftostr32np() 
This is the optimal code for a self-contained formatter, although the
original code is crafty in being smaller and simpler, and can be
evaluated as using the original output as a scratch pad for state,
making the final formatter more straightforward. While this code is
longer, all code-paths are minimal.
 2014-12-30 07:26:24 -08:00
Scott Lahteine
a2109cb492 Patch to make Z look more like X and Y on UltraLCD 2014-12-30 07:26:24 -08:00
Bernhard Kubicek
3d1da45f3e Update Marlin.h 2014-12-30 08:30:37 +01:00
bkubicek
d02daec08f fixed compilation 2014-12-30 08:04:06 +01:00
Caleb Anderson
991a74b75b Move delta calibration menu to sample delta configuration. 
Turn off by default.
 2014-12-29 18:03:56 -07:00
Bo Herrmannsen
67fd8f0727 Merge pull request #1267 from RobotCaleb/LanguageFix 
Language Fix - Using the new language implementation wasn't behaving as expected.
 2014-12-29 19:49:11 +01:00
Caleb Anderson
236db44669 Fix spacing 2014-12-29 10:44:55 -07:00
Caleb Anderson
e6774fb7d2 Using the new language implementation wasn't behaving as expected. 
No matter what LANGUAGE_CHOICE was set to it would always take the en branch.
I revamped it a bit to use a macro to create the language include file name. This required a slight tweak to the RU declaration since it's special-cased in a couple places in code.

This is an attempt to pull my changes from #1222 over.
 2014-12-29 10:43:19 -07:00
Caleb Anderson
cb047e9070 Actual menu change. Moved menu logic to not be shown unless not currently printing. (untested but straight-forward, printer in a bad state currently) 2014-12-29 10:19:25 -07:00
Caleb Anderson
5b336a4cdb Delta calibration menu based on http://minow.blogspot.com/index.html#4918805519571907051 
To test/enable, uncomment the #define DELTA_CALIBRATION_MENU in Configuration.h
 2014-12-29 10:13:00 -07:00
Bernhard Kubicek
10ad9f1062 Addes servo0 pin ultimaker 2014-12-29 17:27:14 +01:00
Bernhard Kubicek
f24c5d82e3 Update Marlin_main.cpp 
fixed minor typo
 2014-12-29 17:17:30 +01:00
Wurstnase
8a6f098cc6 Expand manage_inactivity #1264 
void manage_inactivity(bool ignore_stepper_queue=false)

standard is false so it is not necessary to change additional code. this
change should be better, hopefully nophead like this :)
 2014-12-29 17:07:22 +01:00
Wurstnase
d1995aec7a Rename ignore_blocks_queued 
more speaking name
 2014-12-29 16:47:08 +01:00
Wurstnase
4122de9d17 change filament issue 
make a more general solution
 2014-12-29 16:31:00 +01:00
wgm4321
d60efc3b5d Fix syntax error caused by previous changes. 2014-12-28 20:47:59 -05:00
wgm4321
cb12161191 Add Filament menu and add Filament/Retract settings to config store. 2014-12-28 20:43:14 -05:00
fmalpartida
ec33df0554 Merge branch 'SAV-MkI_merge' into Development 
Tested for SAV MKI and SAV 3D LCD on lewihe.
 2014-12-28 19:54:06 +01:00
Matthew Schick
0468f81950 Update for pull request #837 2014-12-28 11:22:44 -05:00
Matthew Schick
6e42c9e305 Add fwretract settings to M503 output 2014-12-28 11:22:44 -05:00
alexborro
3afe66bb0c Fix issues #1248, #1240 
- Fixed issue when BAL area probing is shorter than it should be for
grid probing
- Warning when BAL activated with Delta Kinematics
- Fix XY_TRAVEL_SPEED when homing Z axis
 2014-12-28 13:27:39 -02:00
Lukas Obermann
9eb6df17a7 Consider negative Z Offsets when auto bed leveling is active 2014-12-28 12:46:35 +01:00
Bo Herrmannsen
c9f60183a9 Merge pull request #1233 from NarimaanV/Development 
Fixed BABYSTEPPING feature
 2014-12-28 10:13:21 +01:00
Bo Herrmannsen
0d957872a0 Merge pull request #1234 from gregrebholz/issue_1069 
Fixes #1069.  Added "auto fan" checks to PID_autotune.
 2014-12-28 10:12:08 +01:00
Bo Herrmannsen
9c07d28bd6 Merge pull request #1249 from drf5n/PID_CI_v2 
temperature.cpp: Add Conditional Integration to prevent excessive integral windup
 2014-12-28 10:09:25 +01:00
Bo Herrmannsen
23e768dffa Merge pull request #1250 from chertykov/Development 
Move initialization of errormagic[] and echomagic[] to Marlin_main.cpp
 2014-12-28 10:09:08 +01:00
Scott Lahteine
2f467e2797 LCD Progress Bar 2014-12-27 22:26:14 -08:00
Denis Chertykov
050ca9ca13 Move initialization of errormagic[] and echomagic[] to Marlin_main.cpp 2014-12-28 09:09:42 +03:00
David Forrest
cf52c48d19 Configuration.m: Set PID_INTEGRAL_DRIVE_MAX from PID_MAX from BANG_MAX. 
Current defaults are all 255.  If it makes sense to reduce them, they should come down together, and
be in a  PID_INTEGRAL_DRIVE_MAX <= PID_MAX <- BANG_MAX relationship.
 2014-12-27 15:26:09 -05:00
David Forrest
984177c40c temperature.cpp:Add PID Conditional integration on heated bed. 2014-12-27 15:26:09 -05:00
David Forrest
c9b8435749 heater.c: Limit PID I term with conditional integration. 2014-12-27 15:26:09 -05:00
Greg Rebholz
7ecb7cbd46 Added "auto fan" checks to PID_autotune 2014-12-23 23:50:00 -05:00
NarimaanV
7667949aca Fixed BABYSTEPPING feature 
Moved PSTR() macro to correct place which was causing the " initializer fails to determine size of '__c' " when attempting to compile with BABYSTEPPING enabled.
 2014-12-23 12:49:54 -05:00
alexborro
d74aabf259 Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation" 2014-12-21 10:06:05 -02:00
Bo Herrmannsen
60628864ca Merge pull request #1167 from thinkyhead/sd_freemem 
Use SdFatUtil::FreeRam() for freeMemory() if there
 2014-12-20 18:31:21 +01:00
Bo Herrmannsen
889d7ba218 Merge pull request #1177 from martin-pr/probing_z_speed 
Split do_blocking_move() to XY and Z sections
 2014-12-20 18:30:35 +01:00
Bo Herrmannsen
5e7bd2dc87 Merge pull request #1200 from chertykov/Marlin_v1 
Fix syntax errors in #ifdef
 2014-12-20 18:29:39 +01:00
Denis Chertykov
b086394178 Fix syntax errors in #ifdef. 2014-12-20 19:33:43 +03:00
John Davis
39d28a9bbf Update qr_solve.h 
Changed level to compensation
 2014-12-19 17:53:55 -05:00
John Davis
6325968a39 Update qr_solve.cpp 
Changed leveling to compensation
 2014-12-19 17:52:13 -05:00
John Davis
e99f24ff2f Update planner.h 
Changed level and leveling to compensation.
 2014-12-19 17:51:14 -05:00
John Davis
ac204028e7 Update planner.cpp 
Changed level and leveling to compensation
 2014-12-19 17:49:22 -05:00
John Davis
4315c2547a Update Marlin_main.cpp 
Changed level and leveling to compensation (except with "verbose_level" and "lcd_reset_alert_level").
 2014-12-19 17:41:29 -05:00
John Davis
f21c65918f Update Servo.h 
Changed AUTO_BED_LEVELING to AUTO_BED_COMPENSATION
 2014-12-19 17:20:09 -05:00
John Davis
58c4473bea Update Servo.cpp 
Changed AUTO_BED_LEVELING to AUTO_BED_COMPENSATION
 2014-12-19 17:18:55 -05:00
John Davis
825c46024d Update vector_3.cpp 
Changed AUTO_BED_LEVEL to AUTO_BED_COMPENSATION
 2014-12-19 17:16:31 -05:00
John Davis
cfe80e1def Update vector_3.h 2014-12-19 17:14:35 -05:00
John Davis
7464d3c96a Update ConfigurationStore.cpp 
Changed AUTO_BED_LEVEL to AUTO_BED_COMPENSATION
 2014-12-19 17:08:43 -05:00
John Davis
81568c3c6d Update Configuration.h 
Changed Auto Bed Level to Auto Bed Compensation
 2014-12-19 17:06:56 -05:00
Bo Herrmannsen
03e489aaad Merge pull request #1197 from foosel/fix/issue_1147 
Fixes commands not being acknowledged in the same order they are received in
 2014-12-19 14:39:05 +01:00
Gina Häußge
acc0e75279 Fixes commands not being acknowledged in the same order they are received 
in

G0 to G3 were previously acknowledged in the get_command method, causing
them to be possibly acknowledged before commands coming after them that
were acknowledged in process_commands.

This patch fixes this, moving the acknowledgement of G0 to G3 to the
process_commands method as well. These commands are therefore no
longer acknowledged when the enter the cmd_buffer but instead only
acknowledged when the enter the plan_buffer.

Guaranteeing that commands are acknowledged in the same order in which
they were received by the firmware allows host software to be able to
track the life cycle of commands and such a better management of the
firmware's serial buffers as well as better internal command processing
and response parsing without having to depend on throwing an epic
amount of regular expressions against each line received back from the
firmware.

Fixes ErikZalm/Marlin#1147
 2014-12-19 14:20:36 +01:00
daid
17de96ace7 Merge branch 'Marlin_v1' into revert-1154-sd_sorting 
Conflicts:
	Marlin/cardreader.cpp
	Marlin/cardreader.h
 2014-12-18 23:13:50 +01:00
Scott Lahteine
6880e93b75 Happy configs 2014-12-18 14:02:47 -08:00
Scott Lahteine
3b1f186c0c Clean up configs 2014-12-18 13:59:31 -08:00
Scott Lahteine
f83d0f2a68 Defines for electronics boards 
Added boards.h which contains defines for all the board numbers, plus
some shorthand macros for less typing.
 2014-12-18 13:59:31 -08:00
Bo Herrmannsen
bd25e7393b Merge pull request #1192 from thinkyhead/split_language 
Split up languages.h. Use ISO language codes.
 2014-12-18 22:26:55 +01:00
Bo Herrmannsen
174f8d3631 Added example configs for printers from http://tvrrug.org.uk/ 2014-12-18 20:34:24 +01:00
Scott Lahteine
e970461adb Clean up, move unused to the bottom, add headings 2014-12-18 10:33:00 -08:00
Scott Lahteine
0c06e97e98 Split up languages.h, use ISO codes 
Breaking up languages.h makes it easier to translate. Using language
codes makes it easier to select a language and sets the naming standard.
 2014-12-18 09:31:19 -08:00
Bo Herrmannsen
a9c334e8bc Merge pull request #1191 from thinkyhead/code_shrink 
Shrink and Optimize
 2014-12-18 17:23:11 +01:00
Bo Herrmannsen
842da54e68 Merge pull request #1187 from thinkyhead/fix_constants 
A few constants where they belong
 2014-12-18 17:21:46 +01:00
Scott Lahteine
07c6b5ab71 Using axis constants 2014-12-18 08:13:08 -08:00
Scott Lahteine
1857e611d3 Other small tweaks 2014-12-18 07:49:16 -08:00
Scott Lahteine
63e1665fa9 Reduce ultralcd.cpp redundancies 2014-12-18 07:30:05 -08:00
Scott Lahteine
e69313fc2b Reduce dogm lcd code 2014-12-18 07:03:40 -08:00
Bo Herrmannsen
bd22405412 Merge pull request #1190 from thinkyhead/sd_sorting 
Wrap call to flush_presort
 2014-12-18 12:50:55 +01:00
Scott Lahteine
49791949af Wrap call to flush_presort 2014-12-18 03:47:12 -08:00
Scott Lahteine
0450e83fa5 Use SdFatUtil::FreeRam() for freeMemory() if there 2014-12-17 23:26:52 -08:00
Scott Lahteine
f21cce0b28 Rebase to Marlin_v1 2014-12-17 23:07:36 -08:00
Scott Lahteine
e4b98011cf And one more... 2014-12-17 23:01:24 -08:00
Scott Lahteine
60598b4cdd A few constants where they belong 2014-12-17 23:01:24 -08:00
Bo Herrmannsen
280504e2e0 Merge pull request #908 from alromh87/Marlin_v1 
Support for Gen3 Monolithic electronics
 2014-12-17 22:28:07 +01:00
Bo Herrmannsen
31ca3de72f Merge pull request #819 from neildarlow/Marlin_v1 
Activate LiquidTWI2 device detection and space-pad LCD status line.
 2014-12-17 21:42:53 +01:00
Bo Herrmannsen
e83cfc0a62 Merge pull request #1163 from thinkyhead/lcd_abort_message 
LCD "Abort" Message
 2014-12-17 21:30:19 +01:00
Bo Herrmannsen
0b310ab6c5 Merge pull request #1153 from xinfab/negative_values_in_menu 
Negative values in menu
 2014-12-17 20:58:01 +01:00
Bo Herrmannsen
91d740e128 Merge pull request #1141 from filipmu/Filament-Sensor 
Display filament sensor data on a 20x4 LCD or Graphical LCD
 2014-12-17 20:38:30 +01:00
alexborro
ab355a90d3 Revert "SD Sort and Buffer" 2014-12-17 14:50:59 -02:00
Scott Lahteine
d088b5f30f Remove debug echo 2014-12-13 06:33:12 -08:00
Scott Lahteine
1fad8e6a81 Proper long file name var 2014-12-13 06:17:00 -08:00
Scott Lahteine
29e854c535 Disable SDCARD_SORT_ALPHA by default 
For legacy boards it’s better if this option is disabled.
 2014-12-13 06:12:34 -08:00
Scott Lahteine
6599adc184 Polish up a little... 2014-12-13 06:12:34 -08:00
Scott Lahteine
a12eec33e2 Completed SORT_USES_MORE_RAM implementation 
For the MORE_RAM option we need to buffer both the short and long
names, even though long names are sometimes redundant. Worst case, all
the names are max length. We can save some RAM by not storing these. We
could save more RAM by only storing the visible part of the long name.
 2014-12-13 06:12:34 -08:00
Scott Lahteine
c9486ebb85 Improvements, more SORT_USES_MORE_RAM 
With this option, always keeps the dir in RAM, doubling as a cache for
getfilename. A board with only 8K of SRAM is cutting it very close.
 2014-12-13 06:12:33 -08:00
Scott Lahteine
b6ffea612a Expand on More RAM concept, address minor bugs 2014-12-13 06:10:44 -08:00
Scott Lahteine
8196b36ad9 SD Card Alpha Sorting 
First iteration of alphabetical sorting for SD cards, both
slow+efficient and fast+rammy. Option for folders to sort first, last,
or not at all.
 2014-12-13 06:07:52 -08:00
Scott Lahteine
cf749dbeda Completed SORT_USES_MORE_RAM implementation 
For the MORE_RAM option we need to buffer both the short and long
names, even though long names are sometimes redundant. Worst case, all
the names are max length. We can save some RAM by not storing these. We
could save more RAM by only storing the visible part of the long name.
 2014-12-13 06:03:39 -08:00
Scott Lahteine
ae081d0fe0 Improvements, more SORT_USES_MORE_RAM 
With this option, always keeps the dir in RAM, doubling as a cache for
getfilename. A board with only 8K of SRAM is cutting it very close.
 2014-12-13 06:03:39 -08:00
Scott Lahteine
785143a013 Expand on More RAM concept, address minor bugs 2014-12-13 06:03:39 -08:00
Scott Lahteine
0cbbba08bd SD Card Alpha Sorting 
First iteration of alphabetical sorting for SD cards, both
slow+efficient and fast+rammy. Option for folders to sort first, last,
or not at all.
 2014-12-13 06:03:39 -08:00
Scott Lahteine
3ebfd29312 Print a message when printing is aborted 
Messages in gcode files like “M117 Printing…” were not being cleared on
Stop Print.
 2014-12-13 06:01:46 -08:00
Martin Prazak
2ef0669b19 Split do_blocking_move() to XY and Z sections to make sure that the Z homing feedrate is not exceeded 2014-12-07 15:31:46 +00:00
Neil Darlow
64139f5e5a Merge https://github.com/ErikZalm/Marlin into Marlin_v1 2014-12-04 21:09:03 +00:00
Bo Herrmannsen
edfcf3b527 Toshiba Stepper Driver support 
Tosh stepper drivers need to be driven slower, so the stepper code
was interleaved to separate the pin HIGH from the pin LOW. This adds
enough instructions to make it work, without needing nops.
 2014-12-03 15:01:52 +01:00
Bo Herrmannsen
c429a4b3ec Toshiba Stepper Driver support 
Tosh stepper drivers need to be driven slower, so the stepper code
was interleaved to separate the pin HIGH from the pin LOW. This adds
enough instructions to make it work, without needing nops.
 2014-12-03 14:37:16 +01:00
nothinman
1977b4490f Merge pull request #1159 from thinkyhead/lcd_wait_better 
M0/M1 Message Fix
 2014-11-28 16:44:29 +00:00
Scott Lahteine
7562183efc Skip over spaces first 2014-11-28 08:09:28 -08:00
nothinman
5a8b3a84ae Merge pull request #1155 from thinkyhead/lcd_wait_better 
M0-M1 Enhancements
 2014-11-28 11:01:24 +00:00
elgambitero
433ac29d31 Updated a bit of spanish language 2014-11-27 22:02:49 +01:00
Scott Lahteine
12b51d6060 Ignore S and P if no value >0 is included. 2014-11-26 21:05:11 -08:00
Scott Lahteine
d12b24758a Clear LCD to welcome_msg if not printing 
The welcome message is more appropriate than “resuming print” if
nothing is printing.
 2014-11-26 21:05:11 -08:00
Scott Lahteine
3f54c9ba33 Relocate click ignore code into info screen 2014-11-26 21:05:10 -08:00
Scott Lahteine
92e21d3ee2 M0-M1 Enhancements 
Allow M0 and M1 to include a message string. Ignore clicks on “Wait for
user” so that the Info Screen stays up.
 2014-11-26 21:05:10 -08:00
Lionello Lunesu
0d35b1d0b8 Allow negative values in menus 2014-11-25 18:34:02 +08:00
Jonas
0d97dec434 Adaption of LCD info screen 
Here comes a compile-time operation to match the extruder symbols on the
info screen to the set number of extruders in configuration.h.
When only one extruder is selected, the "1" on the symbol will not be
displayed.
 2014-11-12 17:10:48 +01:00
Filip Mulier
3b1ab84536 Display Filament Sensor data on graphic LCD 
Added support to show the filament width on the status line of the
graphic LCD.  The status will show for 5 sec and then switch over to
data.  Status can be seen by clicking the button.
 2014-11-10 21:46:37 -06:00
Filip Mulier
d84934d8c5 Display Filament Sensor data on 20x4 LCD 
Changes to support displaying the real-time filament width and the
volume factor on a 20x4 LCD.  The data is displayed on the 4th line.
First the status message is displayed for 5 seconds, and then the
filament data is displayed.  The status message can be seen by
re-selecting the info screen in the menu.
 2014-11-10 21:43:58 -06:00
Filip Mulier
5c8107bcdd Commented out FILAMENT_SENSOR #define 
Commented out the FILAMENT_SENSOR define so that it is not enabled by
default.  Code does not work on all hardware variants.
 2014-11-09 13:26:02 -06:00
David
377dfb182f Updated example configurations for Delta printers 2014-11-02 21:04:54 +00:00
Neil Darlow
b81021f475 Merge https://github.com/ErikZalm/Marlin into Marlin_v1 2014-10-21 12:06:56 +01:00
Erik van der Zalm
724197454c Merge pull request #1104 from ch100/Marlin_v1 
Fixed typo.
 2014-10-11 23:10:00 +02:00
Erik van der Zalm
058e446531 Merge pull request #1037 from filipmu/Filament-Sensor 
Support for a filament diameter sensor
 2014-10-11 22:56:01 +02:00
Christian Inci
110c5dcf23 Fixed typo. 
Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com>
 2014-10-11 00:25:36 +02:00
Matt Stultz
ca30aee903 Fix "add_homeing" to "add_homing" to match changes 2014-10-07 00:16:27 -04:00
Erik van der Zalm
0733825fb1 Merge pull request #1099 from Fourmi/Marlin_v1 
Update line 627 ,wrong number on thermistortables
 2014-10-06 14:36:00 +02:00
Fourmi
af3e4d7510 Update line 627 ,wrong number on thermistortables 
Wrong number on line 627 > i change number "12" by the correct number "13"
Soory
 2014-10-06 14:21:44 +02:00
Erik van der Zalm
aaaf8fe8dd Merge pull request #1068 from darkjavi/Marlin_v1 
Added profile for RAMPS with 2 extruders and 1 fan, no heated bed
 2014-10-06 13:41:38 +02:00
Erik van der Zalm
b360306881 Merge pull request #1073 from WingTangWong/wing-fix-float-delta 
Wing fix float delta
 2014-10-06 13:41:01 +02:00
Erik van der Zalm
ce85515428 Merge pull request #1082 from Fourmi/Marlin_v1 
Add thermistor table
 2014-10-06 13:39:36 +02:00
Erik van der Zalm
764921bdbf Merge pull request #1091 from Aldert/patch-1 
Update motion_control.cpp
 2014-10-06 13:37:19 +02:00
Erik van der Zalm
c40c7b589b Merge pull request #1095 from thinkyhead/codeclean 
Simple code cleanup. Rename "homeing" to homing.
 2014-10-06 13:36:48 +02:00
Erik van der Zalm
0f2e0525df Merge pull request #1096 from thinkyhead/set-home 
Proposed feature: Set Home Offsets
 2014-10-06 13:36:11 +02:00
Erik van der Zalm
5ae02a361b Merge pull request #1097 from thinkyhead/round-up-xyz 
Adjust the Z display to hide float rounding errors
 2014-10-06 13:35:00 +02:00
Matthew Schick
fb34265d75 Make hotend optional when compiling with lcd support 
Signed-off-by: Matthew Schick <matthew.schick@gmail.com>
 2014-10-06 00:19:07 -04:00
Scott Lahteine
6e343ef2f0 Adjust the Z display to hide float rounding errors 2014-10-05 18:34:54 -07:00
Scott Lahteine
2f6c57eadc Proposed feature: Set Home Offsets 
Add an item to the LCD menu that applies the current axis position to
the “add_homeing” offset.
 2014-10-05 13:35:45 -07:00
Scott Lahteine
f989bd5435 Simple code cleanup. Rename "homeing" to homing. 2014-10-05 13:20:53 -07:00
Neil Darlow
6c5a460e65 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-10-05 12:54:54 +01:00
Aldert
d1e4237e1d Update motion_control.cpp 
G03 Full circle did not work (G02 is working correct)
 2014-10-04 09:24:09 +02:00
Fourmi
a664763e6f Update thermistortables.h 
Add another thermistor table (13),it's a cartridge thermistor up to +300°C,use with Hotend "Simple ONE" & "All In ONE"

Thx
 2014-09-27 09:05:10 +02:00
Fourmi
b5dc228a7a Update configuration.h 
Add another comment for thermistor 13 ,use with Hotend "Simple ONE & All In ONE"
 2014-09-27 09:02:58 +02:00
Fourmi
3cbb2f56c6 Update configuration.h 
Add another comment on configuration.h for the value of thermistor.
I make a pull request on thermistortables.h with my thermistor (12),but y see there is a comment on configuration with number 12 but it's not present on thermistortables.h ?

Thx
 2014-09-26 22:01:06 +02:00
Fourmi
c35736a140 Update thermistortables.h 
Add another thermistor table,use with hotend "Simple ONE" & "All in ONE"
 2014-09-26 21:49:07 +02:00
galexander1
cb4a6dd2dc Merge pull request #1065 from oliasmage/Marlin_v1 
Corrected retract() call for use of auto probe without sled enabled.
 2014-09-19 15:12:09 -04:00
Bracken Dawson
01e9b536cb Fix build for non-sled bed auto levelling 
This function should only be used with sled, not all bed auto
levelling.
 2014-09-19 19:42:32 +01:00
Wing Tang Wong
58eabd21fb Added ifndef 2014-09-16 14:31:58 -07:00
Wing Tang Wong
88d12a762a Added #ifndef DELTA wrapper to float delta 2014-09-16 14:29:44 -07:00
alexborro
bf0ecedf60 Merge pull request #1051 from fsantini/EZ_fix935 
Fix issue 935: error in matrix calculation
 2014-09-14 21:49:15 -03:00
Javi
40ba644bb4 Added profile for RAMPS with 2 extruders and 1 fan. 
modified:   Marlin/Configuration.h
	modified:   Marlin/pins.h
 2014-09-06 02:53:36 +02:00
Charles Bell
3b8216bdd1 Corrected #endif and ifdef for Z_PROBE_SLED code. 2014-09-04 16:40:22 -04:00
Charles Bell
37799f70ba Corrected retract() call for use of auto probe without sled enabled. 2014-09-04 14:36:39 -04:00
Neil Darlow
1632e5e38a Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-09-04 12:21:35 +01:00
Filip Mulier
fe3a09bbcf Correct analog sampling time for additional A to D sample 
Adjusted the  #define PID_dT to reflect 10 A to D sample steps, vs
original 8.
 2014-09-01 06:26:19 -05:00
Gina Häußge
1e9dc85148 Do not use translations for the serial console messages 
The serial protocol has to stay machine readable, without having
to cope with a ton of different human language variants. So
just leave it at the original english version.

Should fix ErikZalm/Marlin#1052
 2014-08-29 18:02:59 +02:00
fsantini
cf325ba240 Fix issue 935: error in matrix calculation 2014-08-28 21:10:50 +02:00
Erik van der Zalm
018b68a5c4 Merge pull request #976 from cocktailyogi/SCARA_by_Yogi 
Implemented SCARA-Maths
 2014-08-28 16:32:52 +02:00
Erik van der Zalm
dde61d8886 Merge pull request #977 from OskarLinde/Marlin_v1 
Fix lcd itostr3() to handle negative numbers
 2014-08-28 16:31:53 +02:00
Erik van der Zalm
0fbfb1bf82 Merge pull request #991 from bonm014/patch-1 
Leapfrog controller board support
 2014-08-28 16:27:52 +02:00
Erik van der Zalm
8340ca6e05 Merge pull request #992 from Grogyan/patch-1 
temperature.cpp fixes for SD card and MAX6675
 2014-08-28 16:27:14 +02:00
Erik van der Zalm
9887555192 Merge pull request #998 from darconeous/pull-requests/fwretract 
FWRETRACT fixes
 2014-08-28 16:24:51 +02:00
Erik van der Zalm
105571ec68 Merge pull request #1005 from midopple/Marlin_v1 
With option DISABLE_INACTIVE_EXTRUDER the extruder is disable to early
 2014-08-28 16:24:14 +02:00
Erik van der Zalm
68dd5e635e Merge pull request #1024 from oliasmage/Marlin_v1 
Adding Z Probe via sled mounted endstop
 2014-08-28 16:15:54 +02:00
Erik van der Zalm
25069ed4e9 Merge pull request #1031 from Roxy-3DPrintBoard/Z_PROBE_REPEATABILITY-with-correct-Defaults 
Z probe repeatability with correct defaults
 2014-08-28 16:14:10 +02:00
Filip Mulier
75b3a68b65 Revert "Change pinMode to SET_INPUT or SET_OUTPUT" 
This reverts commit 1d0fe035f3.
 2014-08-16 13:26:48 -05:00
Filip Mulier
e3c88a5120 Filament sensor changes to config file 
Update the config file for improvements and clarifying what diameter to
use in the slicer software.
 2014-08-16 07:08:09 -05:00
Filip Mulier
62db9848d3 Improvements and bug fixes in sensor delay buffer for filament sensor code 
Improvement to avoid reinitializing delay buffer with every print. Fixed
issues in buffer indexing and memory out of bounds due to floating point
imprecision.  Simplified the code by avoiding conversion to standard
diameter and 1cu mm extrusion, which caused complications in determining
mm extruded.
 2014-08-16 06:50:13 -05:00
Florian Baumann
5908fd5cec Fix reseting CHDK pin to LOW 
chdkActive was set to false regardless of (millis() - chdkHigh) being bigger than the CHDK_DELAY or not. So if (millis() - chdkHigh) wasn't bigger than the delay the first time, the CHDK would never be set back to LOW.

Also, don't return from the function, as there might be other stuff to do, after the CHDK check.
 2014-08-11 14:12:32 +02:00
Roxy-3DPrintBoard
0adbc79571 Fix Default Configuration so Auto Bed Leveling is off 
This snapshot has the Auto Bed Leveling turned off because most Marlin
users do not have that feature.
 2014-08-10 10:18:54 -05:00
Roxy-3DPrintBoard
0091865583 Z_PROBE_REPEATABILITY test 
Z_PROBE_REPEATABILITY test for Auto Bed Leveling.
Implemented as M48 with extra user specified options.
Full support at
http://3dprintboard.com/showthread.php?2802-Auto_Bed_Leveling-Z-Probe-Repeatability-code
 2014-08-09 15:37:23 -05:00
Filip Mulier
85649a4549 Real-time filament diameter measurement and control 
This feature allows the printer to read the filament diameter
automatically and adjust the printer in real time.  Added code to read
an analog voltage that represents a filament diameter measurement.  This
measurement is delayed in a ring buffer to compensate for sensors that
are a distance away from the extruder.  The measurement is used to
adjust the volumetric_multiplier for the extruder.  Some additional g
codes (M404, M405, M406, M407) are used to set parameters and turn
on/off the control. g code M221 is updated.  Pins for RAMPS1.4, RAMBO,
and Printrboard are identified for analog input.  The configuration file
is updated with relevant user parameters.
 2014-08-06 19:30:57 -05:00
Filip Mulier
1d0fe035f3 Change pinMode to SET_INPUT or SET_OUTPUT 
Original code is using WRITE from fastio, but original used pinMode to
set pin direction and did not use the fastio SET_INPUT or SET_OUTPUT.
This caused an issue with the rotary encoder interface to  boards based
on teensyduino, since for teensyduino pin numbers for fastio and the
usual Arduino IO are different.
 2014-08-04 21:44:04 -05:00
Charles Bell
e7707aedbc Commented out new #defines in Configuration.h. 2014-08-04 10:18:25 -04:00
Charles Bell
0a8dc0e96b Added documentation to the README.md for the sled Z probe option. CAB 2014-08-04 10:07:43 -04:00
Charles Bell
d2fcb3ee56 CAB: Added code for Z-probe with Z endstop mounted on a sled. 2014-08-01 11:29:59 -04:00
Neil Darlow
3cd7dbcc45 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-07-30 13:01:52 +01:00
daid
c13a831ea1 Merge pull request #1017 from foosel/fix/checksum_truncation_bug 
Fix for a wrong checksum truncation for certain commands
 2014-07-24 19:41:34 +02:00
Gina Häußge
2d22902d08 Fix for a wrong checksum truncation for certain commands 
Positioning of string terminator to truncate checksum from the commands
M23, M28, M30, M32, M928 and M117 was off by one, causing the last
letter of the actual command to be truncated instead of just the
checksum.

In case of the SD commands this caused checksummed commands targeting
existing files to fail since the last letter of the filename was
truncated.

In case of M117 this caused the last given letter not to be displayed.

This patch fixes the off-by-one error and sets the null terminator
on the exact position of the * starting the checksum instead of the
character before that.
 2014-07-24 12:04:02 +02:00
cocktailyogi
ad3b770c1a updated examples 2014-07-20 13:55:13 +02:00
cocktailyogi
2f4a20257c imported last Marlin changes 2014-07-20 13:49:26 +02:00
daid
aacff0d361 Merge pull request #948 from Dim3nsioneer/Marlin_v1 
Implementation of FW extruder change retract
 2014-07-18 16:10:15 +02:00
midopple
17aa67e4ea If the option DISABLE_INACTIVE_EXTRUDER ist active the extruder switch to early to inactive because there are some moves in the buffer. So the planner wait 32 moves to disable the unused extruder. 2014-07-13 21:52:32 +02:00
Robert Quattlebaum
1fd9a7d476 Fix for FWRETRACT on DELTA printers. 
Fixes #817
 2014-07-09 09:24:26 -07:00
Neil Darlow
3f2c771d90 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-07-07 18:17:15 +01:00
Grogyan
bcd039aa81 Update pins.h 2014-07-05 17:55:03 +12:00
Grogyan
82606354dd Update temperature.cpp 
Enables both SD card and MAX6675 to talk with each other
Fixes also issue #750
 2014-07-05 17:17:17 +12:00
bonm014
32a6451ad8 Add leapfrog and dual Y/Z 
I have added the pin set for the leapfrog and the support of dual Y and Z
 2014-07-03 21:15:03 +02:00
bonm014
b5417be109 Update Configuration.h 
Leapfrog added to the board list
 2014-07-03 21:03:22 +02:00
bonm014
f244045245 Update pins.h 
Leapfrog board added to the pin list
 2014-07-03 21:01:41 +02:00
Pablo Clemente
2242a84218 Changed the declaration of the variable to Marlin_main.cpp to fix issue on commit #965 2014-07-01 16:45:03 +02:00
Neil Darlow
6e3406d228 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-07-01 10:27:39 +01:00
alexborro
43c298a7a9 Add "Thermal Runaway Protection" feature 
This is a feature to protect your printer from burn up in flames if it
has a thermistor coming off place (this happened to a friend of mine
recently and motivated me writing this feature).

The issue: If a thermistor come off, it will read a lower temperature
than actual. The system will turn the heater on forever, burning up the
filament and anything
else around.

After the temperature reaches the target for the first time, this
feature will start measuring for how long the current temperature stays
below the target minus _HYSTERESIS (set_temperature -
THERMAL_RUNAWAY_PROTECTION_HYSTERESIS).

If it stays longer than _PERIOD, it means the thermistor temperature
cannot catch up with the target, so something *may be* wrong. Then, to
be on the safe side, the system will he halt.

Bear in mind the count down will just start AFTER the first time the
thermistor temperature is over the target, so you will have no problem
if your extruder heater takes 2 minutes to hit the target on heating.
 2014-06-30 15:22:49 -03:00
Pablo Clemente
d86c3cf43c Changed the type of variable to bool, the name to "cancel_heatup", flags implementation and added this fix to M190 gcode too. 2014-06-30 15:12:13 +02:00
cocktailyogi
f0cab611db optimised some math-code 2014-06-24 18:43:36 +02:00
Oskar Linde
269a068032 Fix lcd itostr3() to handle negative numbers 2014-06-24 14:31:15 +02:00
cocktailyogi
fae7d08698 fixed wrong compiler-option 2014-06-23 18:16:42 +02:00
cocktailyogi
512f2a3136 restore Branch from Backup 
sorry for that
 2014-06-23 17:09:57 +02:00
Pablo Clemente
cd3220d055 Inverted state logic for forced_heating_stop variable 2014-06-13 08:39:58 +02:00
Pablo Clemente
86b4b805d2 Fixed stop print LCD function on M104 2014-06-12 18:43:16 +02:00
Greg Tan
6e6e4e2143 Added thermistor table for the 500C thermistor shipped with the Pico hot end. 2014-06-08 09:35:04 +08:00
Neil Darlow
9d11b70436 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-06-07 20:48:25 +01:00
Gina Häußge
0de826160e M30 response is missing linefeed, "ok" therefore not on own line 
This leads to the command not being acknowledged properly
by the firmware, leading to consecutive issues in host software
waiting for an acknowledgement.
 2014-06-02 17:11:32 +02:00
Dim3nsioneer
3c927901a4 Implementation of FW extruder change retract 
FW retraction is extended onto swap retraction invoked by 'G10 S1'.
Bookkeeping of the retract state of all extruders allows for having one
extruder fw standard retracted while another extruder is swap retracted.
An LCD menu item for the swap retract and recover length was added.
 2014-06-02 17:02:10 +02:00
Dim3nsioneer
8a32c5395b renaming the disable inactive extruder feature 2014-06-02 14:07:02 +02:00
Dim3nsioneer
29e7639933 Add switch unused feeder(s) off 
Having the non-active feeder motors powered on all the time is not
necessary. A feature to deactivate the unused feeder motors has been
implemented. The feature is enabled on default but can be switched off
in the configuration.
 2014-06-02 08:13:09 +02:00
Justin Nesselrotte
07c0eeee99 Fixed a comment in the planner 2014-06-01 19:04:41 -05:00
David Forrest
09b84faa00 Configuration.h, pins.h: Add MOTHERBOARD 84 for Teensy++2.0 2014-05-29 17:19:16 -04:00
neildarlow
efb6d61413 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-05-24 13:08:58 +01:00
nothinman
38192cb5f3 Add M112 description to Marlin_main 2014-05-20 15:20:19 +01:00
nothinman
aed5ec008a Merge pull request #851 from DanNixon/estop 
Implemented M112
 2014-05-19 17:55:34 +01:00
Erik van der Zalm
cfb98ef682 More coverity fixes 2014-05-15 22:09:50 +02:00
zaubara
92e14298b0 Fixes typo for lcd backlighting on I2C PCF8575 
When using LCD_I2C_TYPE_PCF8575T (like Sainsmart I2C), the backlight
won't come on; the incorrect ifdef blocks the evocation of the backlight
functions.
 2014-05-15 01:37:23 +02:00
Erik van der Zalm
9db9842aea Fixed error found by the free coverity tool (https://scan.coverity.com/) 
===================================================
Hi,

Please find the latest report on new defect(s) introduced to ErikZalm/Marlin found with Coverity Scan.

Defect(s) Reported-by: Coverity Scan
Showing 15 of 15 defect(s)

** CID 59629:  Unchecked return value  (CHECKED_RETURN)
/Marlin_main.cpp: 2154 in process_commands()()

** CID 59630:  Operands don't affect result  (CONSTANT_EXPRESSION_RESULT)
/Applications/Arduino.app/Contents/Resources/Java/hardware/arduino/cores/arduino/Tone.cpp: 319 in tone(unsigned char, unsigned int, unsigned long)()

** CID 59631:  Missing break in switch  (MISSING_BREAK)
/Marlin_main.cpp: 1187 in process_commands()()

** CID 59632:  Missing break in switch  (MISSING_BREAK)
/Marlin_main.cpp: 1193 in process_commands()()

** CID 59633:  Out-of-bounds write  (OVERRUN)
/temperature.cpp: 914 in disable_heater()()

** CID 59634:  Out-of-bounds write  (OVERRUN)
/temperature.cpp: 913 in disable_heater()()

** CID 59635:  Out-of-bounds read  (OVERRUN)
/temperature.cpp: 626 in analog2temp(int, unsigned char)()

** CID 59636:  Out-of-bounds read  (OVERRUN)
/temperature.cpp: 620 in analog2temp(int, unsigned char)()

** CID 59637:  Out-of-bounds write  (OVERRUN)
/temperature.cpp: 202 in PID_autotune(float, int, int)()

** CID 59638:  Out-of-bounds read  (OVERRUN)
/temperature.cpp: 214 in PID_autotune(float, int, int)()

** CID 59639:  Out-of-bounds write  (OVERRUN)
/Marlin_main.cpp: 2278 in process_commands()()

** CID 59640:  Out-of-bounds read  (OVERRUN)
/Marlin_main.cpp: 1802 in process_commands()()

** CID 59641:  Uninitialized scalar field  (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 51 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()

** CID 59642:  Uninitialized scalar field  (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 45 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()

** CID 59643:  Uninitialized scalar field  (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 32 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()

________________________________________________________________________________________________________
*** CID 59629:  Unchecked return value  (CHECKED_RETURN)
/Marlin_main.cpp: 2154 in process_commands()()
2148                 }
2149               #endif
2150             }
2151           }
2152           break;
2153         case 85: // M85
   CID 59629:  Unchecked return value  (CHECKED_RETURN)
   Calling "code_seen" without checking return value (as is done elsewhere 66 out of 67 times).
2154           code_seen('S');
2155           max_inactive_time = code_value() * 1000;
2156           break;
2157         case 92: // M92
2158           for(int8_t i=0; i < NUM_AXIS; i++)
2159           {

________________________________________________________________________________________________________
*** CID 59630:  Operands don't affect result  (CONSTANT_EXPRESSION_RESULT)
/Applications/Arduino.app/Contents/Resources/Java/hardware/arduino/cores/arduino/Tone.cpp: 319 in tone(unsigned char, unsigned int, unsigned long)()
313         else
314         {
315           // two choices for the 16 bit timers: ck/1 or ck/64
316           ocr = F_CPU / frequency / 2 - 1;
317
318           prescalarbits = 0b001;
   CID 59630:  Operands don't affect result  (CONSTANT_EXPRESSION_RESULT)
   "ocr > 65535U" is always false regardless of the values of its operands. This occurs as the logical operand of if.
319           if (ocr > 0xffff)
320           {
321             ocr = F_CPU / frequency / 2 / 64 - 1;
322             prescalarbits = 0b011;
323           }
324

________________________________________________________________________________________________________
*** CID 59631:  Missing break in switch  (MISSING_BREAK)
/Marlin_main.cpp: 1187 in process_commands()()
1181         case 2: // G2  - CW ARC
1182           if(Stopped == false) {
1183             get_arc_coordinates();
1184             prepare_arc_move(true);
1185             return;
1186           }
   CID 59631:  Missing break in switch  (MISSING_BREAK)
   The above case falls through to this one.
1187         case 3: // G3  - CCW ARC
1188           if(Stopped == false) {
1189             get_arc_coordinates();
1190             prepare_arc_move(false);
1191             return;
1192           }

________________________________________________________________________________________________________
*** CID 59632:  Missing break in switch  (MISSING_BREAK)
/Marlin_main.cpp: 1193 in process_commands()()
1187         case 3: // G3  - CCW ARC
1188           if(Stopped == false) {
1189             get_arc_coordinates();
1190             prepare_arc_move(false);
1191             return;
1192           }
   CID 59632:  Missing break in switch  (MISSING_BREAK)
   The above case falls through to this one.
1193         case 4: // G4 dwell
1194           LCD_MESSAGEPGM(MSG_DWELL);
1195           codenum = 0;
1196           if(code_seen('P')) codenum = code_value(); // milliseconds to wait
1197           if(code_seen('S')) codenum = code_value() * 1000; // seconds to wait
1198

________________________________________________________________________________________________________
*** CID 59633:  Out-of-bounds write  (OVERRUN)
/temperature.cpp: 914 in disable_heater()()
908          WRITE(HEATER_0_PIN,LOW);
909        #endif
910       #endif
911
912       #if defined(TEMP_1_PIN) && TEMP_1_PIN > -1
913         target_temperature[1]=0;
   CID 59633:  Out-of-bounds write  (OVERRUN)
   Overrunning array "soft_pwm" of 1 bytes at byte offset 1 using index "1".
914         soft_pwm[1]=0;
915         #if defined(HEATER_1_PIN) && HEATER_1_PIN > -1
916           WRITE(HEATER_1_PIN,LOW);
917         #endif
918       #endif
919

________________________________________________________________________________________________________
*** CID 59634:  Out-of-bounds write  (OVERRUN)
/temperature.cpp: 913 in disable_heater()()
907        #if defined(HEATER_0_PIN) && HEATER_0_PIN > -1
908          WRITE(HEATER_0_PIN,LOW);
909        #endif
910       #endif
911
912       #if defined(TEMP_1_PIN) && TEMP_1_PIN > -1
   CID 59634:  Out-of-bounds write  (OVERRUN)
   Overrunning array "target_temperature" of 1 2-byte elements at element index 1 (byte offset 2) using index "1".
913         target_temperature[1]=0;
914         soft_pwm[1]=0;
915         #if defined(HEATER_1_PIN) && HEATER_1_PIN > -1
916           WRITE(HEATER_1_PIN,LOW);
917         #endif
918       #endif

________________________________________________________________________________________________________
*** CID 59635:  Out-of-bounds read  (OVERRUN)
/temperature.cpp: 626 in analog2temp(int, unsigned char)()
620       if(heater_ttbl_map[e] != NULL)
621       {
622         float celsius = 0;
623         uint8_t i;
624         short (*tt)[][2] = (short (*)[][2])(heater_ttbl_map[e]);
625
   CID 59635:  Out-of-bounds read  (OVERRUN)
   Overrunning array "heater_ttbllen_map" of 1 bytes at byte offset 1 using index "e" (which evaluates to 1).
626         for (i=1; i<heater_ttbllen_map[e]; i++)
627         {
628           if (PGM_RD_W((*tt)[i][0]) > raw)
629           {
630             celsius = PGM_RD_W((*tt)[i-1][1]) +
631               (raw - PGM_RD_W((*tt)[i-1][0])) *

________________________________________________________________________________________________________
*** CID 59636:  Out-of-bounds read  (OVERRUN)
/temperature.cpp: 620 in analog2temp(int, unsigned char)()
614         if (e == 0)
615         {
616           return 0.25 * raw;
617         }
618       #endif
619
   CID 59636:  Out-of-bounds read  (OVERRUN)
   Overrunning array "heater_ttbl_map" of 1 2-byte elements at element index 1 (byte offset 2) using index "e" (which evaluates to 1).
620       if(heater_ttbl_map[e] != NULL)
621       {
622         float celsius = 0;
623         uint8_t i;
624         short (*tt)[][2] = (short (*)[][2])(heater_ttbl_map[e]);
625

________________________________________________________________________________________________________
*** CID 59637:  Out-of-bounds write  (OVERRUN)
/temperature.cpp: 202 in PID_autotune(float, int, int)()
196       {
197          soft_pwm_bed = (MAX_BED_POWER)/2;
198          bias = d = (MAX_BED_POWER)/2;
199        }
200        else
201        {
   CID 59637:  Out-of-bounds write  (OVERRUN)
   Overrunning array "soft_pwm" of 1 bytes at byte offset 1 using index "extruder" (which evaluates to 1).
202          soft_pwm[extruder] = (PID_MAX)/2;
203          bias = d = (PID_MAX)/2;
204       }
205
206
207

________________________________________________________________________________________________________
*** CID 59638:  Out-of-bounds read  (OVERRUN)
/temperature.cpp: 214 in PID_autotune(float, int, int)()
208
209      for(;;) {
210
211         if(temp_meas_ready == true) { // temp sample ready
212           updateTemperaturesFromRawValues();
213
   CID 59638:  Out-of-bounds read  (OVERRUN)
   Overrunning array "current_temperature" of 1 4-byte elements at element index 1 (byte offset 4) using index "extruder" (which evaluates to 1).
214           input = (extruder<0)?current_temperature_bed:current_temperature[extruder];
215
216           max=max(max,input);
217           min=min(min,input);
218           if(heating == true && input > temp) {
219             if(millis() - t2 > 5000) {

________________________________________________________________________________________________________
*** CID 59639:  Out-of-bounds write  (OVERRUN)
/Marlin_main.cpp: 2278 in process_commands()()
2272               tmp_extruder = code_value();
2273               if(tmp_extruder >= EXTRUDERS) {
2274                 SERIAL_ECHO_START;
2275                 SERIAL_ECHO(MSG_M200_INVALID_EXTRUDER);
2276               }
2277             }
   CID 59639:  Out-of-bounds write  (OVERRUN)
   Overrunning array "volumetric_multiplier" of 1 4-byte elements at element index 1 (byte offset 4) using index "tmp_extruder" (which evaluates to 1).
2278             volumetric_multiplier[tmp_extruder] = 1 / area;
2279           }
2280           break;
2281         case 201: // M201
2282           for(int8_t i=0; i < NUM_AXIS; i++)
2283           {

________________________________________________________________________________________________________
*** CID 59640:  Out-of-bounds read  (OVERRUN)
/Marlin_main.cpp: 1802 in process_commands()()
1796             int pin_status = code_value();
1797             int pin_number = LED_PIN;
1798             if (code_seen('P') && pin_status >= 0 && pin_status <= 255)
1799               pin_number = code_value();
1800             for(int8_t i = 0; i < (int8_t)sizeof(sensitive_pins); i++)
1801             {
   CID 59640:  Out-of-bounds read  (OVERRUN)
   Overrunning array "sensitive_pins" of 28 2-byte elements at element index 55 (byte offset 110) using index "i" (which evaluates to 55).
1802               if (sensitive_pins[i] == pin_number)
1803               {
1804                 pin_number = -1;
1805                 break;
1806               }
1807             }

________________________________________________________________________________________________________
*** CID 59641:  Uninitialized scalar field  (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 51 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
45     }
46
47     LiquidCrystal::LiquidCrystal(uint8_t rs,  uint8_t enable,
48     			     uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3)
49     {
50       init(1, rs, 255, enable, d0, d1, d2, d3, 0, 0, 0, 0);
   CID 59641:  Uninitialized scalar field  (UNINIT_CTOR)
   Non-static class member "_initialized" is not initialized in this constructor nor in any functions that it calls.
51     }
52
53     void LiquidCrystal::init(uint8_t fourbitmode, uint8_t rs, uint8_t rw, uint8_t enable,
54     			 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3,
55     			 uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7)
56     {

________________________________________________________________________________________________________
*** CID 59642:  Uninitialized scalar field  (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 45 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
39     }
40
41     LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t rw, uint8_t enable,
42     			     uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3)
43     {
44       init(1, rs, rw, enable, d0, d1, d2, d3, 0, 0, 0, 0);
   CID 59642:  Uninitialized scalar field  (UNINIT_CTOR)
   Non-static class member "_initialized" is not initialized in this constructor nor in any functions that it calls.
45     }
46
47     LiquidCrystal::LiquidCrystal(uint8_t rs,  uint8_t enable,
48     			     uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3)
49     {
50       init(1, rs, 255, enable, d0, d1, d2, d3, 0, 0, 0, 0);

________________________________________________________________________________________________________
*** CID 59643:  Uninitialized scalar field  (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 32 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
26
27     LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t rw, uint8_t enable,
28     			     uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3,
29     			     uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7)
30     {
31       init(0, rs, rw, enable, d0, d1, d2, d3, d4, d5, d6, d7);
   CID 59643:  Uninitialized scalar field  (UNINIT_CTOR)
   Non-static class member "_initialized" is not initialized in this constructor nor in any functions that it calls.
32     }
33
34     LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t enable,
35     			     uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3,
36     			     uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7)
37     {

________________________________________________________________________________________________________
To view the defects in Coverity Scan visit, http://scan.coverity.com/projects/2224?tab=overview
 2014-05-14 21:59:48 +02:00
Neil Darlow
e541323741 Merge https://github.com/ErikZalm/Marlin into Marlin_v1 2014-05-09 15:02:50 +01:00
Alejandro Romero
1c9a70cee9 Support for Gen3 Monolithic electronics 
Techzone Monotronics support, ignoring the tip manager and using fan connector as on Sprinter FW
TODO: Add support for tipmanager
 2014-05-06 19:24:20 -05:00
daid
2acd3792fc Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 2014-05-01 12:03:47 +02:00
daid
8b4c4aa5c3 Add feature to check&retry CRC read errors on SD. 2014-05-01 12:03:41 +02:00
nothinman
ce76843dc3 Merge pull request #897 from Makible/5DPrint_D8_Board_Support 
5DPrint D8 Controller Board Support
 2014-04-28 22:11:28 +01:00
Cameron Lai
ad5c8cbba9 Add safety limit for hot bed power in example configuration 2014-04-25 17:04:24 +08:00
Cameron Lai
6460709d92 Fix bug in PID Autotune report 2014-04-25 16:05:05 +08:00
Cameron Lai
105bebb466 Fix for pin mapping for SDSS pin and Fan pin, so Arduino library can be used 2014-04-25 12:57:47 +08:00
Cameron Lai
97ead2eccb Fix for microstepping pin mapping, not using Teensy pin mapping, but Arduino's default pin mapping so Arduino library can be used 2014-04-25 12:57:11 +08:00
Cameron Lai
d85411f13a Revert "Fix for stepper microstepping" 
This reverts commit eea3ba5588.
 2014-04-25 12:41:56 +08:00
Cameron Lai
7c7f2d094e Revert "Fix for reading microstepping resolution" 
This reverts commit 2715f6ddbf.
 2014-04-25 12:41:48 +08:00
Cameron Lai
e2d703377a Enable EEPROM by default for 5DPrint D8 Controller Board in example configuration 2014-04-24 19:15:35 +08:00
Cameron Lai
2715f6ddbf Fix for reading microstepping resolution 2014-04-24 17:48:33 +08:00
Cameron Lai
39e9b133f3 Add example configuration for Makibox printer, which uses the 5DPrint D8 Driver Board 2014-04-24 17:06:07 +08:00
Cameron Lai
da6b536182 Add 5DPrint D8 Driver Board info and temperature table for Makibox hot bed 2014-04-24 16:49:42 +08:00
Cameron Lai
3a8e36f19e Add Digipot config for 5DPrint D8 Driver Board 2014-04-24 12:56:46 +08:00
Cameron Lai
eea3ba5588 Fix for stepper microstepping 2014-04-24 12:56:06 +08:00
Cameron Lai
1cbcbb0971 Add makibox machine information 2014-04-24 12:55:21 +08:00
Cameron Lai
2fa514e88a Add port for 5DPrint D8 Driver board 2014-04-24 12:55:00 +08:00
nothinman
b9126ab497 Merge pull request #894 from MyMakibox/Marlin_v1 
Update Marlin_main.cpp
 2014-04-23 16:23:56 +01:00
MyMakibox
21ec6b88c3 Update Marlin_main.cpp 
Added description of autotemp flags to M109
 2014-04-23 17:33:26 +08:00
MyMakibox
e4dc80d3d3 Update Configuration_adv.h 
Corrected error in AUTOTEMP instructions
 2014-04-23 17:30:07 +08:00
Neil Darlow
6adbdf42e0 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-04-21 15:10:57 +01:00
whosawhatsis
27d544ac25 Speed up QUICK_HOME feedrate for diagonal move 
Speed up the diagonal move while still keeping each individual axis at
or below its homing feedrate.
 2014-04-19 17:29:20 -07:00
nothinman
013793bbe9 Merge pull request #878 from koldoartola/Marlin_v1 
Added new language (Basque-Euskera)
 2014-04-13 22:37:39 +01:00
koldo artola
e5b70237c7 Added new language (Basque-Euskera) 
Added:
* new language (Basque-Euskera)
* some minor corrections for Spanish
* added 2 new constants for every language (required for a minor change
I am preparing to ultralcd.cpp)
 2014-04-13 22:19:38 +02:00
Nutz95
ed6f4a71c5 fix wrong temptable index 2014-04-13 18:00:55 +02:00
Nutz95
3161740df9 This table is made for thermistor 3950 (can be found on ebay for cheap) 
it's caracteristics are :

R25℃ ;100KΩ±1%

B Value(R25/50℃)：3990K 1%
Dissipation Factor(mW/℃)：1.1~1.6 In still Air
Thermal Time Constant(S)：10~17 In Still Air
Operating temperature range：  (-50~+260°C)
Dimension：  1.8mm Dia X4.1mm
Lead Length  ：30mm

This table was found on the following blogs:
http://cae2100.wordpress.com/2014/03/08/beta3950-thermistor-table-for-marlin/

and

http://microfabricator.com/articles/view/id/531ad7e59aad9d3131000000/beta-3950-thermistor-table-for-marlin
 2014-04-13 17:03:20 +02:00
nothinman
086ff1644f Merge pull request #852 from pixatintes/patch-1 
Update language.h
 2014-04-13 00:46:17 +01:00
nothinman
3ffc9651b1 Merge pull request #845 from DerSchultze/Sanguinololu-servo 
Added servo pin assignments to Sanguinololu
 2014-04-13 00:37:28 +01:00
nothinman
357b87b498 Merge pull request #826 from paciotti/patch-1 
Configuration_adv.h
 2014-04-13 00:22:25 +01:00
neildarlow
95ad6ec9a1 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-04-12 22:20:45 +01:00
Gabe Rosenhouse
27a7cf9fcf use existing strings 2014-04-07 05:01:48 -05:00
Gabe Rosenhouse
d3f305332a Allowable range now includes default value 2014-04-06 19:45:56 -05:00
Gabe Rosenhouse
b0aeac117f Adjustable Z probe offset, via custom M-code 2014-04-06 19:45:56 -05:00
Neil Darlow
73b380d8d2 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-04-06 19:15:29 +01:00
nothinman
c23376f2e7 Merge pull request #837 from whosawhatsis/fwretract 
FWRETRACT in mm/s
 2014-04-04 11:47:58 +01:00
nothinman
dfb98101e4 Change CONTROLLERFAN_PIN for board 35 to -1, as it would conflict with board's 33 extruder pin, causing burnout (it's the same board, just different number of fans/extruders, therefore should be pin-compatible) 2014-04-03 18:05:48 +01:00