Commit Graph

411 Commits (050e0bd2af416f21cc08f08d329b2d48582b46fd)

Author SHA1 Message Date
Scott Lahteine 69b0490b77 Show minimal preheat options in menus (PR#2471) 10 years ago
AnHardt 722829b058 Move buzzing code to buzzr.h & buzzer.cpp (PR#2307) 10 years ago
Scott Lahteine a274769f4f Clean up spacing and comments 10 years ago
AnHardt 6ab7b560af Rework buzzing (PR#2296) 10 years ago
Scott Lahteine 90f858aa85 Use translated strings for axis movement (PR#2280) 10 years ago
wurstnase e7e964432b consistency name for multiplier 10 years ago
AnHardt f18f689c01 Replace MSG_F? with MSG_N? 10 years ago
AnHardt bc0764894a Shift call of start_watching_heater() into setTargetHotend() 10 years ago
Ed Boston ca8d1756d5 Define fixes 10 years ago
Ed Boston a83bf18ee1 More functional seperation 10 years ago
Ed Boston 047e688e93 Changed ADAFRUIT_ST7565 to ELB_FULL_GRAPHIC_CONTROLLER 10 years ago
Ed Boston 41f8cdb3a6 ADAFRUIT_ST7565 10 years ago
Scott Lahteine fcfd99c1ae Add comments to lcd_control_temperature_menu 10 years ago
Scott Lahteine 9b3d4380d3 Only watch the heater that was set 10 years ago
Scott Lahteine 54deb9eea3 Enable WATCH_TEMP_PERIOD by default 10 years ago
brupje 8f8bf3a897 Make Marlin actually compile when #define REPRAPWORLD_KEYPAD is uncommented 10 years ago
Scott Lahteine d4c74b8f8c Don't apply M428 if an error occurs 10 years ago
Scott Lahteine d065d37822 Add M428 to set home_offset logically 10 years ago
Scott Lahteine 0f687b5dda Merge branch 'Development' into eeprom_in_gcode 10 years ago
Scott Lahteine 5b248757c7 Level Bed in Prepare submenu 10 years ago
Scott Lahteine 0fca084ea6 Make EEPROM reproducible in GCode 10 years ago
Scott Lahteine a22a228bcc Rename files to move them in the IDE 10 years ago
Scott Lahteine a932e7490f No noTone needed, but delay is 10 years ago
Scott Lahteine 9c5d14ea68 Fix BEEPER duration 10 years ago
Scott Lahteine c92b59952a Use millis_t for progress_bar_ms and expire_status_ms 10 years ago
Scott Lahteine 97dfa0365d Rename expireStatusMillis to expire_status_ms 10 years ago
Scott Lahteine ce142afdda G4 shows status message only if no message is set already 10 years ago
Scott Lahteine 2558c10c6c Use the slower feedrate for XY axes 10 years ago
Scott Lahteine 31932912dd Use AxisEnum instead of int for _lcd_move 10 years ago
Scott Lahteine c3560e0288 Include axis parameter to ultralcd's line_to_current 10 years ago
Scott Lahteine 3b97a7d446 Merge pull request from AnHardt/beep2 10 years ago
AnHardt f2c94b3298 tone will end automaticly 10 years ago
AnHardt 064f2b37d0 More Beeper clean up. 10 years ago
Scott Lahteine 09d60e0128 Naming and code comments 10 years ago
Scott Lahteine ccddc280be Apply three more commits 10 years ago
Scott Lahteine 055b11814a Additional cleanup of ultralcd.cpp 10 years ago
Scott Lahteine 388dd0cfa5 Fix doubled lcd_quick_feedback 10 years ago
Scott Lahteine 740152ee70 Merge branch 'Development' into cold_extrude 10 years ago
Scott Lahteine 5914d9d7de Shuffling declarations.. 10 years ago
Scott Lahteine b328c6e6b6 Shuffling declarations. 10 years ago
Scott Lahteine fb4cefc91d Define lcd_move_[xyz] ahead of lcd_move_menu_axis 10 years ago
Scott Lahteine 9189cc66ab Fix moves for DELTA for MANUAL_BED_LEVELING 10 years ago
AnHardt df50523605 Made encoderPosition and quick_feedback dependant on NEWPANEL 10 years ago
AnHardt bcc04192fc Remove Contrast Menu for U8GLIB_ST7920 10 years ago
Scott Lahteine 7431ef7e2d Merge branch 'Development' into dev_version 10 years ago
Scott Lahteine 43773ff735 Formatting and lcd contrast masking 10 years ago
Scott Lahteine cf9b58452c Minimum delay in menu click feedback 10 years ago
Edward Patel 002340f32c Merge branch 'Development-Marlin' into Development 10 years ago
AnHardt ac843fbf3b Fix lcd_status_message 10 years ago
Edward Patel 0e6514e7bd Bug fix! Missed putting z value back in right slot after zigzag mod. 10 years ago
Edward Patel ea10601406 Merge branch 'Development-Marlin' into Development 10 years ago
AnHardt 340d165a9c Reduce display updates for dogm displays 10 years ago
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 11 years ago
Filip Mulier d84934d8c5 Display Filament Sensor data on 20x4 LCD 11 years ago
Neil Darlow b81021f475 Merge https://github.com/ErikZalm/Marlin into Marlin_v1 11 years ago
Christian Inci 110c5dcf23 Fixed typo. 11 years ago
Matt Stultz ca30aee903 Fix "add_homeing" to "add_homing" to match changes 11 years ago
Erik van der Zalm 0f2e0525df Merge pull request from thinkyhead/set-home 11 years ago
Matthew Schick fb34265d75 Make hotend optional when compiling with lcd support 11 years ago
Scott Lahteine 2f6c57eadc Proposed feature: Set Home Offsets 11 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