1395 Commits (5f555140be4231fb3ffea8a407414e245cfc12ec)

Author SHA1 Message Date
whosawhatsis 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
ErikZalm cc5f1d475c Merge pull request #772 from ellensp/Marlin_v1
Updated gen3+ board pins names to current convention
11 years ago
Cylindric 91759dede6 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream 11 years ago
Cylindric 557217fc05 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into update_menu_plan 11 years ago
RoyOnWheels 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
Gabe Rosenhouse 99f6326544 Remove unnecessary dependency on time.h from qr_solve.cpp
Fixed compiler errors on Ubuntu using arduino-core
11 years ago
Cylindric ea669cb504 Fix some extra and some missing tabs, to make the file consistent. 11 years ago
Cylindric b46a1b6360 Update the menu plan document with the current menu as per ultralcd.cpp. 11 years ago
Cylindric 3cc7626d1f Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into update_menu_plan 11 years ago
Gabe Rosenhouse 174b8d99d5 Simplify 3-point probing using new code only 11 years ago
Gabe Rosenhouse 3b718b816c better documentation 11 years ago
Gabe Rosenhouse 34fd59c370 ABL at any points 11 years ago
Cylindric 541155ea87 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream 11 years ago
alexborro 9fa328e5c8 Merge pull request #793 from MissionSt/use_axis_enums
Use constants instead of numeric literals
11 years ago
Gabe Rosenhouse f308a8af91 update comment 11 years ago
Gabe Rosenhouse 357e31270a Prevent G29 without first homing in X and Y
If position is unknown, then G29 can be dangerous.
11 years ago
Gabe Rosenhouse d2d7d186b5 Use descriptive constants, more 11 years ago
Gabe Rosenhouse 2ccdf4f36d Use descriptive constants instead of numeric literals 11 years ago
Christian Axelsson c00383f286 Fixed typo. 11 years ago
Cylindric 60f72a78a9 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream 11 years ago
nothinman abba7a0003 Merge pull request #782 from marcovannoord/Marlin_v1
Added dutch to language.h
11 years ago
Cylindric b868d668fa Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream 11 years ago
Marco 8212d8d543 Revert "Fixed small typo that would prevent compiling"
This reverts commit 51ae4881ab.
11 years ago
daid 46bae30573 Merge pull request #776 from whosawhatsis/fwretract
Fwretract fixes, cleanup
11 years ago
Marco 51ae4881ab Fixed small typo that would prevent compiling 11 years ago
Marco 498d76fd79 Fixed some messages where the text shown on the screen was more than 17 characters 11 years ago
Jim Morris 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
nothinman fd42f0d226 Merge pull request #783 from MissionSt/fix/syntax-error
Fix compile error
11 years ago
nothinman 96217bf36a Merge pull request #777 from PxT/M114
Add whitespace to M114 output
11 years ago
Marco cf5c3b6610 Added dutch to language.h 11 years ago
Gabe Rosenhouse d1c64b9dc4 Fix syntax error introduced in 477b6fa1d 11 years ago
Cylindric 5d50819791 Various typo fixes - only in comments, no code changes. 11 years ago
nothinman 3f455889d0 Merge pull request #769 from Cylindric3D/typofixes_1
Various typo fixes - only in comments, no code changes.
11 years ago
nothinman 4ddedb3b27 Merge pull request #780 from Cylindric3D/typofixes_2
Various typo fixes #2 - only in comments, no code changes.
11 years ago
nothinman d4ba23bc28 Merge pull request #770 from josefpavlik/Marlin_v1
Marlin v1
11 years ago
nothinman bbb424bd2f Merge pull request #779 from MissionSt/makefile-fix-abl
Makefile fixes
11 years ago
Cylindric 8f0cee2a14 Various typo fixes - only in comments, no code changes. 11 years ago
Cylindric 08263ae66e Merge branch 'Marlin_v1' into typofixes_1 11 years ago
Gabe Rosenhouse 5bd09d26e2 Makefile works with auto bed leveling 11 years ago
Gabe Rosenhouse b45beeffd6 typo fix in Makefile 11 years ago
Paul Telford 306588925d Add whitespace to M114 output 11 years ago
whosawhatsis 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
whosawhatsis 99f0e44864 Move FWRETRACT defaults to configuration_adv.h 11 years ago
whosawhatsis 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
whosawhatsis 2f2459c0db Fix G10/G11 Z-lift 11 years ago
Gabe Rosenhouse 8c5675c290 Use language.h instead of English literals for "bed" 11 years ago
Gabe Rosenhouse 0f7393a13e Refactor 'accurate' auto bed leveling to use probe_pt() 11 years ago
Gabe Rosenhouse c4fbb44d6d Refactor 3-point auto bed leveling to use probe_pt() 11 years ago
Gabe Rosenhouse ad2c6488c7 Add probe_pt(), useful for auto bed leveling 11 years ago
Peter c9c83a4560 Updated gen3+ board pins names to current convention 11 years ago
Mark Hanford ab0d3c4fb3 Various typo fixes - only in comments, no code changes. 11 years ago
Josef Pavlik 477b6fa1df move engaged from lcd console refreshes power off timeout 11 years ago
Josef Pavlik 831fc2a952 Pt100 and Pt1000 temperature sensors handling 11 years ago
nothinman 7dcd350941 A few changes to Russian, changed LCD strings to be <=17 characters. 11 years ago
daid c31bb2b7ad Only show the ZProbe offset when auto-bed-leveling is enabled. 11 years ago
daid 46f5bea19f Add configurable beep for UltiPanel. 11 years ago
daid d16a770855 Ultimainboard 2.x does not has a PS_ON pin. 11 years ago
daid 71bb3a8133 Add comments for Ultimainboard 2.0 configuration. 11 years ago
daid 9b7d87e885 Remove duplicate contrast define. 11 years ago
daid 816f0a678a Merge pull request #768 from whosawhatsis/Marlin_v1
multiple FWretract fixes
11 years ago
whosawhatsis 6e43398509 G10/G11 bugfixes
Previous version was broken by using G92 E0 between retract and recover.
11 years ago
whosawhatsis d6c5c503d4 correct feedrate units in comments for M207/M208 11 years ago
nothinman 15d6116188 Merge pull request #689 from cajun-rat/tidy
Use C++ initialization list
11 years ago
Martin Lukasik 0b9ecf3824 Language cleanup, part 1. 11 years ago
whosawhatsis b5ba5c1465 Merge branch 'Marlin_v1' of https://github.com/whosawhatsis/Marlin into Marlin_v1 11 years ago
whosawhatsis 78e7654601 Keep FWRETRACT values in terms of millimeters when using M200
for volumetric E units
11 years ago
whosawhatsis 3f6d44d40b Keep FWRETRACT values in terms of millimeters when using M200 for volumetric E units 11 years ago
Cylindric 363dc2f0e8 Merge branch 'Marlin_v1' into update_menu_plan 11 years ago
nothinman 5f797ca29f Updated Polish, changed default firmware URL to Marlin. 11 years ago
Mark Hanford 0778f5f028 Add missing entries to the new Aragonian language. 11 years ago
Mark Hanford 54bab3e0d0 Merge branch 'Marlin_v1' into localisation
Conflicts:
	Marlin/language.h
