bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity
7,234 Commits 1 Branch 4 Tags 151 MiB
9e22184936
Commit Graph

7234 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
galexander1
443b648863 Merge pull request #1133 from monkeydave/update_delta_config 
Updated example configurations for Delta printers
 2014-11-03 08:14:54 -05:00
David
377dfb182f Updated example configurations for Delta printers 2014-11-02 21:04:54 +00:00
Neil Darlow
b81021f475 Merge https://github.com/ErikZalm/Marlin into Marlin_v1 2014-10-21 12:06:56 +01:00
Erik van der Zalm
724197454c Merge pull request #1104 from ch100/Marlin_v1 
Fixed typo.
 2014-10-11 23:10:00 +02:00
Erik van der Zalm
058e446531 Merge pull request #1037 from filipmu/Filament-Sensor 
Support for a filament diameter sensor
 2014-10-11 22:56:01 +02:00
Christian Inci
110c5dcf23 Fixed typo. 
Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com>
 2014-10-11 00:25:36 +02:00
galexander1
256c25a843 Merge pull request #1101 from MattStultz/patch-1 
Fix "add_homeing" to "add_homing" to match changes
 2014-10-07 08:20:53 -04:00
Matt Stultz
ca30aee903 Fix "add_homeing" to "add_homing" to match changes 2014-10-07 00:16:27 -04:00
Erik van der Zalm
0733825fb1 Merge pull request #1099 from Fourmi/Marlin_v1 
Update line 627 ,wrong number on thermistortables
 2014-10-06 14:36:00 +02:00
Fourmi
af3e4d7510 Update line 627 ,wrong number on thermistortables 
Wrong number on line 627 > i change number "12" by the correct number "13"
Soory
 2014-10-06 14:21:44 +02:00
Erik van der Zalm
aaaf8fe8dd Merge pull request #1068 from darkjavi/Marlin_v1 
Added profile for RAMPS with 2 extruders and 1 fan, no heated bed
 2014-10-06 13:41:38 +02:00
Erik van der Zalm
b360306881 Merge pull request #1073 from WingTangWong/wing-fix-float-delta 
Wing fix float delta
 2014-10-06 13:41:01 +02:00
Erik van der Zalm
ce85515428 Merge pull request #1082 from Fourmi/Marlin_v1 
Add thermistor table
 2014-10-06 13:39:36 +02:00
Erik van der Zalm
764921bdbf Merge pull request #1091 from Aldert/patch-1 
Update motion_control.cpp
 2014-10-06 13:37:19 +02:00
Erik van der Zalm
c40c7b589b Merge pull request #1095 from thinkyhead/codeclean 
Simple code cleanup. Rename "homeing" to homing.
 2014-10-06 13:36:48 +02:00
Erik van der Zalm
0f2e0525df Merge pull request #1096 from thinkyhead/set-home 
Proposed feature: Set Home Offsets
 2014-10-06 13:36:11 +02:00
Erik van der Zalm
5ae02a361b Merge pull request #1097 from thinkyhead/round-up-xyz 
Adjust the Z display to hide float rounding errors
 2014-10-06 13:35:00 +02:00
Erik van der Zalm
83037542aa Merge pull request #1098 from mattsch/optional_hotend_lcd 
Make hotend optional when compiling with lcd support
 2014-10-06 13:34:37 +02:00
Matthew Schick
fb34265d75 Make hotend optional when compiling with lcd support 
Signed-off-by: Matthew Schick <matthew.schick@gmail.com>
 2014-10-06 00:19:07 -04:00
Scott Lahteine
6e343ef2f0 Adjust the Z display to hide float rounding errors 2014-10-05 18:34:54 -07:00
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.
 2014-10-05 13:35:45 -07:00
Scott Lahteine
f989bd5435 Simple code cleanup. Rename "homeing" to homing. 2014-10-05 13:20:53 -07:00
Neil Darlow
6c5a460e65 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-10-05 12:54:54 +01:00
Aldert
d1e4237e1d Update motion_control.cpp 
G03 Full circle did not work (G02 is working correct)
 2014-10-04 09:24:09 +02:00
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
 2014-09-27 09:05:10 +02:00
