101 Commits (07c6b5ab717d41ea5bd827e6e5a5ed763cafc362)

Author SHA1 Message Date
Scott Lahteine e4b98011cf And one more...
10 years ago
Bo Herrmannsen 31ca3de72f Merge pull request #819 from neildarlow/Marlin_v1
10 years ago
Bo Herrmannsen e83cfc0a62 Merge pull request #1163 from thinkyhead/lcd_abort_message
10 years ago
Bo Herrmannsen 0b310ab6c5 Merge pull request #1153 from xinfab/negative_values_in_menu
10 years ago
Bo Herrmannsen 91d740e128 Merge pull request #1141 from filipmu/Filament-Sensor
10 years ago
Scott Lahteine ae081d0fe0 Improvements, more SORT_USES_MORE_RAM
10 years ago
Scott Lahteine 0cbbba08bd SD Card Alpha Sorting
10 years ago
Scott Lahteine 3ebfd29312 Print a message when printing is aborted
10 years ago
Neil Darlow 64139f5e5a Merge https://github.com/ErikZalm/Marlin into Marlin_v1
10 years ago
Scott Lahteine 3f54c9ba33 Relocate click ignore code into info screen
10 years ago
Scott Lahteine 92e21d3ee2 M0-M1 Enhancements
10 years ago
Lionello Lunesu 0d35b1d0b8 Allow negative values in menus
10 years ago
Filip Mulier d84934d8c5 Display Filament Sensor data on 20x4 LCD
10 years ago
Neil Darlow b81021f475 Merge https://github.com/ErikZalm/Marlin into Marlin_v1
10 years ago
Christian Inci 110c5dcf23 Fixed typo.
10 years ago
Matt Stultz ca30aee903 Fix "add_homeing" to "add_homing" to match changes
10 years ago
Erik van der Zalm 0f2e0525df Merge pull request #1096 from thinkyhead/set-home
10 years ago
Matthew Schick fb34265d75 Make hotend optional when compiling with lcd support
10 years ago
Scott Lahteine 2f6c57eadc Proposed feature: Set Home Offsets
10 years ago
Neil Darlow 1632e5e38a Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
10 years ago
Erik van der Zalm 018b68a5c4 Merge pull request #976 from cocktailyogi/SCARA_by_Yogi
10 years ago
Erik van der Zalm dde61d8886 Merge pull request #977 from OskarLinde/Marlin_v1
10 years ago
Neil Darlow 3cd7dbcc45 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
cocktailyogi 2f4a20257c imported last Marlin changes
11 years ago
daid aacff0d361 Merge pull request #948 from Dim3nsioneer/Marlin_v1
11 years ago
Neil Darlow 3f2c771d90 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
Pablo Clemente 2242a84218 Changed the declaration of the variable to Marlin_main.cpp to fix issue on commit #965
11 years ago
Neil Darlow 6e3406d228 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
Pablo Clemente d86c3cf43c Changed the type of variable to bool, the name to "cancel_heatup", flags implementation and added this fix to M190 gcode too.
11 years ago
Oskar Linde 269a068032 Fix lcd itostr3() to handle negative numbers
11 years ago
cocktailyogi 512f2a3136 restore Branch from Backup
11 years ago
Pablo Clemente cd3220d055 Inverted state logic for forced_heating_stop variable
11 years ago
Pablo Clemente 86b4b805d2 Fixed stop print LCD function on M104
11 years ago
Dim3nsioneer 3c927901a4 Implementation of FW extruder change retract
11 years ago
Neil Darlow e541323741 Merge https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
daid 2acd3792fc Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
11 years ago
daid 8b4c4aa5c3 Add feature to check&retry CRC read errors on SD.
11 years ago
neildarlow bbe8fbe13d Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
Dim3nsioneer 944ced87c5 Extended Preheat options
11 years ago
Dim3nsioneer 3906f27c46 Individual extruder flow rate
11 years ago
whosawhatsis 0ddee3c7db Prevent SD card insertion from causing a hang when using LiquidTWI2 device detection
11 years ago
Matthew Schick 6cd85e6008 Add support for disabling encoder control for feedrate multiplier
11 years ago
neildarlow 7325d7102e Activate LiquidTWI2 device detection and space-pad LCD status line.
11 years ago
Cylindric 5d50819791 Various typo fixes - only in comments, no code changes.
11 years ago
nothinman d4ba23bc28 Merge pull request #770 from josefpavlik/Marlin_v1
11 years ago
Josef Pavlik 477b6fa1df move engaged from lcd console refreshes power off timeout
11 years ago
daid c31bb2b7ad Only show the ZProbe offset when auto-bed-leveling is enabled.
11 years ago
Mark Hanford bdd0211aeb Move strings in ultralcd.cpp into language.h.
11 years ago
ErikZalm 84df13f7d1 Merge pull request #721 from drf5n/lcdOnly
11 years ago
David Forrest 61a7256d42 Enable basic ULTRA_LCD screen w/o encoders and menus.
11 years ago