11 years ago
Mark Hanford bdd0211aeb Move strings in ultralcd.cpp into language.h. 11 years ago
Daniel Martinez c8e5a82d49 keep English as default lang. 11 years ago
Daniel Martinez f64592e362 Add Aragonese translation 11 years ago
ErikZalm ac74f45dc0 Merge pull request #752 from MatixYo/patch-3
Update language.h
11 years ago
MatixYo 36086d3ca4 Update language.h
Updated Polish translations.
11 years ago
Cylindric 1781031f2d Update LCD Menu Tree with current options, based on ultralcd.cpp and language.h. 11 years ago
Jim Morris d485988bec fix typo 11 years ago
Jim Morris 8a1fd25363 Default is to not define digipot_i2c 11 years ago
Jim Morris 5097c57d3a Added pins for Azteeg X3 Pro under motherboard 68 11 years ago
Jim Morris 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
ErikZalm e1ae7952eb Merge pull request #743 from Opticalworm/Marlin_v1
Improved support for panelolu2 encoder and buzzer
11 years ago
David Forrest a5f53f0cf3 Heater wattage reporting for M105 using EXTRUDER_WATTS and BED_WATTS 11 years ago
Ronald 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
whosawhatsis 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
ErikZalm 61059385a3 Merge pull request #737 from whosawhatsis/M200
M200 implementation
11 years ago
whosawhatsis 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
ErikZalm 0d81ae77bc Merge pull request #727 from drf5n/oversampling
temperature.cpp: Actually use OVERSAMPLENR in the oversampling calculation.
11 years ago
ErikZalm 84df13f7d1 Merge pull request #721 from drf5n/lcdOnly
Enable basic ULTRA_LCD screen w/o encoders and menus.
11 years ago
ErikZalm 4c7e9502ad Merge pull request #718 from drf5n/temptableRes
createTemperatureLookupMarlin.py: Add resolution comments and format for...
11 years ago
ErikZalm 652a0f6b5a Merge pull request #717 from drf5n/tpins2
fastio.h: Add AT90USBxx_TEENSYPP_ASSIGNMENTS for teensyduino/Lincomatic/...
11 years ago
ErikZalm 96a0cdc541 Merge pull request #716 from drf5n/maketeensy
Makefile: Update for Arduino 1.0.5 and Teensyduino dependent boards (HAR...
11 years ago
whosawhatsis d24df7af2c M200 implementation 11 years ago
David Forrest f0b8d5ba3d createTemperatureLookupMarlin.py: Change comment to refer to actual program name. 11 years ago
David Forrest 50f44d9249 createTemperatureLookupMarlin.py: Truncate to short after application of OVERSAMPLENR for improved resolution. 11 years ago
David Forrest f5b5dd8038 createTemperatureLookupMarlin.py: Add output of Steinhart-Hart coefficients. 11 years ago
David Forrest 76cf07c3f7 Configuration.h: Use OVERSAMPLENR in dT_PID definition. 11 years ago
David Forrest 476c7193d8 temperature.cpp: Use OVERSAMPLENR in oversampling calculation. 11 years ago
whosawhatsis f08bb8bb6a Previous commit borked. 11 years ago
whosawhatsis 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
whosawhatsis 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
David Forrest 61a7256d42 Enable basic ULTRA_LCD screen w/o encoders and menus. 11 years ago
l.lefebvre fdac8f6cec Update ConfigurationStore.cpp
Unable to compile if ENABLE_AUTO_BED_LEVELING is not set (not set by default).
11 years ago
Alex Borro 05932e4458 Add Z Probe Offset to EEPROM and Ultra LCD 11 years ago
David Forrest 7216583b8b createTemperatureLookupMarlin.py: Add resolution comments and format for Marlin. 11 years ago
David Forrest e8e0697e48 fastio.h: Add AT90USBxx_TEENSYPP_ASSIGNMENTS for teensyduino/Lincomatic/Printrboard compatibility. 11 years ago
David Forrest 75f39fadfc Makefile: Update for Arduino 1.0.5 and Teensyduino dependent boards (HARDWARE_MOTHERBOARD=={8,81,82,83,84}) 11 years ago
daid df194f75e1 Added PT100 support for Ultiboard2 11 years ago
daid 380144c20f Add Ultiboard2 electronics. With PWM current settings. For the few people that have this new board as experiment in their UM-Original. 11 years ago
fsantini 6ae7f7870d Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into ErikZalm
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
11 years ago
Phil Wise 17d6d965dc Use C++ initialization list
This is the recommended approach for object initialization. The change
doesn't affect binary size (although in theory it could make it smaller).
11 years ago
Joseivaldo Benito Junior ce8b9c4fc5 Correct missing parameter from last upmerge
Signed-off-by: Joseivaldo Benito Junior <jrbenito@benito.qsl.br>
11 years ago
Joseivaldo Benito Junior 8e48e24c7f Update Delta example files
Signed-off-by: Joseivaldo Benito Junior <jrbenito@benito.qsl.br>
11 years ago
ErikZalm 46d2443c7d Merge pull request #676 from IVI053/Marlin_v1
Minor improvements for encoder configuration, LCD entry for PSU controll and thermistor pins on RAMPS
11 years ago
- eed053dffb Revert "Made numbering of heat bed thermistor more logical as D8 is bed, D9 is Extruder 2 and D10 is Extruder 1, so T0 should be E1, T1 E1 and T2 bed to be sequential as MOSFET-Outputs"
This reverts commit b7eadb9f37.
11 years ago
Erik van der Zalm 8349fc89a4 Fixed planner bug 11 years ago
Francesco Santini da2a6f9a31 Accurate bed leveling: x loop inside y and zigzag motion 11 years ago
RicardoGA d29615dc0c Z and Y dual stepper drivers error
if you try to enable Z_DUAL_STEPPER_DRIVERS the error "You cannot have dual drivers for both Y and Z" shows even if you don't have defined Y_DUAL_STEPPER_DRIVERS and don't let you compile the firmware

to solve this problem i change this line:

#ifdef Z_DUAL_STEPPER_DRIVERS && Y_DUAL_STEPPER_DRIVERS

to:

#if defined (Z_DUAL_STEPPER_DRIVERS) && defined (Y_DUAL_STEPPER_DRIVERS)

now the error only show if you define both Z_DUAL_STEPPER_DRIVERS and Y_DUAL_STEPPER_DRIVERS
11 years ago
fsantini 5bde7fcb28 Minor code and comment polishing 11 years ago
- 20faff5935 Incorporate PS_DEFAULT_OFF for starting state on LCD menu entry 11 years ago
- e5d3044801 Added posibility to set ENCODER_STEPS_PER_MENU_ITEM in Configuration.h like ENCODER_PULSES_PER_STEP as it depends on it for usability 11 years ago
- b7eadb9f37 Made numbering of heat bed thermistor more logical as D8 is bed, D9 is Extruder 2 and D10 is Extruder 1, so T0 should be E1, T1 E1 and T2 bed to be sequential as MOSFET-Outputs 11 years ago
Michal Dyntar e8786bf110 Added support for Cheaptronic v1 electronic 11 years ago
fsantini cc2925b705 Implemented a least squares fit of the bed equation for auto bed leveling.
The code for the LSQ solver (qr_solve) is copyrighted by John Burkardt and released under LGPL here:
http://people.sc.fsu.edu/~%20jburkardt/c_src/qr_solve/qr_solve.html
(see qr_solve.cpp for further copyright information)
11 years ago
fsantini b64661070e Fixed the plane vector equation to a simpler one (only dependent on the normal)
Removed the calculation of the inverse matrix since the rotation matrix is orthogonal, therefore inverted == transposed.
Much simpler and mathematically robust.
11 years ago
Alex Borro 5c44f6c434 Bed Heater monitoring in Controller Fan
In some cases the Bed Heater FET heats up more then stepper drivers, so
this change add the bed monitoring to the controller fan. As soon as the
bed heater is turned on, the controller fan will run as well.
11 years ago
Alex Borro b33375d438 Z Axis Safe Homing when using Z Probe
Recommended for those who are using the Z Probe for Z Homing (as
Z-Endstop)

This feature has two changes:

1) Allow user to choose where the Z Probe will touch the bed when homing
all axis together (G28) by setting below defines:

