303ee67896
Merge pull request #864 from whosawhatsis/M200
...
fix bug in M200 with multiple extruders
11 years ago
8759508319
fix bug for dual extruders not working
...
some guy find that marlin not working good for dual extruders delta .
when type T0 or T1 to active extruder and E0 or E1 move causing XYZ
motion . so i locales the bugs and fix it , I have dry run the fix.
11 years ago
a65564eef6
fix bug in M200 with multiple extruders
11 years ago
aeaf9b9312
fix bug in M200 with multiple extruders
11 years ago
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.
11 years ago
b0093a1513
thermistortables.h: Add comments that table 60 uses beta=3950.
11 years ago
a3530d1141
Update language.h
...
Updated to latest version.
11 years ago
990e770e15
Update language.h
...
Added catalan language
11 years ago
f643f4d674
Test and refactor
11 years ago
bbe8fbe13d
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
c8cdd1fc6f
Bugfixes for language option 6 (russian)
11 years ago
7395dafc1e
semantic changes in language.h
11 years ago
fad2a60ce6
Corrections for preheat extension in language.h
11 years ago
eecda434fb
Sanguinololu servo pins set default disabled
11 years ago
944ced87c5
Extended Preheat options
...
Preheat LCD menus base on code by D-Base
11 years ago
06709ad60e
Added servo pin assignments to Sanguinololu
11 years ago
3906f27c46
Individual extruder flow rate
...
Extension of M221, Tune menu
11 years ago
a38c90ee84
Added estop handling
11 years ago
a00cec8b71
Merge pull request #833 from mattsch/optional_feedrate_multiplier
...
Add support for disabling encoder control for feedrate multiplier
11 years ago
af8be9013b
Merge branch 'lcd_detected' of https://github.com/whosawhatsis/Marlin into Marlin_v1
11 years ago
0ddee3c7db
Prevent SD card insertion from causing a hang when using LiquidTWI2 device detection
11 years ago
272072fa20
Added M112
11 years ago
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.
11 years ago
6cd85e6008
Add support for disabling encoder control for feedrate multiplier
...
Signed-off-by: Matthew Schick <matthew.schick@gmail.com>
11 years ago
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/
11 years ago
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/
11 years ago
881e348eed
Update Configuration_adv.h
...
Increase Z_HOME_RETRACT_MM to 2mm default to avoid end stop not switching during retract.
11 years ago
5a332df47e
Merge https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
15d1b8d719
Fixed finnish translation
...
- Fixed Few finnish transalations
- Removed duplicate contrast define
11 years ago
7325d7102e
Activate LiquidTWI2 device detection and space-pad LCD status line.
11 years ago
7f76a0e064
Merge pull request #813 from drf5n/PID_DEBUG
...
temperature.cpp: Fix PID_DEBUG compile error.
11 years ago
fcd8524b6e
Only increase EEPROM version for DELTA printers.
11 years ago
8ea5665ee2
Merge remote-tracking branch 'origin/Marlin_v1' into add/M665-set-delta-configuration
...
Conflicts:
Marlin/Marlin_main.cpp
11 years ago
8c4377dd63
temperature.cpp: Fix PID_DEBUG compile error.
11 years ago
fde8c2c310
Merge pull request #807 from Cylindric3D/typofixes_upstream5
...
Various typo fixes #5 - only in comments, no code changes.
11 years ago
fdce91192e
Various typo fixes - only in comments, no code changes.
11 years ago
d819c55395
Various typo fixes - only in comments, no code changes.
11 years ago
fd4542f33a
Merge pull request #805 from whosawhatsis/M200
...
autretract fix
11 years ago
e8291ed728
Merge pull request #802 from Makers-Tool-Works/Marlin_v1
...
Clarify which PID values to enter
11 years ago
465b654d24
Merge pull request #797 from Cylindric3D/update_menu_plan
...
Update menu plan
11 years ago
88506a80c3
Merge pull request #789 from smiler/Marlin_v1
...
Fixed typo.
11 years ago
b514d3c87f
Merge pull request #781 from Cylindric3D/typofixes_upstream
...
Various typo fixes #3 - only in comments, no code changes.
11 years ago
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
11 years ago
cc5f1d475c
Merge pull request #772 from ellensp/Marlin_v1
...
Updated gen3+ board pins names to current convention
11 years ago
91759dede6
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream
11 years ago
557217fc05
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into update_menu_plan
11 years ago
aee63afccd
Clarify which PID values to enter
...
Users can be confused as to which values to enter after a PID tune. Updating the message to help clarity it.
New message: "PID Autotune finished! Put the last Kp, Ki and Kd constants from above into Configuration.h"
Old message: "PID Autotune finished! Put the Kp, Ki and Kd constants into Configuration.h"
11 years ago
99f6326544
Remove unnecessary dependency on time.h from qr_solve.cpp
...
Fixed compiler errors on Ubuntu using arduino-core
11 years ago
ea669cb504
Fix some extra and some missing tabs, to make the file consistent.
11 years ago
b46a1b6360
Update the menu plan document with the current menu as per ultralcd.cpp.
11 years ago
3cc7626d1f
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into update_menu_plan
11 years ago
174b8d99d5
Simplify 3-point probing using new code only
11 years ago
3b718b816c
better documentation
11 years ago
34fd59c370
ABL at any points
11 years ago
541155ea87
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream
11 years ago
9fa328e5c8
Merge pull request #793 from MissionSt/use_axis_enums
...
Use constants instead of numeric literals
11 years ago
f308a8af91
update comment
11 years ago
357e31270a
Prevent G29 without first homing in X and Y
...
If position is unknown, then G29 can be dangerous.
11 years ago
d2d7d186b5
Use descriptive constants, more
11 years ago
2ccdf4f36d
Use descriptive constants instead of numeric literals
11 years ago
c00383f286
Fixed typo.
11 years ago
60f72a78a9
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream
11 years ago
abba7a0003
Merge pull request #782 from marcovannoord/Marlin_v1
...
Added dutch to language.h
11 years ago
b868d668fa
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream
11 years ago
8212d8d543
Revert "Fixed small typo that would prevent compiling"
...
This reverts commit 51ae4881ab
11 years ago
46bae30573
Merge pull request #776 from whosawhatsis/fwretract
...
Fwretract fixes, cleanup
11 years ago
51ae4881ab
Fixed small typo that would prevent compiling
11 years ago
498d76fd79
Fixed some messages where the text shown on the screen was more than 17 characters
11 years ago
af9395ac2e
Add M605 to dynamically set delta configuration
...
Save above configs in eeprom
fix docs in createTemperatureLookupMarlin.py
add missing azteegX3pro digipot settings in delta example config
11 years ago
fd42f0d226
Merge pull request #783 from MissionSt/fix/syntax-error
...
Fix compile error
11 years ago
96217bf36a
Merge pull request #777 from PxT/M114
...
Add whitespace to M114 output
11 years ago
cf5c3b6610
Added dutch to language.h
11 years ago
d1c64b9dc4
Fix syntax error introduced in 477b6fa1d
11 years ago
5d50819791
Various typo fixes - only in comments, no code changes.
11 years ago
3f455889d0
Merge pull request #769 from Cylindric3D/typofixes_1
...
Various typo fixes - only in comments, no code changes.
11 years ago
4ddedb3b27
Merge pull request #780 from Cylindric3D/typofixes_2
...
Various typo fixes #2 - only in comments, no code changes.
11 years ago
d4ba23bc28
Merge pull request #770 from josefpavlik/Marlin_v1
...
Marlin v1
11 years ago
bbb424bd2f
Merge pull request #779 from MissionSt/makefile-fix-abl
...
Makefile fixes
11 years ago
8f0cee2a14
Various typo fixes - only in comments, no code changes.
11 years ago
08263ae66e
Merge branch 'Marlin_v1' into typofixes_1
11 years ago
5bd09d26e2
Makefile works with auto bed leveling
11 years ago
b45beeffd6
typo fix in Makefile
11 years ago
306588925d
Add whitespace to M114 output
11 years ago
c43838bb1e
disable auto retract by default
...
This should make it safe to enable FWRETRACT by default, with
autoretract (which should now be fixed) only enabled by M209. FWRETRACT
should probably now default to enabled (to make G10/G11 and M207-209
available, without changing functionality when they are not used), but
I’ll save that for another pull request/discussion.
11 years ago
99f0e44864
Move FWRETRACT defaults to configuration_adv.h
11 years ago
66e3869138
Fix autoretract
...
This takes the (now working) G10/G11 code and moves it to a function,
which is called by G10 and G11, and also called by G1 if autoretract is
enabled and a retract/recover move is detected.
11 years ago
2f2459c0db
Fix G10/G11 Z-lift
11 years ago
8c5675c290
Use language.h instead of English literals for "bed"
11 years ago
0f7393a13e
Refactor 'accurate' auto bed leveling to use probe_pt()
11 years ago
c4fbb44d6d
Refactor 3-point auto bed leveling to use probe_pt()
11 years ago
ad2c6488c7
Add probe_pt(), useful for auto bed leveling
11 years ago
c9c83a4560
Updated gen3+ board pins names to current convention
11 years ago
ab0d3c4fb3
Various typo fixes - only in comments, no code changes.
11 years ago
477b6fa1df
move engaged from lcd console refreshes power off timeout
11 years ago
831fc2a952
Pt100 and Pt1000 temperature sensors handling
11 years ago
7dcd350941
A few changes to Russian, changed LCD strings to be <=17 characters.
11 years ago
c31bb2b7ad
Only show the ZProbe offset when auto-bed-leveling is enabled.
11 years ago
46f5bea19f
Add configurable beep for UltiPanel.
11 years ago
d16a770855
Ultimainboard 2.x does not has a PS_ON pin.
11 years ago
71bb3a8133
Add comments for Ultimainboard 2.0 configuration.
11 years ago
9b7d87e885
Remove duplicate contrast define.
11 years ago
816f0a678a
Merge pull request #768 from whosawhatsis/Marlin_v1
...
multiple FWretract fixes
11 years ago
6e43398509
G10/G11 bugfixes
...
Previous version was broken by using G92 E0 between retract and recover.
11 years ago
d6c5c503d4
correct feedrate units in comments for M207/M208
11 years ago
15d6116188
Merge pull request #689 from cajun-rat/tidy
...
Use C++ initialization list
11 years ago
0b9ecf3824
Language cleanup, part 1.
11 years ago
b5ba5c1465
Merge branch 'Marlin_v1' of https://github.com/whosawhatsis/Marlin into Marlin_v1
11 years ago
78e7654601
Keep FWRETRACT values in terms of millimeters when using M200
...
for volumetric E units
11 years ago
3f6d44d40b
Keep FWRETRACT values in terms of millimeters when using M200 for volumetric E units
11 years ago
363dc2f0e8
Merge branch 'Marlin_v1' into update_menu_plan
11 years ago
5f797ca29f
Updated Polish, changed default firmware URL to Marlin.
11 years ago
0778f5f028
Add missing entries to the new Aragonian language.
11 years ago
54bab3e0d0
Merge branch 'Marlin_v1' into localisation
...
Conflicts:
Marlin/language.h
11 years ago
bdd0211aeb
Move strings in ultralcd.cpp into language.h.
11 years ago
c8e5a82d49
keep English as default lang.
11 years ago
f64592e362
Add Aragonese translation
11 years ago
ac74f45dc0
Merge pull request #752 from MatixYo/patch-3
...
Update language.h
11 years ago
36086d3ca4
Update language.h
...
Updated Polish translations.
11 years ago
1781031f2d
Update LCD Menu Tree with current options, based on ultralcd.cpp and language.h.
11 years ago
d485988bec
fix typo
11 years ago
8a1fd25363
Default is to not define digipot_i2c
11 years ago
5097c57d3a
Added pins for Azteeg X3 Pro under motherboard 68
11 years ago
b819fc53ca
Add Azteeg X3 Pro as motherboard 68
...
Add digipot i2c control for MCP4451
Allow M907 to set i2c digipot currents in amps
Fix Makefile to allow Azteeg motherboards
Fix Makefile to allow Wire libraries only
Add beeper pin for Azteeg X3 Pro
11 years ago
e1ae7952eb
Merge pull request #743 from Opticalworm/Marlin_v1
...
Improved support for panelolu2 encoder and buzzer
11 years ago
a5f53f0cf3
Heater wattage reporting for M105 using EXTRUDER_WATTS and BED_WATTS
11 years ago
8d162e5bd7
Improved support for panelolu2 encoder and buzzer
...
I added #define for LCD_FEEDBACK_FREQUENCY_HZ and
LCD_FEEDBACK_FREQUENCY_DURATION_MS which is used to alter the default
buzzer sound.
When selecting Panelolu2 in configuration.h:
- it automatically sets the correct ENCODER_PULSES_PER_STEP and
ENCODER_STEPS_PER_MENU_ITEM.
- if LCD_USE_I2C_BUZZER is defined it will also set the default
LCD_FEEDBACK_FREQUENCY_HZ and LCD_FEEDBACK_FREQUENCY_DURATION_MS
When selecting the sanguinololu 1284p the following is true:
- its now enables LARGE_FLASH
- It enables the gcode M300 when the panelolu2 LCD_USE_I2C_BUZZER is
defined
11 years ago
b2c11ba980
Change diameter code to 'D'
...
For some reason that I can’t figure out, the decimal is dropped when
using ’S’ for the code.
Also some minor code improvements to M200.
11 years ago
61059385a3
Merge pull request #737 from whosawhatsis/M200
...
M200 implementation
11 years ago
856edfcc0d
Fixed math
...
This is why I wanted to sleep on the code I wrote while falling asleep
rather than immediately submitting a pull request.
11 years ago
0d81ae77bc
Merge pull request #727 from drf5n/oversampling
...
temperature.cpp: Actually use OVERSAMPLENR in the oversampling calculation.
11 years ago
84df13f7d1
Merge pull request #721 from drf5n/lcdOnly
...
Enable basic ULTRA_LCD screen w/o encoders and menus.
11 years ago
4c7e9502ad
Merge pull request #718 from drf5n/temptableRes
...
createTemperatureLookupMarlin.py: Add resolution comments and format for...
11 years ago
652a0f6b5a
Merge pull request #717 from drf5n/tpins2
...
fastio.h: Add AT90USBxx_TEENSYPP_ASSIGNMENTS for teensyduino/Lincomatic/...
11 years ago
96a0cdc541
Merge pull request #716 from drf5n/maketeensy
...
Makefile: Update for Arduino 1.0.5 and Teensyduino dependent boards (HAR...
11 years ago
d24df7af2c
M200 implementation
11 years ago
f0b8d5ba3d
createTemperatureLookupMarlin.py: Change comment to refer to actual program name.
11 years ago
50f44d9249
createTemperatureLookupMarlin.py: Truncate to short after application of OVERSAMPLENR for improved resolution.
11 years ago
f5b5dd8038
createTemperatureLookupMarlin.py: Add output of Steinhart-Hart coefficients.
11 years ago
76cf07c3f7
Configuration.h: Use OVERSAMPLENR in dT_PID definition.
11 years ago
476c7193d8
temperature.cpp: Use OVERSAMPLENR in oversampling calculation.
11 years ago
f08bb8bb6a
Previous commit borked.
11 years ago
b1f8f492c6
Remove previous_millis_cmd update from extruder runout prevention code
...
This seems to defeat the purpose of previous_millis_cmd, preventing the
time elapsed from previous_millis_cmd from ever reaching
max_inactive_time or stepper_inactive_time while the heat was on.
11 years ago
8a5eaa3c9b
Fix crash after home bug
...
Fixes a bug in the Extruder Runout Prevention feature that caused the
extruder to move back to “current_position” after a move if it was
activated while the move was in progress. For long home moves (which
are longer than the dimensions of the machine’s working area), this
would cause the machine to crash into the far end of its travel after
homing. This usually occurred on the Z axis, which could result in
damage to the machine if you don’t hit the reset button in time.
11 years ago
61a7256d42
Enable basic ULTRA_LCD screen w/o encoders and menus.
11 years ago
fdac8f6cec
Update ConfigurationStore.cpp
...
Unable to compile if ENABLE_AUTO_BED_LEVELING is not set (not set by default).
11 years ago
05932e4458
Add Z Probe Offset to EEPROM and Ultra LCD
11 years ago
7216583b8b
createTemperatureLookupMarlin.py: Add resolution comments and format for Marlin.
11 years ago
e8e0697e48
fastio.h: Add AT90USBxx_TEENSYPP_ASSIGNMENTS for teensyduino/Lincomatic/Printrboard compatibility.
11 years ago
75f39fadfc
Makefile: Update for Arduino 1.0.5 and Teensyduino dependent boards (HARDWARE_MOTHERBOARD=={8,81,82,83,84})
11 years ago
df194f75e1
Added PT100 support for Ultiboard2
11 years ago
nothinman