6ae7f7870d
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into ErikZalm
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
12 years ago
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).
12 years ago
8f195844dd
Merge pull request #687 from jrbenito/update_delta_config_examples
...
Correct missing parameter from last upmerge
12 years ago
ce8b9c4fc5
Correct missing parameter from last upmerge
...
Signed-off-by: Joseivaldo Benito Junior <jrbenito@benito.qsl.br>
12 years ago
000b710c5f
Merge pull request #684 from jrbenito/update_delta_config_examples
...
Update Delta example files
12 years ago
8e48e24c7f
Update Delta example files
...
Signed-off-by: Joseivaldo Benito Junior <jrbenito@benito.qsl.br>
12 years ago
46d2443c7d
Merge pull request #676 from IVI053/Marlin_v1
...
Minor improvements for encoder configuration, LCD entry for PSU controll and thermistor pins on RAMPS
12 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
12 years ago
3e568efe67
Merge pull request #657 from hcker2000/patch-1
...
Added new board
12 years ago
8349fc89a4
Fixed planner bug
12 years ago
da2a6f9a31
Accurate bed leveling: x loop inside y and zigzag motion
12 years ago
532289e851
Merge pull request #677 from RicardoGA/patch-1
...
Z and Y dual stepper drivers error
12 years ago
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
12 years ago
5bde7fcb28
Minor code and comment polishing
12 years ago
20faff5935
Incorporate PS_DEFAULT_OFF for starting state on LCD menu entry
12 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
12 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
12 years ago
e016a720f4
Merge pull request #675 from forrestg/master
...
Added support for Cheaptronic v1 electronic
12 years ago
e8786bf110
Added support for Cheaptronic v1 electronic
12 years ago
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)
12 years ago
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.
12 years ago
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.
12 years ago
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.
12 years ago
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.
12 years ago
ad588e8990
Added new board for those of us with sanguinololu boards with ceramic resonators
12 years ago
a94e588765
Changed slow buttons behavior.
12 years ago
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.
12 years ago
48a185d004
Fixed compile errors from bad commits.
12 years ago
24d1f480b6
Merge pull request #647 from shaggythesheep/newfeature-M226
...
Implement M226 - GCode Initiated Pause
12 years ago
95b41413e6
Merge pull request #641 from hugokernel/master
...
M80 - ATX Power On related modification
12 years ago
59b96e323e
Merge pull request #640 from fmalpartida/SAV-MkI
...
Added support for BT on AT90USB devices, corrected LCD bug, added new board and LCD
12 years ago
2433ee6fc8
Merge pull request #637 from justuswilhelm/Marlin_v1
...
Fix servo control for Melzi v2.0
12 years ago
3455a2bac2
Merge pull request #636 from PrintToPeer/Marlin_v1
...
Add UUID support to M115 responses.
12 years ago
ec1cf6e7f8
Merge pull request #635 from dbenamy/Marlin_v1
...
Add (correct) missing pin definitions for Y2
12 years ago
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
12 years ago
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...
12 years ago
7b556d2e96
Added BT support on AT90USB devices
...
Added AT90USB device BT connectivity support using second UART.
12 years ago
a5e8575829
Add UUID support to M115 responses.
12 years ago
cab84e0e5b
Add (correct) missing pin definitions for Y2
...
I tested this and it works.
12 years ago
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.
12 years ago
62d0b79023
Fix servo control for Melzi
12 years ago
c184f808f7
Merge pull request #632 from dbenamy/Marlin_v1
...
Made instructions more clear.
12 years ago
c886f5cb13
Made instructions more clear.
...
Not sure what happened to my last commit so this includes that one + reordering the steps.
12 years ago
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).
12 years ago
4382068f92
Merge pull request #630 from dumle29/Marlin_v1
...
PS_ON configurable boot state
12 years ago
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
12 years ago
47854ff5ce
Merge pull request #629 from whosawhatsis/Marlin_v1
...
Make G11 not horribly broken
12 years ago
c79e3967b3
Make G11 not horribly broken
12 years ago
5b8b939a1f
Add comments about RAMPS 5V rail for servos.
12 years ago
d69822ed51
Fix '#'
...
since it can occure in comments.
12 years ago
fsantini