Commit Graph

609 Commits (d4f5418802a4d7f9c8dda4b38ec5bd4aeb7e43a2)

Author SHA1 Message Date
AnHardt 418d22d7b3 Revert "Testloop cleanup" 10 years ago
AnHardt 6361404b91 Testloop cleanup 10 years ago
AnHardt 6d4b3f0d6a Move the condition before the loop 10 years ago
AnHardt 4cb7dfc546 Move the 'alive dot' in every displayloop 10 years ago
Scott Lahteine 61f8394361 Compare indices instead of floats for probe actions 10 years ago
Edward Patel 6b91b7b411 Mesh bed leveling: Added G29 S3 + finer steps in manual probing. 10 years ago
AnHardt 19b11dfdd7 Fix can't enter MENU_MULTIPLIER_ITEM 10 years ago
Scott Lahteine 571652c49b Fix LCD click 10 years ago
Scott Lahteine a117b6bff6 Merge pull request from thinkyhead/progress_bar_tweak 10 years ago
Scott Lahteine 5519882eea Fix up LCD_PROGRESS_BAR 10 years ago
Scott Lahteine 8c136a5ab5 Conditionals and comments for PS = 0 10 years ago
Scott Lahteine 2faed961ce Allow POWER_SUPPLY 0 for no power switch 10 years ago
AnHardt 50a732360a Replace extrudemultiply by extruder_multiply[active_extruder] 10 years ago
Scott Lahteine ba871e46bf Fix compiler warnings 10 years ago
Scott Lahteine bc2f249cc6 Merge pull request from AnHardt/tm-utf-minus-kanji 10 years ago
Scott Lahteine abfcbd793f Merge pull request from chris-bo/rework_lcd_beeper 10 years ago
Scott Lahteine 78090275a9 Fix probe range editing 10 years ago
AnHardt 20f909567a Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji 10 years ago
Christian Bohn eab5fad539 code formatting 10 years ago
Christian Bohn 4c3cbc0961 use only one implementation for beeper feedback 10 years ago
AnHardt 8848b7e9ef Add the missed {} to END_MENU in ultralcd.cpp 10 years ago
AnHardt 9d589cbb2a Merge https://github.com/MarlinFirmware/Marlin into tm3-utf-minus-kanji 10 years ago
Scott Lahteine 0d81abe1c9 Merge branch 'Development' into config_testing 10 years ago
nicolas-rambaud 37cde8a191 Report changes from previous PR from old code base including : 10 years ago
Scott Lahteine 4fbb80567e Get upstream commits 10 years ago
Scott Lahteine 691e753cc3 Don't add home offsets in G29 10 years ago
Scott Lahteine 15eb5d35a2 Merge branch 'Development' into config_testing 10 years ago
Scott Lahteine 63abeaff38 Merge branch 'Development' into config_testing 10 years ago
Edward Patel c516747847 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 10 years ago
AnHardt 64e3d33893 Fix shrinked menucode 10 years ago
AnHardt 6bfccaf99e Merge https://github.com/MarlinFirmware/Marlin into tm2-utf-minus-kanji 10 years ago
Scott Lahteine b6d381f863 Divide up Conditionals to get LCD items early 10 years ago
Scott Lahteine 670006b919 Remove invariant code from Configurations 10 years ago
Edward Patel a61f679568 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 10 years ago
Scott Lahteine a547dc2148 Merge branch 'Development' into optimize_menu_code 10 years ago
alexborro e650d4044e Fix "Stop Print" function in the LCD menu 10 years ago
AnHardt e917477fec Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji 10 years ago
Scott Lahteine 4ce79920e5 Merge pull request from AnHardt/warnings1 10 years ago
Scott Lahteine be3f2dc1d9 Merge pull request from AnHardt/warning2 10 years ago
AnHardt 5099b86ad4 lcd_autostart_sd() has two conditions. 10 years ago
AnHardt 5d81c779cc lcd_control_retract_menu() is conditional. 10 years ago
AnHardt 450b89e63c Negative times are unlikly 10 years ago
AnHardt 00b162a993 Merge remote-tracking branch 'origin/utf-kanji' into tm-utf-minus-kanji 10 years ago
Scott Lahteine 3405f85a6a Reduce size of menu code 10 years ago
Edward Patel 8005d22c81 Added menu option for bed leveling. 10 years ago
Scott Lahteine c37f7d15c9 - Rename WRITE_E_STEP for consistency 10 years ago
alexborro 9157cbd8f3 Add Travel Acceleration and change the M204 options 10 years ago
AnHardt 6fc2ccd568 Make use of new remenbering fontswitch. 10 years ago
Scott Lahteine f379edca78 Cleanup rotary encoder encrot* defines 10 years ago
Scott Lahteine 2af559cca3 Shared function for menu_edit_* and menu_edit_callback_* 10 years ago
Scott Lahteine 517f411999 Spacing adjustment to menu_edit* macro 10 years ago
Scott Lahteine 4938ae5caf Add required backslash for macro expansion 10 years ago
Scott Lahteine e182cdebf9 Add required backslash for macro expansion 10 years ago
Scott Lahteine fa4c36df68 Fix menu callback issue wrt LCD_CLICKED 10 years ago
Scott Lahteine 3ba47ea277 Remove test/demo multi=line code menu items 10 years ago
Scott Lahteine 40ef472a25 Merge in encoder multiplier 10 years ago
Scott Lahteine 1c13cd604b Formatting in babysteps defines 10 years ago
Scott Lahteine 3a26804d80 Adapt to latest PID code and fix typos 10 years ago
Scott Lahteine 422582da71 Prep formatting for upcoming PR 10 years ago
Scott Lahteine 0d6a7a2df0 Merge with latest upstream changes 10 years ago
Scott Lahteine 57bc28b42c Cleanup and fix ultralcd.cpp 10 years ago
Scott Lahteine 4fcd4b444e Merge pull request from thinkyhead/fix_recent_issues 10 years ago
Scott Lahteine 430c4b6538 Replace missing backslash 10 years ago
Scott Lahteine a8939eec28 Readability of MENU_MULTIPLIER_ITEM 10 years ago
Scott Lahteine 09e09b308e Tweaky spacing adjustments 10 years ago
Scott Lahteine c610471b0c Add PID_PARAMS_PER_EXTRUDER conditional 10 years ago
Scott Lahteine 2d6fa9ce80 Proper implementation of PID menu items 10 years ago
wgm4321 b8e79dce89 Fix compilation errors when encoder multiplier is disabled 10 years ago
wgm4321 65e1fc71be Add encoder rate multiplier 10 years ago
AnHardt 6cdcd6c6d1 Fix iss#1492 10 years ago
Jérémie FRANCOIS 9d75a56b56 Merge remote-tracking branch 'upstream/Development' into Development 10 years ago
Jérémie FRANCOIS 85e5aa4011 Generalized enqueue_commands_P, and moved them to Marlin_main as they should 10 years ago
AnHardt b1dbd765c6 Centralise definition of fonts for DOGM displays 10 years ago
Christian Lefrançois 33408a4dfc Update ultralcd.cpp 10 years ago
Scott Lahteine 34377ee512 Merge pull request from thinkyhead/fewer_preheat_strings 10 years ago
Scott Lahteine 5fbef6bed2 Merge pull request from thinkyhead/rename_lastnr 10 years ago
Scott Lahteine 53eea611b8 Fix MSG_NOZZLE 10 years ago
Scott Lahteine c90f2e77d8 Remove language strings that only add a number 10 years ago
Jérémie FRANCOIS dd301be52d Added suport for multiline G-code commands in the LCD menus 10 years ago
Scott Lahteine 03c9cb60e8 Rename lastnr to autostart_index and... 10 years ago
MagoKimbra 986e723eeb Add 4th extruder 10 years ago
grob6000 bf2c923db5 Make multiple PID parameters a config option 10 years ago
grob6000 0877aa0fe0 Merge remote-tracking branch 'upstream/Development' into independent_pid 10 years ago
grob6000 7d32c7f36d Multiple PID parameter edit for ultralcd 10 years ago
Scott Lahteine 326b925557 DOGLCD and LCD_PROGRESS_BAR to coexist 10 years ago
wgm4321 067b509479 Re-enable filament menu with recalc fix when enabling/disabling mm3 10 years ago
wgm4321 a19f2f8ae7 Disable volumetric menu item due to missing recalc of of multipliers when enabled/disabled 10 years ago
wgm4321 f24dda9700 Revert "Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3" 10 years ago
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 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 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 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 from neildarlow/Marlin_v1 10 years ago
Bo Herrmannsen e83cfc0a62 Merge pull request from thinkyhead/lcd_abort_message 10 years ago
Bo Herrmannsen 0b310ab6c5 Merge pull request from xinfab/negative_values_in_menu 10 years ago
Bo Herrmannsen 91d740e128 Merge pull request 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 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 11 years ago
Erik van der Zalm 018b68a5c4 Merge pull request from cocktailyogi/SCARA_by_Yogi 11 years ago
Erik van der Zalm dde61d8886 Merge pull request from OskarLinde/Marlin_v1 11 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 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 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 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 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 12 years ago
Erik van der Zalm 9bc88f8bab Placed optional ENCODER_PULSES_PER_STEP in the configuration.h file 12 years ago
Erik van der Zalm 3ca1ca6869 Fixed missing ENCODER_PULSES_PER_STEP 12 years ago
Xoan Sampaiño bf7007d02f add ENCODER_PULSES_PER_STEP 12 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 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 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 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 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