1035 Commits (89a304fd9831bfc66bd23ef2e708e3887f2bdbf1)

Author SHA1 Message Date
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
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