621 Commits (61f15ef7e7de6a68a7ffc85292795cfea15c6a89)

Author SHA1 Message Date
wgm4321 ec4681ab6b Revert "Add "Detailed Z Probe" menu item with ABL is defined."
10 years ago
wgm4321 dd7e4ee97f Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3
10 years ago
wgm4321 2b9722f387 Add "Detailed Z Probe" menu item with ABL is defined.
10 years ago
Bo Herrmannsen a18b625534 Merge pull request #1261 from wgm4321/Development
10 years ago
Scott Lahteine e7db8ee9e5 ftostr32np > ftostr32sp
10 years ago
Scott Lahteine 10e1b6ef8b Least stack-usage self-contained ftostr32np()
10 years ago
Scott Lahteine d1f21d1189 As it should be
10 years ago
Scott Lahteine 449dad71f2 Least stack-usage self-contained ftostr32np()
10 years ago
Scott Lahteine a2109cb492 Patch to make Z look more like X and Y on UltraLCD
10 years ago
Caleb Anderson 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
wgm4321 cb12161191 Add Filament menu and add Filament/Retract settings to config store.
10 years ago
fmalpartida ec33df0554 Merge branch 'SAV-MkI_merge' into Development
10 years ago
Bo Herrmannsen c9f60183a9 Merge pull request #1233 from NarimaanV/Development
10 years ago
Scott Lahteine 2f467e2797 LCD Progress Bar
10 years ago
NarimaanV 7667949aca Fixed BABYSTEPPING feature
10 years ago
daid 17de96ace7 Merge branch 'Marlin_v1' into revert-1154-sd_sorting
10 years ago
Bo Herrmannsen a9c334e8bc Merge pull request #1191 from thinkyhead/code_shrink
10 years ago
Scott Lahteine 1857e611d3 Other small tweaks
10 years ago
Scott Lahteine 63e1665fa9 Reduce ultralcd.cpp redundancies
10 years ago
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
alexborro ab355a90d3 Revert "SD Sort and Buffer"
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
10 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
Alex Borro 05932e4458 Add Z Probe Offset to EEPROM and Ultra LCD
11 years ago
- e5d3044801 Added posibility to set ENCODER_STEPS_PER_MENU_ITEM in Configuration.h like ENCODER_PULSES_PER_STEP as it depends on it for usability
11 years ago
Erik van der Zalm a94e588765 Changed slow buttons behavior.
11 years ago
fmalpartida 5b3f60ea2e Corrected LCD only error
11 years ago
fmalpartida b5a964fcc5 Initial SAV MkI (RepRap CloneWars board) integration.
11 years ago
Erik van der Zalm 667d278f54 Revert "Fix for Viki display"
11 years ago
bkubicek 7fad13a1e2 Reverse SD card file name order.
11 years ago
bkubicek b832f5b9f6 added delta tower babystepping. Its untested, but hopefully florian horsch will be able to try.
11 years ago
bkubicek d147a057ac Add the socalled "Babystepping" feature.
11 years ago
Erik van der Zalm 314fd13c39 Fix for Viki display
11 years ago
Erik van der Zalm 9bc88f8bab Placed optional ENCODER_PULSES_PER_STEP in the configuration.h file
11 years ago
Erik van der Zalm 3ca1ca6869 Fixed missing ENCODER_PULSES_PER_STEP
11 years ago
Xoan Sampaiño bf7007d02f add ENCODER_PULSES_PER_STEP
11 years ago
Nicolas Rossi 394ed08f88 Added feedrate setting for manual moves from panel
12 years ago
Brendan-csel d7f384f680 Skip SD menu refresh if nothing has changed
12 years ago
Brendan-csel abc8320a68 Save LCD_CLICKED before it is cleared
12 years ago
Nicolas Rossi 55c287a69e Fixed move from panel for delta bot #557
12 years ago
Guillaume Seguin 76841450c8 Only display poweron/poweroff if PS_ON_PIN > -1
12 years ago
Guillaume Seguin 34da3a0a3f Merge github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
ErikZalm 8a2a3ef91d Merge pull request #531 from iXce/Marlin_v1_lcd
12 years ago
Erik van der Zalm cdaaad3df1 Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1
12 years ago
Erik van der Zalm e3bdefd873 fixed missing #endif
12 years ago
Erik van der Zalm a5be0c52c6 no message
12 years ago
Michael Mayer e509cdbeb0 added contrast control function for gLCDs
12 years ago
xifle 61fe430d4f Should fix compiler warning for feedrate deadzone
12 years ago
Guillaume Seguin aa65c20d1f Only clamp panel movements if software endstops are enabled
12 years ago
Nicolas Rossi 2daa85918e Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1
12 years ago
lajos b519af4f05 fixed another !defined(PIDTEMP) compile in ultralcd.cpp
12 years ago
lajos 7d03c52511 fixed compile error in ultralcd.cpp when PIDTEMP undefined
12 years ago
Scott Lahteine 5dabc95409 Apply all changes from latest Marlin_V1
12 years ago
Simon Oliver 93f0463b21 Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values
12 years ago
Dirk Eichel f3e0e5184d Add include selector between char. LCD and GLCD
12 years ago
Dirk Eichel 5f1cd70122 Add code to lcd_update() for GLCD
12 years ago
Dirk Eichel a49c09a776 Add variable for animated fan, add float conversion w/o sign
12 years ago
Nicolas Rossi 86bf911139 Toggle menu for PSU from LCD pannel
12 years ago
daid303 de3dec7215 Also show the tune menu when USB printing.
12 years ago
Dirk Eichel c8f1fbd9d8 Add SD-Card change and SD-Card init.
12 years ago
Marius Kintel f24f02e212 compile fix: quickStop() needs stepper.h
12 years ago
Bernhard 1d06b10962 Added a feature to have filament change by gcode or display trigger.
12 years ago
Kevin O'Connor 3f2f94ef28 Be consistent in setting of the fan PWM.
12 years ago
daid303 921273baa0 Added optional feature to stop printing when an endstop is hit. Made the Z display on the LCD in 3.2 format instead of 3.1. Added LCD message when and endstop is hit.
12 years ago
daid303 01aac2a142 Small changes on the LCD panel, let the speed control work better, line up the parameter edit the same as the menu, remove some unused defines, and remove the Z from the 10mm move menu.
12 years ago
daid303 a95dcd74e7 Fix some of the duplicated PSTRs, saving 500bytes of flash with LCD on.
12 years ago
daid303 047d037f8c #ifdef fix for #326
12 years ago
daid303 1a8f54cea1 The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.
12 years ago
daid303 6a9bee27cc Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
12 years ago
daid303 a2032afa3a Fixed #303
12 years ago
daid303 f4a89ec776 SDCARDINSERTED is always defined, and thus we do not need the #ifdefs.
12 years ago
daid303 12a4d60e18 Fix the EEPROM storage, no longer inline it at multiple locations, and remove the template.
12 years ago
daid303 f6ff0ab767 signed/unsigned fixes.
12 years ago
daid303 06b58a9c4f First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
12 years ago