Z_SAFE_HOMING_X_POINT
Z_SAFE_HOMING_Y_POINT

2) Prevents the user to perform Z Axis Homing when the Z Probe is
outsite bed.
11 years ago
Alex Borro 35905ea4f9 Allow heaters to stay full On when PWM=127
In previous version, even with PWM = 127, the system turns the FET off
and then on in the next cycle. This bevavior may increase the FET heat
dissipation.
It was fixed keeping the FET always On when PWM=127.
11 years ago
Erik van der Zalm a94e588765 Changed slow buttons behavior. 11 years ago
Erik van der Zalm 69af392554 Added HEATERS_PARALLEL (Request from reifsnyderb)
This allows a hot end with two heaters and a FET for each heater. This is useful if the FET is not capable of heating two heaters.
11 years ago
Erik van der Zalm 48a185d004 Fixed compile errors from bad commits. 11 years ago
ErikZalm 24d1f480b6 Merge pull request #647 from shaggythesheep/newfeature-M226
Implement M226 - GCode Initiated Pause
11 years ago
ErikZalm 95b41413e6 Merge pull request #641 from hugokernel/master
M80 - ATX Power On related modification
11 years ago
ErikZalm 59b96e323e Merge pull request #640 from fmalpartida/SAV-MkI
Added support for BT on AT90USB devices, corrected LCD bug, added new board and LCD
11 years ago
ErikZalm 2433ee6fc8 Merge pull request #637 from justuswilhelm/Marlin_v1
Fix servo control for Melzi v2.0
11 years ago
ErikZalm 3455a2bac2 Merge pull request #636 from PrintToPeer/Marlin_v1
Add UUID support to M115 responses.
11 years ago
Richard Miles dc887ef99b Implement M226 - GCode Initiated Pause
Implemented M226 as described here:
http://reprap.org/wiki/G-code#M226:_Gcode_Initiated_Pause

