Commit Graph

1784 Commits (2b9722f38713bbe4bb664013fa157e5a32ec3e16)
 

Author SHA1 Message Date
galexander1 443b648863 Merge pull request from monkeydave/update_delta_config
Updated example configurations for Delta printers
David 377dfb182f Updated example configurations for Delta printers
Neil Darlow b81021f475 Merge https://github.com/ErikZalm/Marlin into Marlin_v1
Erik van der Zalm 724197454c Merge pull request from ch100/Marlin_v1
Fixed typo.
Erik van der Zalm 058e446531 Merge pull request from filipmu/Filament-Sensor
Support for a filament diameter sensor
Christian Inci 110c5dcf23 Fixed typo.
Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com>
galexander1 256c25a843 Merge pull request from MattStultz/patch-1
Fix "add_homeing" to "add_homing" to match changes
Matt Stultz ca30aee903 Fix "add_homeing" to "add_homing" to match changes
Erik van der Zalm 0733825fb1 Merge pull request from Fourmi/Marlin_v1
Update line 627 ,wrong number on thermistortables
Fourmi af3e4d7510 Update line 627 ,wrong number on thermistortables
Wrong number on line 627 > i change number "12" by the correct number "13"
Soory
Erik van der Zalm aaaf8fe8dd Merge pull request from darkjavi/Marlin_v1
Added profile for RAMPS with 2 extruders and 1 fan, no heated bed
Erik van der Zalm b360306881 Merge pull request from WingTangWong/wing-fix-float-delta
Wing fix float delta
Erik van der Zalm ce85515428 Merge pull request from Fourmi/Marlin_v1
Add thermistor table
Erik van der Zalm 764921bdbf Merge pull request from Aldert/patch-1
Update motion_control.cpp
Erik van der Zalm c40c7b589b Merge pull request from thinkyhead/codeclean
Simple code cleanup. Rename "homeing" to homing.
Erik van der Zalm 0f2e0525df Merge pull request from thinkyhead/set-home
Proposed feature: Set Home Offsets
Erik van der Zalm 5ae02a361b Merge pull request from thinkyhead/round-up-xyz
Adjust the Z display to hide float rounding errors
Erik van der Zalm 83037542aa Merge pull request from mattsch/optional_hotend_lcd
Make hotend optional when compiling with lcd support
Matthew Schick fb34265d75 Make hotend optional when compiling with lcd support
Signed-off-by: Matthew Schick <matthew.schick@gmail.com>
Scott Lahteine 6e343ef2f0 Adjust the Z display to hide float rounding errors
Scott Lahteine 2f6c57eadc Proposed feature: Set Home Offsets
Add an item to the LCD menu that applies the current axis position to
the “add_homeing” offset.
Scott Lahteine f989bd5435 Simple code cleanup. Rename "homeing" to homing.
Neil Darlow 6c5a460e65 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Aldert d1e4237e1d Update motion_control.cpp
G03 Full circle did not work (G02 is working correct)
Fourmi a664763e6f Update thermistortables.h
Add another thermistor table (13),it's a cartridge thermistor up to +300°C,use with Hotend "Simple ONE" & "All In ONE"

Thx
Fourmi b5dc228a7a Update configuration.h
Add another comment for thermistor 13 ,use with Hotend "Simple ONE & All In ONE"
Fourmi 3cbb2f56c6 Update configuration.h
Add another comment on configuration.h for the value of thermistor.
I make a pull request on thermistortables.h with my thermistor (12),but y see there is a comment on configuration with number 12 but it's not present on thermistortables.h ?

Thx
Fourmi c35736a140 Update thermistortables.h
Add another thermistor table,use with hotend "Simple ONE" & "All in ONE"
galexander1 cb4a6dd2dc Merge pull request from oliasmage/Marlin_v1
Corrected retract() call for use of auto probe without sled enabled.
galexander1 5b66810580 Merge pull request from brackendawson/Marlin_v1
Fix build for non-sled bed auto levelling
Bracken Dawson 01e9b536cb Fix build for non-sled bed auto levelling
This function should only be used with sled, not all bed auto
levelling.
Wing Tang Wong 58eabd21fb Added ifndef
Wing Tang Wong 88d12a762a Added #ifndef DELTA wrapper to float delta
alexborro bf0ecedf60 Merge pull request from fsantini/EZ_fix935
Fix issue 935: error in matrix calculation
filipmu 9bc7aec349 Update README.md
Added the new m-codes to this document.
Javi 40ba644bb4 Added profile for RAMPS with 2 extruders and 1 fan.
modified:   Marlin/Configuration.h
	modified:   Marlin/pins.h
Charles Bell 3b8216bdd1 Corrected #endif and ifdef for Z_PROBE_SLED code.
Charles Bell 37799f70ba Corrected retract() call for use of auto probe without sled enabled.
Neil Darlow 1632e5e38a Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Filip Mulier fe3a09bbcf Correct analog sampling time for additional A to D sample
Adjusted the  #define PID_dT to reflect 10 A to D sample steps, vs
original 8.
Bernhard Kubicek 1d62309d2a Merge pull request from foosel/fix/translated_serial_protocol
thanks...
Gina Häußge 1e9dc85148 Do not use translations for the serial console messages
The serial protocol has to stay machine readable, without having
to cope with a ton of different human language variants. So
just leave it at the original english version.

Should fix 
fsantini cf325ba240 Fix issue 935: error in matrix calculation
Erik van der Zalm 018b68a5c4 Merge pull request from cocktailyogi/SCARA_by_Yogi
Implemented SCARA-Maths
Erik van der Zalm dde61d8886 Merge pull request from OskarLinde/Marlin_v1
Fix lcd itostr3() to handle negative numbers
Erik van der Zalm 0fbfb1bf82 Merge pull request from bonm014/patch-1
Leapfrog controller board support
Erik van der Zalm 8340ca6e05 Merge pull request from Grogyan/patch-1
temperature.cpp fixes for SD card and MAX6675
Erik van der Zalm 9887555192 Merge pull request from darconeous/pull-requests/fwretract
FWRETRACT fixes
Erik van der Zalm 105571ec68 Merge pull request from midopple/Marlin_v1
With option DISABLE_INACTIVE_EXTRUDER the extruder is disable to early
Erik van der Zalm 68dd5e635e Merge pull request from oliasmage/Marlin_v1
Adding Z Probe via sled mounted endstop