662fe8288b
kill DEADJOE
10 years ago
aad336eb81
Merge branch 'lcd_wait_better' of https://github.com/thinkyhead/Marlin into lcd_wait_better
10 years ago
5874852501
get latest Marlin_v1 changes
10 years ago
12b51d6060
Ignore S and P if no value >0 is included.
10 years ago
d12b24758a
Clear LCD to welcome_msg if not printing
The welcome message is more appropriate than “resuming print” if
nothing is printing.
10 years ago
3f54c9ba33
Relocate click ignore code into info screen
10 years ago
92e21d3ee2
M0-M1 Enhancements
Allow M0 and M1 to include a message string. Ignore clicks on “Wait for
user” so that the Info Screen stays up.
10 years ago
5714f64927
get latest Marlin_v1 changes
10 years ago
d407a43ac1
Ignore S and P if no value >0 is included.
10 years ago
7681711e7e
Clear LCD to welcome_msg if not printing
The welcome message is more appropriate than “resuming print” if
nothing is printing.
10 years ago
aa4160ba62
Relocate click ignore code into info screen
10 years ago
cd769781a1
M0-M1 Enhancements
Allow M0 and M1 to include a message string. Ignore clicks on “Wait for
user” so that the Info Screen stays up.
10 years ago
90eb266139
Merge pull request #1148 from krasin/travis
Add Travis CI config to build Marlin firmware.
10 years ago
d078c7c29f
Add Travis CI config to build Marlin firmware.
10 years ago
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
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
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
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
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
Scott Lahteine
galexander1
Ivan Krasin
Jonas
Bernhard Kubicek
Filip Mulier
David
Erik van der Zalm
Christian Inci
Matt Stultz
Fourmi
Matthew Schick
Aldert
Bracken Dawson
Wing Tang Wong