326b925557
DOGLCD and LCD_PROGRESS_BAR to coexist
...
Small changes (and formatting to confuse the diff’er) which first
allows DOGLCD and LCD_PROGRESS_BAR to be enabled in tandem, then a
#warning (rather than error) that the extra progress bar / message
options don’t apply to graphical displays at this time. This leaves
open perhaps combining the progress bar and message area in some future
(or forked custom) graphical LCD display arrangement (at which time the
relevant variables may be moved into ultralcd.cpp with externs in
ultralcd.h). I also added a conditional error that the progress bar and
the filament display may not work well together.
10 years ago
067b509479
Re-enable filament menu with recalc fix when enabling/disabling mm3
10 years ago
a19f2f8ae7
Disable volumetric menu item due to missing recalc of of multipliers when enabled/disabled
10 years ago
f24dda9700
Revert "Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3"
...
This reverts commit dd7e4ee97f
10 years ago
ec4681ab6b
Revert "Add "Detailed Z Probe" menu item with ABL is defined."
...
This reverts commit 2b9722f387
10 years ago
dd7e4ee97f
Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3
10 years ago
2b9722f387
Add "Detailed Z Probe" menu item with ABL is defined.
10 years ago
a18b625534
Merge pull request #1261 from wgm4321/Development
...
Add Filament menu and add Filament/Retract settings to config store.
10 years ago
e7db8ee9e5
ftostr32np > ftostr32sp
...
sp=space-padded, similar to: ns=no-sign
10 years ago
10e1b6ef8b
Least stack-usage self-contained ftostr32np()
...
This is the optimal code for a self-contained formatter, although the
original code is crafty in being smaller and simpler, and can be
evaluated as using the original output as a scratch pad for state,
making the final formatter more straightforward. While this code is
longer, all code-paths are minimal.
10 years ago
d1f21d1189
As it should be
10 years ago
449dad71f2
Least stack-usage self-contained ftostr32np()
...
This is the optimal code for a self-contained formatter, although the
original code is crafty in being smaller and simpler, and can be
evaluated as using the original output as a scratch pad for state,
making the final formatter more straightforward. While this code is
longer, all code-paths are minimal.
10 years ago
a2109cb492
Patch to make Z look more like X and Y on UltraLCD
10 years ago
cb047e9070
Actual menu change. Moved menu logic to not be shown unless not currently printing. (untested but straight-forward, printer in a bad state currently)
10 years ago
cb12161191
Add Filament menu and add Filament/Retract settings to config store.
10 years ago
ec33df0554
Merge branch 'SAV-MkI_merge' into Development
...
Tested for SAV MKI and SAV 3D LCD on lewihe.
10 years ago
c9f60183a9
Merge pull request #1233 from NarimaanV/Development
...
Fixed BABYSTEPPING feature
10 years ago
2f467e2797
LCD Progress Bar
10 years ago
7667949aca
Fixed BABYSTEPPING feature
...
Moved PSTR() macro to correct place which was causing the " initializer fails to determine size of '__c' " when attempting to compile with BABYSTEPPING enabled.
10 years ago
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
10 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
Scott Lahteine