SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
3501 commits 1 branch 0 tags 118 MiB
Commit graph

3501 commits

This branch
This branch
All branches
Author SHA1 Message Date
whosawhatsis
f08bb8bb6a Previous commit borked. 2014-01-19 22:06:45 -08:00
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.
 2014-01-19 19:22:08 -08:00
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.
 2014-01-19 19:11:51 -08:00
David Forrest
61a7256d42 Enable basic ULTRA_LCD screen w/o encoders and menus. 2014-01-17 17:00:47 -05:00
alexborro
c724c762a2 Merge pull request #720 from sourceperl/Marlin_v1 
Update ConfigurationStore.cpp
 2014-01-17 07:15:35 -08:00
l.lefebvre
fdac8f6cec Update ConfigurationStore.cpp 
Unable to compile if ENABLE_AUTO_BED_LEVELING is not set (not set by default).
 2014-01-17 16:09:58 +01:00
Alex Borro
05932e4458 Add Z Probe Offset to EEPROM and Ultra LCD 2014-01-16 18:13:46 -02:00
David Forrest
7216583b8b createTemperatureLookupMarlin.py: Add resolution comments and format for Marlin. 2014-01-16 12:40:15 -05:00
David Forrest
e8e0697e48 fastio.h: Add AT90USBxx_TEENSYPP_ASSIGNMENTS for teensyduino/Lincomatic/Printrboard compatibility. 2014-01-16 11:23:29 -05:00
David Forrest
75f39fadfc Makefile: Update for Arduino 1.0.5 and Teensyduino dependent boards (HARDWARE_MOTHERBOARD=={8,81,82,83,84}) 2014-01-16 10:58:35 -05:00
daid
df194f75e1 Added PT100 support for Ultiboard2 2014-01-06 11:20:03 +01:00
daid
380144c20f Add Ultiboard2 electronics. With PWM current settings. For the few people that have this new board as experiment in their UM-Original. 2014-01-06 11:05:02 +01:00
alexborro
89a304fd98 Merge pull request #673 from fsantini/ErikZalm 
Improvements to the auto bed leveling feature
 2013-12-23 03:46:31 -08:00
fsantini
6ae7f7870d Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into ErikZalm 
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
 2013-12-23 12:20:32 +01:00
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).
 2013-12-19 21:21:46 +00:00
ErikZalm
8f195844dd Merge pull request #687 from jrbenito/update_delta_config_examples 
Correct missing parameter from last upmerge
 2013-12-19 00:15:16 -08:00
Joseivaldo Benito Junior
ce8b9c4fc5 Correct missing parameter from last upmerge 
Signed-off-by: Joseivaldo Benito Junior <jrbenito@benito.qsl.br>
 2013-12-19 00:50:44 -02:00
ErikZalm
000b710c5f Merge pull request #684 from jrbenito/update_delta_config_examples 
Update Delta example files
 2013-12-18 00:01:24 -08:00
Joseivaldo Benito Junior
8e48e24c7f Update Delta example files 
Signed-off-by: Joseivaldo Benito Junior <jrbenito@benito.qsl.br>
 2013-12-18 00:04:36 -02:00
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
 2013-12-17 02:28:28 -08:00
-
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.
 2013-12-16 12:22:06 +01:00
ErikZalm
3e568efe67 Merge pull request #657 from hcker2000/patch-1 
Added new board
 2013-12-16 02:53:49 -08:00
Erik van der Zalm
8349fc89a4 Fixed planner bug 2013-12-16 11:40:23 +01:00
Francesco Santini
da2a6f9a31 Accurate bed leveling: x loop inside y and zigzag motion 2013-12-13 10:31:19 +01:00
ErikZalm
532289e851 Merge pull request #677 from RicardoGA/patch-1 
Z and Y dual stepper drivers error
 2013-12-11 12:52:39 -08:00
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
 2013-12-11 14:37:43 -06:00
fsantini
5bde7fcb28 Minor code and comment polishing 2013-12-11 21:27:43 +01:00
-
20faff5935 Incorporate PS_DEFAULT_OFF for starting state on LCD menu entry 2013-12-08 21:35:57 +01:00
-
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 2013-12-08 21:34:56 +01:00
-
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 2013-12-08 21:30:42 +01:00
ErikZalm
e016a720f4 Merge pull request #675 from forrestg/master 
Added support for Cheaptronic v1 electronic
 2013-12-07 05:56:24 -08:00
Michal Dyntar
e8786bf110 Added support for Cheaptronic v1 electronic 2013-12-07 13:29:47 +01:00
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)
 2013-12-06 21:46:25 +01:00
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.
 2013-12-06 21:32:21 +01:00
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.
 2013-11-27 23:23:06 -02:00
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.
 2013-11-27 22:37:35 -02:00
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.
 2013-11-27 18:13:38 -02:00
hcker2000
ad588e8990 Added new board for those of us with sanguinololu boards with ceramic resonators 2013-11-18 15:49:36 -05:00
Erik van der Zalm
a94e588765 Changed slow buttons behavior. 2013-11-17 17:41:30 +01:00
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.
 2013-11-17 13:29:02 +01:00
Erik van der Zalm
48a185d004 Fixed compile errors from bad commits. 2013-11-10 16:36:37 +01:00
ErikZalm
24d1f480b6 Merge pull request #647 from shaggythesheep/newfeature-M226 
Implement M226 - GCode Initiated Pause
 2013-11-10 07:27:01 -08:00
ErikZalm
95b41413e6 Merge pull request #641 from hugokernel/master 
M80 - ATX Power On related modification
 2013-11-10 07:26:35 -08:00
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
 2013-11-10 07:26:08 -08:00
ErikZalm
2433ee6fc8 Merge pull request #637 from justuswilhelm/Marlin_v1 
Fix servo control for Melzi v2.0
 2013-11-10 07:22:12 -08:00
ErikZalm
3455a2bac2 Merge pull request #636 from PrintToPeer/Marlin_v1 
Add UUID support to M115 responses.
 2013-11-10 07:21:46 -08:00
ErikZalm
ec1cf6e7f8 Merge pull request #635 from dbenamy/Marlin_v1 
Add (correct) missing pin definitions for Y2
 2013-11-10 07:20:49 -08:00
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
 2013-11-09 15:11:58 +00:00
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...
 2013-11-04 12:04:04 +01:00
fmalpartida
7b556d2e96 Added BT support on AT90USB devices 
Added AT90USB device BT connectivity support using second UART.
 2013-11-03 19:57:06 +01:00