Waits for pin to be become either HIGH, LOW or the inverse of what it
was before. Allows printing to pause until user interaction
11 years ago
Charles R c244eb860c If you have a switch on suicide pin, this is useful if you want to
start another print with suicide feature after a print without
suicide...
11 years ago
fmalpartida 7b556d2e96 Added BT support on AT90USB devices
Added AT90USB device BT connectivity support using second UART.
11 years ago
Kaz Walker a5e8575829 Add UUID support to M115 responses. 11 years ago
Daniel Benamy cab84e0e5b Add (correct) missing pin definitions for Y2
I tested this and it works.
11 years ago
fmalpartida 5b3f60ea2e Corrected LCD only error
If only an LCD is defined and no menu or keyboard defined, there is a
compilation error.

Added conditional compilation.
11 years ago
Justus Perlwitz 62d0b79023 Fix servo control for Melzi 11 years ago
fmalpartida b5a964fcc5 Initial SAV MkI (RepRap CloneWars board) integration.
Included support for BT dongle on AT90USB boards.
Added LCD Shift Register LCD control
Included support for RepRap Clone Wars project board (SAV MKI).
11 years ago
dumle29 f941203172 PS_ON configurable boot state
Allows the user to select wheter or not the PSU should be turned on or
kept in standby when marlin boots
11 years ago
whosawhatsis c79e3967b3 Make G11 not horribly broken 11 years ago
bkubicek d69822ed51 Fix '#'
since it can occure in comments.
11 years ago
bkubicek 2fb2a0a119 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 11 years ago
bkubicek 39d88bcccb preparation for hibernation
If a print is stopped, it would be nice in the future to write a file with the printer state, the filename of the print, and the position within the print.
this file could be read, to continue a previously stopped print.
not finished yet.
11 years ago
bkubicek ab965376ff Sub-file calls.
by overloading M32 it is now possible to execute gcode files from other gcode files, with a fixed recursion level.
This can be used e.g. for having a real start.g and end.g somewhere on the sd card, which are then called from the normal print file.
Another usecase would be to have macro-files for nozzle-change and layerchange.
I have not tested the speedwise performance. The testing was done with pronterface.

syntax:
normal call from sd card will open the new file and continue executing there.
M32 !/path/filename#
this however will call the new file and return to the caller file.
M32 P !/path/filename#
with the optional "S<position>" the  file starting position can be set.
this is for continuing prints from a previous location.
11 years ago
bkubicek b2cc27e5ea Added a magic character for sd buffering.
if a '#' is read now the buffer will be emptied before reading ahead.
This is so one can execute files from within gcode files, without messing the buffer with preread characters from the caller file.
# can not occure in sd files imho, because it should only occure within checksums in ther serial communication.
Yes, thats a lame argument. If you have a better idea please tell me. It has to be a character that one can type
on a keyboard manually.
11 years ago
Erik van der Zalm 8a08cca0f2 Added temperature status less.
Hopefully fixed viky button handling without braking other boards
11 years ago
Erik van der Zalm 667d278f54 Revert "Fix for Viki display"
This reverts commit 314fd13c39.
11 years ago
Erik van der Zalm bf27e79e74 Small BlinkM fix 11 years ago
Erik van der Zalm 87e28c0599 Added ifdefs to blinkm 11 years ago
Erik van der Zalm 24c6b2ab35 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 11 years ago
ErikZalm 6a803ba9c5 Merge pull request #590 from timkoster/Marlin_v1
Added BlinkM support over i2c
11 years ago
Erik van der Zalm 457d8a0acb Fixed merge conflicts 11 years ago
Alex Borro 6f85a8c7aa Bed auto Leveling change: Raise Z before homing
- Added "Z_RAISE_BEFORE_HOMING" for raising Z the defined distance
before homing. This is useful to avoid Z-Probe collision when hotend is
near bed.