Fourmi
b5dc228a7a Update configuration.h 
Add another comment for thermistor 13 ,use with Hotend "Simple ONE & All In ONE"
 2014-09-27 09:02:58 +02:00
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
 2014-09-26 22:01:06 +02:00
Fourmi
c35736a140 Update thermistortables.h 
Add another thermistor table,use with hotend "Simple ONE" & "All in ONE"
 2014-09-26 21:49:07 +02:00
galexander1
cb4a6dd2dc Merge pull request #1065 from oliasmage/Marlin_v1 
Corrected retract() call for use of auto probe without sled enabled.
 2014-09-19 15:12:09 -04:00
galexander1
5b66810580 Merge pull request #1078 from brackendawson/Marlin_v1 
Fix build for non-sled bed auto levelling
 2014-09-19 15:05:34 -04:00
Bracken Dawson
01e9b536cb Fix build for non-sled bed auto levelling 
This function should only be used with sled, not all bed auto
levelling.
 2014-09-19 19:42:32 +01:00
Wing Tang Wong
58eabd21fb Added ifndef 2014-09-16 14:31:58 -07:00
Wing Tang Wong
88d12a762a Added #ifndef DELTA wrapper to float delta 2014-09-16 14:29:44 -07:00
alexborro
bf0ecedf60 Merge pull request #1051 from fsantini/EZ_fix935 
Fix issue 935: error in matrix calculation
 2014-09-14 21:49:15 -03:00
filipmu
9bc7aec349 Update README.md 
Added the new m-codes to this document.
 2014-09-06 21:55:47 -05:00
Javi
40ba644bb4 Added profile for RAMPS with 2 extruders and 1 fan. 
modified:   Marlin/Configuration.h
	modified:   Marlin/pins.h
 2014-09-06 02:53:36 +02:00
Charles Bell
3b8216bdd1 Corrected #endif and ifdef for Z_PROBE_SLED code. 2014-09-04 16:40:22 -04:00
Charles Bell
37799f70ba Corrected retract() call for use of auto probe without sled enabled. 2014-09-04 14:36:39 -04:00
Neil Darlow
1632e5e38a Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-09-04 12:21:35 +01:00
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.
 2014-09-01 06:26:19 -05:00
Bernhard Kubicek
1d62309d2a Merge pull request #1053 from foosel/fix/translated_serial_protocol 
thanks...
 2014-08-30 10:38:09 +02:00
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 ErikZalm/Marlin#1052
 2014-08-29 18:02:59 +02:00
fsantini
cf325ba240 Fix issue 935: error in matrix calculation 2014-08-28 21:10:50 +02:00
Erik van der Zalm
018b68a5c4 Merge pull request #976 from cocktailyogi/SCARA_by_Yogi 
Implemented SCARA-Maths
 2014-08-28 16:32:52 +02:00
Erik van der Zalm
dde61d8886 Merge pull request #977 from OskarLinde/Marlin_v1 
Fix lcd itostr3() to handle negative numbers
 2014-08-28 16:31:53 +02:00
Erik van der Zalm
0fbfb1bf82 Merge pull request #991 from bonm014/patch-1 
Leapfrog controller board support
 2014-08-28 16:27:52 +02:00
Erik van der Zalm
8340ca6e05 Merge pull request #992 from Grogyan/patch-1 
temperature.cpp fixes for SD card and MAX6675
 2014-08-28 16:27:14 +02:00
Erik van der Zalm
9887555192 Merge pull request #998 from darconeous/pull-requests/fwretract 
FWRETRACT fixes
 2014-08-28 16:24:51 +02:00
Erik van der Zalm
105571ec68 Merge pull request #1005 from midopple/Marlin_v1 
With option DISABLE_INACTIVE_EXTRUDER the extruder is disable to early
 2014-08-28 16:24:14 +02:00
Erik van der Zalm
68dd5e635e Merge pull request #1024 from oliasmage/Marlin_v1 
Adding Z Probe via sled mounted endstop
 2014-08-28 16:15:54 +02:00