89f78b0b80
Allow use of either SD Card slot when LCD Panel is configured.
...
Preference is for Controller SD slot before LCD Panel slot when both are occupied.
2014-03-27 17:02:17 +00:00
b0093a1513
thermistortables.h: Add comments that table 60 uses beta=3950.
2014-03-26 23:41:10 -04:00
a3530d1141
Update language.h
...
Updated to latest version.
2014-03-23 18:06:48 +01:00
990e770e15
Update language.h
...
Added catalan language
2014-03-23 10:30:08 +01:00
f643f4d674
Test and refactor
2014-03-21 20:42:00 +00:00
bbe8fbe13d
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
2014-03-21 18:27:14 +00:00
51c6bd6b72
Merge pull request #846 from Dim3nsioneer/Marlin_v1
...
Extended Preheat options
2014-03-19 13:47:20 +00:00
c8cdd1fc6f
Bugfixes for language option 6 (russian)
2014-03-19 14:27:38 +01:00
7395dafc1e
semantic changes in language.h
2014-03-19 12:30:50 +01:00
fad2a60ce6
Corrections for preheat extension in language.h
2014-03-19 12:23:35 +01:00
eecda434fb
Sanguinololu servo pins set default disabled
2014-03-18 08:25:20 +01:00
944ced87c5
Extended Preheat options
...
Preheat LCD menus base on code by D-Base
2014-03-17 18:37:46 +01:00
06709ad60e
Added servo pin assignments to Sanguinololu
2014-03-17 15:45:13 +01:00
084134d3c7
Merge pull request #841 from Dim3nsioneer/Marlin_v1
...
Set flow rate (extrude-mutliplier) for each extruder individually
2014-03-15 20:21:48 +01:00
3906f27c46
Individual extruder flow rate
...
Extension of M221, Tune menu
2014-03-15 18:09:46 +01:00
8613a74443
Merge pull request #1 from ErikZalm/Marlin_v1
...
Update on 140315
2014-03-15 17:49:30 +01:00
a38c90ee84
Added estop handling
2014-03-15 15:56:15 +00:00
a00cec8b71
Merge pull request #833 from mattsch/optional_feedrate_multiplier
...
Add support for disabling encoder control for feedrate multiplier
2014-03-15 15:41:45 +01:00
1f895844ac
Merge pull request #829 from blddk/Marlin_v1
...
Added CHDK support
2014-03-15 15:34:04 +01:00
af8be9013b
Merge branch 'lcd_detected' of https://github.com/whosawhatsis/Marlin into Marlin_v1
2014-03-15 07:24:47 +00:00
0ddee3c7db
Prevent SD card insertion from causing a hang when using LiquidTWI2 device detection
2014-03-14 18:46:25 -07:00
272072fa20
Added M112
2014-03-14 23:19:43 +00:00
aab61e63c3
FWRETRACT in mm/s
...
Firmware retraction now stores the retract and recover speeds in mm/s
instead of mm/min. This makes it match the units of the maximum
feedrate, and fixes problems with modifying the value via LCD control
panel. From gcode, the values are still taken in mm/min to match the
units of G1 and similar, and they are converted to mm/s before they are
stored.
I also lowered the default retract feedrate to make it less likely to
cause problems for geared extruders when the user hasn’t bothered to
set a reasonable maximum feedrate, though users should be setting both
of these values to suit their hardware.
2014-03-14 15:17:28 -07:00
6cd85e6008
Add support for disabling encoder control for feedrate multiplier
...
Signed-off-by: Matthew Schick <matthew.schick@gmail.com >
2014-03-12 18:13:50 -04:00
09af1b90b8
Added CHDK support
...
Added CHDK support to take pictures instead of doing an IR command, see more about how to use it here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/
2014-03-10 21:57:08 +01:00
765b2da3d4
Added CHDK support
...
Added so M240 can be used to trigger CHDK instead of sending an IR signal, see more about CHDK here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/
2014-03-10 21:52:33 +01:00
881e348eed
Update Configuration_adv.h
...
Increase Z_HOME_RETRACT_MM to 2mm default to avoid end stop not switching during retract.
2014-03-08 22:35:05 +01:00
5a332df47e
Merge https://github.com/ErikZalm/Marlin into Marlin_v1
2014-03-06 20:56:44 +00:00
040357fd1b
Merge pull request #822 from tommil/Marlin_v1
...
Fixed Finnish translation
2014-03-05 16:34:47 +00:00
15d1b8d719
Fixed finnish translation
...
- Fixed Few finnish transalations
- Removed duplicate contrast define
2014-03-05 14:02:52 +02:00
7325d7102e
Activate LiquidTWI2 device detection and space-pad LCD status line.
2014-03-03 21:01:27 +00:00
7f76a0e064
Merge pull request #813 from drf5n/PID_DEBUG
...
temperature.cpp: Fix PID_DEBUG compile error.
2014-02-26 17:31:48 +01:00
4f3eb6bec8
Merge pull request #811 from anfroholic/patch-1
...
Update README.md with Autotemp typo fix
2014-02-26 17:30:49 +01:00
fcd8524b6e
Only increase EEPROM version for DELTA printers.
2014-02-26 17:29:27 +01:00
8c98690e1d
Merge pull request #786 from wolfmanjm/add/M665-set-delta-configuration
...
Add M665 to dynamically set delta configuration
2014-02-26 17:26:19 +01:00
8ea5665ee2
Merge remote-tracking branch 'origin/Marlin_v1' into add/M665-set-delta-configuration
...
Conflicts:
Marlin/Marlin_main.cpp
2014-02-26 00:19:28 -08:00
8c4377dd63
temperature.cpp: Fix PID_DEBUG compile error.
2014-02-26 00:44:22 -05:00
661e378ce9
Update README.md
2014-02-25 17:46:23 -06:00
fde8c2c310
Merge pull request #807 from Cylindric3D/typofixes_upstream5
...
Various typo fixes #5 - only in comments, no code changes.
2014-02-25 18:49:41 +01:00
1aa10a5f18
Merge pull request #806 from Cylindric3D/typofixes_upstream
...
Various typo fixes #4 - only in comments, no code changes.
2014-02-25 18:48:52 +01:00
fdce91192e
Various typo fixes - only in comments, no code changes.
2014-02-25 10:01:15 +00:00
d819c55395
Various typo fixes - only in comments, no code changes.
2014-02-25 09:52:58 +00:00
fd4542f33a
Merge pull request #805 from whosawhatsis/M200
...
autretract fix
2014-02-24 22:35:08 +01:00
e8291ed728
Merge pull request #802 from Makers-Tool-Works/Marlin_v1
...
Clarify which PID values to enter
2014-02-24 22:31:13 +01:00
465b654d24
Merge pull request #797 from Cylindric3D/update_menu_plan
...
Update menu plan
2014-02-24 22:30:19 +01:00
88506a80c3
Merge pull request #789 from smiler/Marlin_v1
...
Fixed typo.
2014-02-24 22:26:31 +01:00
b514d3c87f
Merge pull request #781 from Cylindric3D/typofixes_upstream
...
Various typo fixes #3 - only in comments, no code changes.
2014-02-24 22:25:38 +01:00
77df0d689a
autretract fix
...
I made these changes previously, but I can’t find the commit now. This
reapplies the changes to get auto retract working again.
Conflicts:
Marlin/Configuration_adv.h
Marlin/Marlin_main.cpp
2014-02-24 13:24:38 -08:00
cc5f1d475c
Merge pull request #772 from ellensp/Marlin_v1
...
Updated gen3+ board pins names to current convention
2014-02-24 22:22:15 +01:00
91759dede6
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream
2014-02-24 17:29:37 +00:00