- Fixed the issue of Z not going bellow Z_PROBE_OFFSET when
"min_software_endstops" is true.
Now the Z_PROBE_OFFSET is not set in Z_MIN_POS, it is added after
homing.
11 years ago
Alex Borro dd3086d3f2 Show Temperature ADC values
If "SHOW_TEMP_ADC_VALUES" is defined in Configuration_adv.h, the M105
command will present, after tradicional temperatures, the ADC value read
from temp sensors. This is great for adjusting thermistor tables with
thermocouple.

From Pronterface you can see the ADC value and compare with a
thermocouple reading.. then you just need to create your own thermistor
table.

Since this merge doesnt change the original information, it doesnt mess
with PC software parsing (tested under Pronterface and Repetier-Host).
11 years ago
bkubicek 7fad13a1e2 Reverse SD card file name order.
This is _not_ automatically the cronological, since deleting a file will free
the filesystem descriptor for it, which then will be used by the next file copied on it.
Since this makes the auto0.g file very inaccessible, I put the option back, to have it in the prepare menu.

this should satisfy https://github.com/ErikZalm/Marlin/pull/373

as a reminder, auto0.g will be executed every time after a boot with sd card present and file present.
thereafter, if there is a file auto1.g this will be done. Thats IMHO the best place to put settings, and prepare heating.
I also execute again after each (now again via the prepare menu) before starting a new print/ after a failed one.
It for me 100% replaces any start.gcode form the slicers.
11 years ago
bkubicek b832f5b9f6 added delta tower babystepping. Its untested, but hopefully florian horsch will be able to try.
also, removed some trouble for compilation with corexy.
I think that babystepping is only possible in z for a delta tower.
not sure if it would be usefull to step individual motors on a delta, i don't own one
11 years ago
bkubicek c38b0855c8 I think that filament change is ready for the masses. I have tested very often with my ultimaker.
I strongly vote for it being a single gcode, because otherwise the triggering from the menu is terrible.
11 years ago
bkubicek d147a057ac Add the socalled "Babystepping" feature.
It is a realtime control over the head position via the LCD menu system that works _while_ printing.
Using it, one can e.g. tune the z-position in realtime, while printing the first layer.
Also, lost steps can be manually added/removed, but thats not the prime feature.
Stuff is placed into the Tune->Babystep *

It is not possible to have realtime control via gcode sending due to the buffering, so I did not include a gcode yet. However, it could be added, but it movements will not be realtime then.

Historically, a very similar thing was implemented for the "Kaamermaker" project, while Joris was babysitting his offspring, hence the name.

