3dc9e478ad
Merge pull request #1143 from Silly105/Marlin_v1
Changed graphic LCD info screen to match the set # of extruders
10 years ago
0d97dec434
Adaption of LCD info screen
Here comes a compile-time operation to match the extruder symbols on the
info screen to the set number of extruders in configuration.h.
When only one extruder is selected, the "1" on the symbol will not be
displayed.
10 years ago
1651ccc0cc
Added Filament Sensor to the README
Added some background on the filament sensor to explain it better.
10 years ago
3b1ab84536
Display Filament Sensor data on graphic LCD
Added support to show the filament width on the status line of the
graphic LCD. The status will show for 5 sec and then switch over to
data. Status can be seen by clicking the button.
10 years ago
d84934d8c5
Display Filament Sensor data on 20x4 LCD
Changes to support displaying the real-time filament width and the
volume factor on a 20x4 LCD. The data is displayed on the 4th line.
First the status message is displayed for 5 seconds, and then the
filament data is displayed. The status message can be seen by
re-selecting the info screen in the menu.
10 years ago
4ffdbcbd4e
Merge pull request #1138 from filipmu/Marlin_v1
Comment out the FILAMENT_SENSOR define by default in config.
10 years ago
5c8107bcdd
Commented out FILAMENT_SENSOR #define
Commented out the FILAMENT_SENSOR define so that it is not enabled by
default. Code does not work on all hardware variants.
10 years ago
df7c80335a
Merge pull request #3 from filipmu/Marlin_v1
Sync up from my Marlin_v1 to Filament-sensor
10 years ago
b014fd1ad2
Merge pull request #2 from ErikZalm/Marlin_v1
Sync up to Marlin
10 years ago
443b648863
Merge pull request #1133 from monkeydave/update_delta_config
Updated example configurations for Delta printers
10 years ago
377dfb182f
Updated example configurations for Delta printers
10 years ago
b81021f475
Merge https://github.com/ErikZalm/Marlin into Marlin_v1
10 years ago
724197454c
Merge pull request #1104 from ch100/Marlin_v1
Fixed typo.
10 years ago
058e446531
Merge pull request #1037 from filipmu/Filament-Sensor
Support for a filament diameter sensor
10 years ago
110c5dcf23
Fixed typo.
Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com>
10 years ago
256c25a843
Merge pull request #1101 from MattStultz/patch-1
Fix "add_homeing" to "add_homing" to match changes
10 years ago
ca30aee903
Fix "add_homeing" to "add_homing" to match changes
10 years ago
0733825fb1
Merge pull request #1099 from Fourmi/Marlin_v1
Update line 627 ,wrong number on thermistortables
10 years ago
af3e4d7510
Update line 627 ,wrong number on thermistortables
Wrong number on line 627 > i change number "12" by the correct number "13"
Soory
10 years ago
aaaf8fe8dd
Merge pull request #1068 from darkjavi/Marlin_v1
Added profile for RAMPS with 2 extruders and 1 fan, no heated bed
10 years ago
b360306881
Merge pull request #1073 from WingTangWong/wing-fix-float-delta
Wing fix float delta
10 years ago
ce85515428
Merge pull request #1082 from Fourmi/Marlin_v1
Add thermistor table
10 years ago
764921bdbf
Merge pull request #1091 from Aldert/patch-1
Update motion_control.cpp
10 years ago
c40c7b589b
Merge pull request #1095 from thinkyhead/codeclean
Simple code cleanup. Rename "homeing" to homing.
10 years ago
0f2e0525df
Merge pull request #1096 from thinkyhead/set-home
Proposed feature: Set Home Offsets
10 years ago
5ae02a361b
Merge pull request #1097 from thinkyhead/round-up-xyz
Adjust the Z display to hide float rounding errors
10 years ago
83037542aa
Merge pull request #1098 from mattsch/optional_hotend_lcd
Make hotend optional when compiling with lcd support
10 years ago
fb34265d75
Make hotend optional when compiling with lcd support
Signed-off-by: Matthew Schick <matthew.schick@gmail.com>
10 years ago
6e343ef2f0
Adjust the Z display to hide float rounding errors
10 years ago
2f6c57eadc
Proposed feature: Set Home Offsets
Add an item to the LCD menu that applies the current axis position to
the “add_homeing” offset.
10 years ago
f989bd5435
Simple code cleanup. Rename "homeing" to homing.
10 years ago
6c5a460e65
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
10 years ago
d1e4237e1d
Update motion_control.cpp
G03 Full circle did not work (G02 is working correct)
10 years ago
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
10 years ago
b5dc228a7a
Update configuration.h
Add another comment for thermistor 13 ,use with Hotend "Simple ONE & All In ONE"
10 years ago
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
10 years ago
c35736a140
Update thermistortables.h
Add another thermistor table,use with hotend "Simple ONE" & "All in ONE"
10 years ago
cb4a6dd2dc
Merge pull request #1065 from oliasmage/Marlin_v1
Corrected retract() call for use of auto probe without sled enabled.
10 years ago
5b66810580
Merge pull request #1078 from brackendawson/Marlin_v1
Fix build for non-sled bed auto levelling
10 years ago
01e9b536cb
Fix build for non-sled bed auto levelling
This function should only be used with sled, not all bed auto
levelling.
10 years ago
58eabd21fb
Added ifndef
10 years ago
88d12a762a
Added #ifndef DELTA wrapper to float delta
10 years ago
bf0ecedf60
Merge pull request #1051 from fsantini/EZ_fix935
Fix issue 935: error in matrix calculation
10 years ago
9bc7aec349
Update README.md
Added the new m-codes to this document.
10 years ago
40ba644bb4
Added profile for RAMPS with 2 extruders and 1 fan.
modified: Marlin/Configuration.h
modified: Marlin/pins.h
10 years ago
3b8216bdd1
Corrected #endif and ifdef for Z_PROBE_SLED code.
10 years ago
37799f70ba
Corrected retract() call for use of auto probe without sled enabled.
10 years ago
1632e5e38a
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
10 years ago
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.
10 years ago
1d62309d2a
Merge pull request #1053 from foosel/fix/translated_serial_protocol
thanks...
10 years ago
galexander1
Jonas
Filip Mulier
Bernhard Kubicek
David
Neil Darlow
Erik van der Zalm
Christian Inci
Matt Stultz
Fourmi
Matthew Schick
Scott Lahteine
Aldert
Bracken Dawson
Wing Tang Wong
alexborro
Javi
Charles Bell