17de96ace7
Merge branch 'Marlin_v1' into revert-1154-sd_sorting
...
Conflicts:
Marlin/cardreader.cpp
Marlin/cardreader.h
10 years ago
a9c334e8bc
Merge pull request #1191 from thinkyhead/code_shrink
...
Shrink and Optimize
10 years ago
1857e611d3
Other small tweaks
10 years ago
63e1665fa9
Reduce ultralcd.cpp redundancies
10 years ago
e4b98011cf
And one more...
10 years ago
31ca3de72f
Merge pull request #819 from neildarlow/Marlin_v1
...
Activate LiquidTWI2 device detection and space-pad LCD status line.
10 years ago
e83cfc0a62
Merge pull request #1163 from thinkyhead/lcd_abort_message
...
LCD "Abort" Message
10 years ago
0b310ab6c5
Merge pull request #1153 from xinfab/negative_values_in_menu
...
Negative values in menu
10 years ago
91d740e128
Merge pull request #1141 from filipmu/Filament-Sensor
...
Display filament sensor data on a 20x4 LCD or Graphical LCD
10 years ago
ab355a90d3
Revert "SD Sort and Buffer"
10 years ago
ae081d0fe0
Improvements, more SORT_USES_MORE_RAM
...
With this option, always keeps the dir in RAM, doubling as a cache for
getfilename. A board with only 8K of SRAM is cutting it very close.
10 years ago
0cbbba08bd
SD Card Alpha Sorting
...
First iteration of alphabetical sorting for SD cards, both
slow+efficient and fast+rammy. Option for folders to sort first, last,
or not at all.
10 years ago
3ebfd29312
Print a message when printing is aborted
...
Messages in gcode files like “M117 Printing…” were not being cleared on
Stop Print.
10 years ago
64139f5e5a
Merge https://github.com/ErikZalm/Marlin into Marlin_v1
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
0d35b1d0b8
Allow negative values in menus
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
b81021f475
Merge https://github.com/ErikZalm/Marlin into Marlin_v1
10 years ago
110c5dcf23
Fixed typo.
...
Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com>
10 years ago
ca30aee903
Fix "add_homeing" to "add_homing" to match changes
10 years ago
0f2e0525df
Merge pull request #1096 from thinkyhead/set-home
...
Proposed feature: Set Home Offsets
10 years ago
fb34265d75
Make hotend optional when compiling with lcd support
...
Signed-off-by: Matthew Schick <matthew.schick@gmail.com>
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
1632e5e38a
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
10 years ago
018b68a5c4
Merge pull request #976 from cocktailyogi/SCARA_by_Yogi
...
Implemented SCARA-Maths
10 years ago
dde61d8886
Merge pull request #977 from OskarLinde/Marlin_v1
...
Fix lcd itostr3() to handle negative numbers
10 years ago
3cd7dbcc45
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
10 years ago
2f4a20257c
imported last Marlin changes
11 years ago
aacff0d361
Merge pull request #948 from Dim3nsioneer/Marlin_v1
...
Implementation of FW extruder change retract
11 years ago
3f2c771d90
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
2242a84218
Changed the declaration of the variable to Marlin_main.cpp to fix issue on commit #965
11 years ago
6e3406d228
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
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
269a068032
Fix lcd itostr3() to handle negative numbers
11 years ago
512f2a3136
restore Branch from Backup
...
sorry for that
11 years ago
cd3220d055
Inverted state logic for forced_heating_stop variable
11 years ago
86b4b805d2
Fixed stop print LCD function on M104
11 years ago
3c927901a4
Implementation of FW extruder change retract
...
FW retraction is extended onto swap retraction invoked by 'G10 S1'.
Bookkeeping of the retract state of all extruders allows for having one
extruder fw standard retracted while another extruder is swap retracted.
An LCD menu item for the swap retract and recover length was added.
11 years ago
e541323741
Merge https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
2acd3792fc
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
11 years ago
8b4c4aa5c3
Add feature to check&retry CRC read errors on SD.
11 years ago
bbe8fbe13d
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
944ced87c5
Extended Preheat options
...
Preheat LCD menus base on code by D-Base
11 years ago
3906f27c46
Individual extruder flow rate
...
Extension of M221, Tune menu
11 years ago
0ddee3c7db
Prevent SD card insertion from causing a hang when using LiquidTWI2 device detection
11 years ago
6cd85e6008
Add support for disabling encoder control for feedrate multiplier
...
Signed-off-by: Matthew Schick <matthew.schick@gmail.com>
11 years ago
7325d7102e
Activate LiquidTWI2 device detection and space-pad LCD status line.
11 years ago
5d50819791
Various typo fixes - only in comments, no code changes.
11 years ago
d4ba23bc28
Merge pull request #770 from josefpavlik/Marlin_v1
...
Marlin v1
11 years ago
daid