say goodby to fuddling around with the z-axis.
11 years ago
Erik van der Zalm bca353cc12 Fixed duplicate define in fastio.h 11 years ago
Alex Borro 253dfc4bc1 Bed Auto Leveling feature
Check the Readme for instruction how to enable and configure the feature
11 years ago
ErikZalm 1bda6bf862 Merge pull request #609 from phq1910/patch-1
Update Configuration.h
11 years ago
ErikZalm c80aac1518 Merge pull request #610 from phq1910/patch-2
Update pins.h
11 years ago
Erik van der Zalm 314fd13c39 Fix for Viki display 11 years ago
phq1910 4f7c6dfe35 Update pins.h
Include Pins cpu Sethi 3D
11 years ago
phq1910 57173739a1 Update Configuration.h
Include CPU Sethi 3D
11 years ago
Erik van der Zalm 0dca49a7c0 Added Azteeg X3 board. 11 years ago
Erik van der Zalm d8c2c810b4 Added info to the delta configuration files in the configuration.h file 11 years ago
Erik van der Zalm 9bc88f8bab Placed optional ENCODER_PULSES_PER_STEP in the configuration.h file 11 years ago
Erik van der Zalm 3ca1ca6869 Fixed missing ENCODER_PULSES_PER_STEP 11 years ago
Tim Koster 97b0da0c2e Removed #ifndef BLINKM 11 years ago
Tim Koster 61db046b32 Added #ifdef BLINKM around new code. Also refined BlinkM.h. 11 years ago
Richard Miles 77df2ab0e7 Make Y_DUAL_STEPPER_DRIVERS disabled by default 11 years ago
Richard Miles ed1ab42186 Added Y_DUAL_STEPPER_DRIVERS
Enables two stepper drivers to be used for the Y axis (useful for
Shapeoko style machines)
Each Y driver can be stepped in either the same way or in opposite
directions, accounting for different hardware setups (leadscrew vs. belt
driven)
11 years ago
Richard Miles f4a59e4ce5 Revert "Added Y_DUAL_STEPPER_DRIVERS"
This reverts commit 7ee275b620.
11 years ago
Richard Miles 7ee275b620 Added Y_DUAL_STEPPER_DRIVERS
Enables two stepper drivers to be used for the Y axis (useful for
Shapeoko style machines)
Each Y driver can be stepped either the same way or in opposite
directions, accounting for different hardware setups (leadscrew vs. belt
driven)
11 years ago
ErikZalm 6a1e980c6d Merge pull request #600 from xoan/Encoder_Pulses_Per_Step
add ENCODER_PULSES_PER_STEP
11 years ago
ErikZalm 20076a8bd3 Merge pull request #598 from GDV0/Marlin_v1
FIx compilation error when enabling SERVO_ENDSTOPS (#591)
11 years ago
Erik van der Zalm 3626b5ad8b Removed Delta from the default config file.
Changed EEPROM CHITCHAT behavior. M503 is always enabled.
11 years ago
Xoan Sampaiño bf7007d02f add ENCODER_PULSES_PER_STEP 11 years ago
GDV0 f17506c504 FIx compilation error when enabling SERVO_ENDSTOPS (#591) 11 years ago
Martin Lukasik acd8619809 Fan fix for Panelolu2+Sanguinololu. 11 years ago
George Roberts 595580556c Fixed bug that makes ulticontroller knob backwards introduced Feb 28 2013 by Robert.
Bug introduced in version 6beb42cdf6.
Robert did a good job of simplifying but messed up this chunk of code.

Looking at working version: 839bef6d5d
it seems there is no case where encrot3 should be defined as 2
because if ULTICONTROLLER is defined then NEWPANEL is also defined.
11 years ago
Tim Koster 88dfeefca3 Define BlinkM default disabled 11 years ago
Tim Koster 5350faf2a2 Merge https://github.com/timkoster/MarlinBlinkM into Marlin_v1 11 years ago
Tim Koster 7016cc9511 Added BlinkM support over i2c 11 years ago
Tim Koster 3b315b3da0 Added BlinkM support over i2c 11 years ago
Jim Morris f26f26b7bd Fix the example delta configuration as someone forgot to do it. 11 years ago
Peter Hercek 9aa2229077 add command M666 for adjusting delta printer endstop position 11 years ago
Robert F-C 9547fb9dfb Add duplication and auto-park mode for dual x-carriage support. 12 years ago
Steve Kelly 53614e5144 add pins for rambo lcd 12 years ago
Steve Kelly b42d24e31e add additional pins to avr2560 for rambo lcd 12 years ago
Nicolas Rossi b0c8120fcc Added feedrate setting in exemple config for manual moves from panel 12 years ago
Nicolas Rossi a54fe2d73c Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1
Conflicts:
	Marlin/Marlin_main.cpp
12 years ago
ErikZalm 7ea63d08df Merge pull request #565 from iXce/avrdudeconfpath
Detect OS in Makefile to use the correct avrdude.conf path
12 years ago
ErikZalm 4187b637a5 Merge pull request #570 from hg42/separate-INVERTING-macros-for-MIN-and-MAX-endstops
separate INVERTING for MIN and MAX endstops (6 #defines instead of 3)
12 years ago
ErikZalm 07e7de3600 Merge pull request #569 from hg42/convert-PROTOCOL-macros-from-statements-to-expressions
convert PROTOCOL macros from statements to (multiple, comma separated) expressions
12 years ago
Guillaume Seguin c0c4c97db6 Detect OS in Makefile to use the correct avrdude.conf path 12 years ago
hg42@gmx.net 2ca983568d separate INVERTING for MIN and MAX endstops (6 #defines instead of 3) 12 years ago
hg42@gmx.net 3700f688f5 convert PROTOCOL macros from statements to (multiple, comma separated) expressions 12 years ago
daid a504c88346 Fix a bug where the PID controllers D action kicks in hard as soon as the PID controller starts. 12 years ago
Nicolas Rossi 394ed08f88 Added feedrate setting for manual moves from panel 12 years ago
Nicolas Rossi 9bf1cf1b22 Pre-calculate diagonal rod length squared 12 years ago
Nicolas Rossi 4623e78ce0 Added Honeywell thermistor 135-104LAF-J01 12 years ago
Brendan-csel d7f384f680 Skip SD menu refresh if nothing has changed 12 years ago
Brendan-csel abc8320a68 Save LCD_CLICKED before it is cleared
The SD card menu was refreshing so slowly that the button interrupt was clearing LCD_CLICKED before the menu items could check it.
12 years ago
Guillaume Seguin f4c3135c6d Add Panelolu2 pins for RAMPS1.3 12 years ago
Guillaume Seguin aae42c68f9 Update French translation in language.h 12 years ago
Guillaume Seguin 4d435c38a6 Add support of LiquidTWI2-based panels to Makefile
Use LIQUID_TWI2=1 as make argument to enable this support
12 years ago
Guillaume Seguin 6c42a3a339 Woops, fix logic 12 years ago
Guillaume Seguin 376d8af2c8 Report temperatures for all extruders 12 years ago
ErikZalm 434b6a05c1 Merge pull request #552 from iXce/Marlin_v1
Report temperatures for all extruders in reply to M105
12 years ago
ErikZalm bdc2621119 Merge pull request #561 from Brendan-csel/Marlin_v1
Fix for Viki LCD issues printing from SD card
12 years ago
ErikZalm 6965bd4e15 Merge pull request #560 from njprossi/Marlin_v1
Fixed move from panel for delta bot #557
12 years ago
ErikZalm a55b33e613 Merge pull request #559 from iXce/panelolupinsramps13
Add Panelolu2 pins for RAMPS1.3
12 years ago
ErikZalm 8b34351537 Merge pull request #558 from iXce/frenchupdate
Update French translation in language.h
12 years ago
ErikZalm 735e556724 Merge pull request #555 from iXce/liquidtwi2_makefile
Add support of LiquidTWI2-based panels to Makefile
12 years ago
Brendan-csel d80aecda0a Skip SD menu refresh if nothing has changed 12 years ago
Brendan-csel be2dea1dc6 Save LCD_CLICKED before it is cleared
The SD card menu was refreshing so slowly that the button interrupt was clearing LCD_CLICKED before the menu items could check it.
12 years ago
Nicolas Rossi 55c287a69e Fixed move from panel for delta bot #557 12 years ago
Guillaume Seguin 1902d339b0 Add Panelolu2 pins for RAMPS1.3 12 years ago
Guillaume Seguin eb23a68e92 Update French translation in language.h 12 years ago
ErikZalm 1561c6df51 Merge pull request #547 from wolfmanjm/delta-configuration
Setup Default configuration for Deltas if DELTA is defined
12 years ago
Guillaume Seguin 374bc99fa3 Add support of LiquidTWI2-based panels to Makefile
Use LIQUID_TWI2=1 as make argument to enable this support
12 years ago
Jim Morris ab624eac2a revert COnfiguratiuon to the same as head 12 years ago
Jim Morris 52f79ffeca add an example default configuration for delta style bots 12 years ago
Jim Morris b9d7ccf1cd Merge remote-tracking branch 'upstream/Marlin_v1' into delta-configuration
Conflicts:
	Marlin/Marlin_main.cpp
12 years ago
Guillaume Seguin d4d1540727 Use -fno-use-cxa-atexit to override gcc --enable-cxa_atexit 12 years ago
Guillaume Seguin 01ed99143c Woops, fix logic 12 years ago
Guillaume Seguin 76841450c8 Only display poweron/poweroff if PS_ON_PIN > -1 12 years ago
Guillaume Seguin 44f327d738 Uniformly reindent language.h 12 years ago
Guillaume Seguin 326d2db025 Update language.h so that all languages compile
Some strings still need translation, but at least everything compiles.
12 years ago
Guillaume Seguin 2cb716f513 Run Marlin/language.h through dos2unix 12 years ago
Guillaume Seguin 34da3a0a3f Merge github.com:ErikZalm/Marlin into Marlin_v1
Conflicts:
	Marlin/language.h
12 years ago
Guillaume Seguin 18199ff960 Merge github.com:ErikZalm/Marlin into Marlin_v1 12 years ago
Robert F-C fb5334f428 Fixed compile error when QUICK_HOME is defined.
As well a couple of minor changes to handling of extruder offset for
dual x-carriage mode.
12 years ago
Robert F-C c3568398b5 Disable DUAL_X_CARRIAGE by default 12 years ago
Robert F-C 39cd3dbdbe Remove dual x-carriage functionality that could/should be implemented in slicer
Also added a couple of missed merge lines in homeaxis() from previous
commit.
12 years ago
Jim Morris fb20ceabce enable soft endstops for delta
disable delta by default
12 years ago
Jim Morris d01ee7e7b5 fix zjerk being the same for delta as xy jerk
add more delta defaults
on delta make second home even slower
12 years ago
Robert F-C d7390e13d9 Support dual x-carriage printers
Dual x-carriage designs offer some substantial improvements for dual
extruder printing.
12 years ago
Jim Morris f3aa2a48e7 update max pos 12 years ago
Jim Morris 460751503e Added default configurations for deltas when DELTA is defined 12 years ago
Maik Stohn 9da94c247a fixed bad lcd commit from makr3d
#elsif does not exist #elif is correct
12 years ago
Erik van der Zalm 59004023fd Fixed typo 12 years ago
Erik van der Zalm 461dad6e05 Added : M32 - Select file and start SD print (Can be used when printing from SD card)
Untested
12 years ago
Erik van der Zalm c4a2077951 M109 and M190 now wait when cooling down if R is used instead of S.
M109 S180 waits only when heating.
M109 R180 also waits when cooling.
12 years ago
ErikZalm 8a2a3ef91d Merge pull request #531 from iXce/Marlin_v1_lcd
Only clamp panel movements if software endstops are enabled
12 years ago
Erik van der Zalm 6397b3339c restored configuration.h defaults 12 years ago
Erik van der Zalm cdaaad3df1 Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1 12 years ago
Erik van der Zalm e3bdefd873 fixed missing #endif 12 years ago
Erik van der Zalm a5be0c52c6 no message 12 years ago
Michael Mayer e509cdbeb0 added contrast control function for gLCDs 12 years ago
Michael Mayer 99b7e926e7 added MaKr3d Melzi board 12 years ago
Gabino Lopez 68be33b1fc Update language.h
I update the spanish Messages, now this compile for spanish language.
12 years ago
daid acb3271c9a Merge pull request #534 from xifle/Marlin_v1
Fixes compiler warning for feedrate deadzone
12 years ago
xifle 61fe430d4f Should fix compiler warning for feedrate deadzone 12 years ago
Gord Christmas fde17d5720 Fix for ugly code compilation errors in SERVO_ENDSTOP checks 12 years ago
Guillaume Seguin aa65c20d1f Only clamp panel movements if software endstops are enabled 12 years ago
Erik van der Zalm ecf3ab5de4 Added thermistor 60 to configuration.h 12 years ago
Nicolas Rossi 2daa85918e Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
	Marlin/language.h
	Marlin/pins.h
	Marlin/ultralcd.cpp
12 years ago
Erik van der Zalm 2015989f84 Added DISABLE_MIN_ENDSTOPS 12 years ago
Christian Inci 648d45cfb2 Fix Pin Description Typo
Reverse 'Bed' and 'Fan' at the RAMPS 33 Description.

Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com>
12 years ago
ErikZalm 171719f18c Merge pull request #525 from lajos/ultralcd_pid
ultralcd.cpp compile errors when !defined(PIDTEMP)
12 years ago
lajos b519af4f05 fixed another !defined(PIDTEMP) compile in ultralcd.cpp 12 years ago
lajos 7d03c52511 fixed compile error in ultralcd.cpp when PIDTEMP undefined 12 years ago
lajos 02dee80fa5 added Azteeg X1 motherboard 12 years ago
Henrik Brix Andersen 47dc70e3ec Fix location of avrdude.conf 12 years ago
Henrik Brix Andersen 1d258903bb Allow command line compilation when using BEEPER. 12 years ago
Erik van der Zalm e34c9981ab Delta disabled by default 12 years ago
Erik van der Zalm 26a441fc7d More 3Drag controller patches. 12 years ago
Erik van der Zalm ac975ed8c2 Merge branch 'deltabot' into Marlin_v1 12 years ago
Jim Morris caa848f943 fix homing for deltas 12 years ago
Erik van der Zalm 7ad12be763 Merge branch 'Marlin_v1' of https://github.com/codexmas/Marlin into codexmas-Marlin_v1
Conflicts:
	Marlin/Configuration.h
	README.md
12 years ago
Erik van der Zalm 408169aef4 Merge branch 'Marlin_v1' of https://github.com/BorisLandoni/Marlin into BorisLandoni-Marlin_v1
Conflicts:
	Marlin/Configuration.h
	Marlin/language.h
	Marlin/pins.h
12 years ago
Erik van der Zalm bd96d22bfb Merge branch 'Marlin_v1' into thinkyhead
Conflicts:
	Marlin/Configuration.h
	Marlin/Configuration_adv.h
	Marlin/Marlin.h
	Marlin/Marlin_main.cpp
	Marlin/Servo.cpp
	Marlin/language.h
	Marlin/pins.h
	Marlin/planner.cpp
	Marlin/ultralcd_implementation_hitachi_HD44780.h
	README.md
12 years ago
Erik van der Zalm 73f21cd5d6 Spanish updated so far. 12 years ago
Erik van der Zalm 6f4a6e531c Merge branch 'deltabot' into Marlin_v1 12 years ago
Erik van der Zalm 01edf22a10 Fix home_all_axis to make QUICK_HOME work with Repetier-Host which sends G28 X0 Y0 Z0 instead of G28. Thanks to Matt Schoenholz for reporting this issue. 12 years ago
Erik van der Zalm ff6fa09ecf Moved corexy implementation from stepper to planner
(Thanks iquizzle)
12 years ago
Erik van der Zalm c8dcc7c208 Allow increasing the software PWM frequency. 12 years ago
Erik van der Zalm 8b0d82e9db Removed "awaiting translation" for french 12 years ago
Erik van der Zalm 1e05d192ab Make the beep tone less offensive 12 years ago
Erik van der Zalm 373f3ecab3 Merge branch 'deltabot' of https://github.com/jcrocholl/Marlin into deltabot
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
	Marlin/pins.h
12 years ago
kiyoshigawa f295712008 Trying to fix weird diff on ultralcd_implementation_hitachi_HD44780.h 12 years ago
kiyoshigawa 69b02031ca Fixed small error in lcd define statements. 12 years ago
kiyoshigawa 6a81291c57 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
This should fix issues with pull request 467, I hope.

Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin.pde
	Marlin/ultralcd_implementation_hitachi_HD44780.h
12 years ago
BorisLandoni c1cb5977ee Update Configuration.h 12 years ago
BorisLandoni 8a5bd8a808 Update Configuration.h 12 years ago
BorisLandoni c1d7cf939e Update language.h 12 years ago
BorisLandoni 4c7d1436e9 Update pins.h 12 years ago
BorisLandoni 6588933c04 Update Configuration.h 12 years ago
Scott Lahteine 5dabc95409 Apply all changes from latest Marlin_V1
Diffed and merged, preserving my updates
12 years ago
Gord Christmas a733537ddd Missed some variable declarations
Integrated fixes from henrikbrixandersen pull request #504
12 years ago
Gord Christmas f4f30c9d64 Added servo actuated enstop coding to allow G28 command to engage and retract a servo to specified angles. 12 years ago