ae9b09fe94
menu => screen
9 years ago
45ea8749d3
Wrap all items depending on ULTIPANEL
9 years ago
378ff92e98
manage_manual_move(); -> ULTIPANEL
...
Makr the call of `manage_manual_move() ` depandent of `ULTIPANEL`
9 years ago
e2d4919c01
Merge pull request #3991 from thinkyhead/rc_axis_units
...
Rename some vars to clarify their relationship to acceleration
9 years ago
5b5aa1572b
Non-blocking buzzer
9 years ago
72c6f2923f
axis_steps_per_unit => axis_steps_per_mm
9 years ago
cb4704e07a
Rename some planner acceleration vars
...
- `per_sq_second` => `per_s2`
- `per_sqr_second` => `per_s2`
- `axis_steps_per_sqr_second` => `max_acceleration_steps_per_s2`
9 years ago
b23f710034
Cleanup and naming for num-to-string functions
9 years ago
47b5c55c29
Implement the delayed-move technique
9 years ago
a3e25a0fca
Instead of trying to move now, set a flag to move asap
9 years ago
43947072d5
Merge pull request #3895 from thinkyhead/rc_singlenozzle_part_2
...
SINGLENOZZLE: EXTRUDERS versus HOTENDS
9 years ago
c2362c1b3c
Apply Marlin coding standards to MBL class
9 years ago
c06de0f097
MBL: Added keeping MBL active when homing single axises for #3750
9 years ago
cd441ce652
SINGLENOZZLE: EXTRUDERS versus HOTENDS
9 years ago
32f8300cc6
Merge pull request #3944 from thinkyhead/rc_eboston_lcd_contrast
...
Improved LCD contrast handling
9 years ago
664b299a51
This fix is not DELTA compatible
9 years ago
064efb20e0
Also call clear_command_queue for lcd_sdcard_stop
9 years ago
6277395e1e
set_current_position_from_planner() after stepper.quick_stop()
9 years ago
381bc6f0b0
set_position => set_position_mm
9 years ago
efa7209acf
Improved LCD contrast handling
...
Based on MarlinFirmware/MarlinDev#200 from @eboston
9 years ago
bd97bbc52a
Make HAS_LCD_CONTRAST a boolean flag
9 years ago
3861f1e0da
Merge pull request #3908 from jbrazio/bugfix/3826
...
Closes #3826 : SD printing will now pause and stop the print counter
9 years ago
dc22097b3a
Fix some of array initializations
...
- In `stepper.h` init `count_direction` array
- In `ultralcd.cpp` init `autotune_temp` array
9 years ago
40e64b36de
Closes #3826 : SD printing will now pause and stop the print counter
...
The LCD menu items for SD printing pause/stop have been updated to control
also the print job timer. This commit also fixes a small output bug with
M78, the failed print counter was displaying the wrong value.
9 years ago
a4ed988c60
Two index finding functions for MBL
9 years ago
8218558953
Update comments, rename next_ping_ms, followup to #3797
9 years ago
0c4d885d5b
Speedup sreen update delay
...
Speedup sreen update delay
and correct a comment.
A module division by 10 is slooooow. (powers of 2 are fast - but then you can AND a bitmask with the same result)
9 years ago
754b0152f5
Fix MBL zigzag calls
9 years ago
14cd0f4c92
Merge pull request #3740 from thinkyhead/rc_lcd_home_options
...
Individual Axis Homing LCD menu items
9 years ago
09150cae79
Individual Axis Homing LCD menu items
9 years ago
4dc4e2063f
Add REVERSE_ENCODER_DIRECTION option
9 years ago
51109d4af7
Use AxisEnum with _lcd_babystep()
9 years ago
b65ea98d6b
Localize babystepping in the Temperature class
...
So that `ultralcd.cpp` doesn’t need to worry about the details.
9 years ago
1a97442d19
Follow-up the PR #3643(Temperature singleton)
...
Follow-up the PR #3643(Temperature singleton)
・Change from fanSpeedSoftPwm[0] to thermalManager.fanSpeedSoftPwm[0] in planner.cpp
It fix compilation error when FAN_SOFT_PWM is enabled.
・Remove declaration of setExtruderAutoFanState() in temperature.h
Because that function was abolished.
・Change from babystepsTodo to thermalManager.babystepsTodo in ultralcd.cpp
It fix compilation errors when BABYSTEPPING is enabled.
9 years ago
084f6b5b44
Temperature singleton class
9 years ago
b4b5c7a6b7
Merge pull request #3670 from thinkyhead/rc_scoovo_controller
...
Use directional buttons when defined
9 years ago
ddafb859e2
Use directional buttons when defined
9 years ago
605808fe37
Additional follow-up the PR #3631(Encapsulate S...
...
Additional follow-up the PR #3631(Encapsulate Stepper, Planner, Endstops in singleton classes)
・Change from abort_on_endstop_hit to stepper.abort_on_endstop_hit in endstop.cpp, Marlin_main.cpp, and ultralcd.cpp
・Add include path to cardreader.h and temperature.h in endstop.cpp(for CardReader class and disable_all_heaters())
It fix compilation error when ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED and SDSUPPORT are enabled.
・Change from digipot_current() to stepper.digipot_current() in Marlin_main.cpp
・Change from digitalPotWrite() to stepper.digitalPotWrite() in Marlin_main.cpp
It fix compilation errors when HAS_DIGIPOTSS is enabled.
・Change from microstep_mode() to stepper.microstep_mode() in Marlin_main.cpp
・Change attribute of microstep_mode() from private to public in stepper.h
・Change from microstep_readings() to stepper.microstep_readings() in Marlin_main.cpp
・Change from microstep_ms() to stepper.microstep_ms() in Marlin_main.
It fix compilation errors when HAS_MICROSTEPS is enabled.
9 years ago
60c6efb75c
Merge pull request #3653 from thinkyhead/rc_bed_temp_watch_merge
...
Introduce temp watch protection for the bed
9 years ago
908229dbb3
Introduce temp watch protection for the bed
...
When setting the bed temp via M140/M190 if the thermistor does not read an increase of WATCH_BED_TEMP_INCREASE degrees by WATCH_BED_TEMP_PERIOD seconds then it will throw "Error:Heating failed, system stopped! Heater_ID: bed" and call the kill() function.
Conflicts:
Marlin/Configuration_adv.h
9 years ago
96f51f400f
Planner singleton class
9 years ago
5e4e535ce8
Stepper and Endstops as singleton objects
9 years ago
88c6693b9e
Fix a typo in #3586 to fix MBL
9 years ago
003aab6dfd
Revert MBL menus to "known" working point
9 years ago
dc2281d2f4
Add nextMenu, nextEncoderPosition to change menus after handler loop
9 years ago
7fa2bda1b9
Give the "alive dot" its own blink
9 years ago
9d5e1f32fd
Use axis_homed in _lcd_level_bed_homing, item in Prepare before homing
9 years ago
9bcb72e7f8
Further patches to MBL - break up into more handlers
9 years ago
3f6ae85748
Fix some MBL display issues for DOGLCD
9 years ago
3db5a75f30
Merge pull request #3568 from thinkyhead/rc_various_fixes
...
General code cleanup, improved naming, etc.
9 years ago
78747b1328
min_pos/max_pos => sw_endstop_min/sw_endstop_max
9 years ago
ba84d8d091
Allow setting PIDTEMP and PIDTEMPBED together or apart
9 years ago
4f04bf7fe8
Show steps done in the babystep display
9 years ago
c242bee449
Add a final lift, if configured, in Manual Bed Leveling
9 years ago
234987ee2f
Fix MBL lift
9 years ago
e0830bf8f1
Don't use LCD alert unless error or alert level is reset later
9 years ago
866c5be395
Merge pull request #3500 from thinkyhead/rc_shrink_menu_macros
...
Reduce redundancy in MENU_ITEM code
9 years ago
4fb8013be1
Reduce redundancy in MENU_ITEM code
9 years ago
2129db581e
Simplify MBL movement, zigzag
9 years ago
0493fccc0b
mbl.active is a bool now
9 years ago
b05f448317
Comments on MBL menu items
9 years ago
fda8f96f00
Fix bug in lcd_preheat_pla0123 and lcd_preheat_abs0123
...
Trying to preheat a non-existent extruder causes a crash.
9 years ago
2ae7394640
More fine-grained control of LCD redraw
9 years ago
3a1ac14bbc
Merge pull request #3437 from thinkyhead/rc_lcd_encoder_movement
...
More bits when encoderPosition is cast as signed
9 years ago
386140f361
Test time difference in safe way
9 years ago
8198cc30b5
More bits when encoderPosition is cast as signed
9 years ago
4e17187c96
Merge pull request #3426 from thinkyhead/rc_no_unhomed_lcd_move_on_delta_scara
...
No LCD Move for unhomed Delta/SCARA
9 years ago
5fc6daba2b
Disallow REPRAPWORLD_KEYPAD moves on Delta/SCARA until homed
9 years ago
165e73794a
Tweak encoderPosition non-zero test
9 years ago
479d307a44
Disable LCD Move XYZ for unhomed Delta/SCARA
9 years ago
fb38d698db
Add feedback after "Click to Begin"
9 years ago
582b58e660
Add audio feedback to edit items
9 years ago
a70c3ffc21
Minor syntax tweak with encoderPosition
9 years ago
0f247187b8
Drop extra setting of currentMenu
9 years ago
24cde86a4f
Fix syntax highlighting of menu_edit_type lines
9 years ago
86372cd394
Add underscore to internal lcd move function names
9 years ago
aa97328cd3
Use min_pos/max_pos for _lcd_move
9 years ago
f936df9507
Small cleanup of feedrate dead-zone
9 years ago
f5c2fb27cd
Handle defer_return_to_status in lcd_goto_menu
9 years ago
8459f7fa5c
Use `ms` where possible.
9 years ago
34ce9c4c1c
Restore save previous for menu edit items
9 years ago
1220dfd5d6
Fix: menu edit items saving position twice
9 years ago
d771174797
Merge pull request #3337 from esenapaj/patch-2
...
suppress warnings
9 years ago
7a2f73c6db
Remove extra comma from LCDHandlerAction
9 years ago
3fbf67e5ce
Patch MBL feedback and event handling
9 years ago
ef2fbaec98
Headings for menu sub-items, actions, etc.
9 years ago
dc109ac4e2
Move MBL code to its logical place
9 years ago
6730408ec1
Move lcd_autostart_sd to its logical place
9 years ago
056b80dc53
Have "back" menu items go to the previous item
9 years ago
c94482168b
Add MSG_LEVEL_BED_CANCEL for MBL
9 years ago
f9e1a0ee6c
suppress warnings
9 years ago
771ee1c1a9
Update MBL menu sub-function names
9 years ago
d659777e70
Fix MBL to handle re-entrant calls
9 years ago
5719fcba51
Add MSG_LEVEL_BED_DONE and MSG_LEVEL_BED_WAITING
9 years ago
d1c45ff80b
More user interaction in MBL
9 years ago
240b71ee1c
Give names to lcdDrawUpdate values
9 years ago
b0a3c7a91c
Add feedback sounds to MBL items
9 years ago
782c598e66
Use ftostr43 with '+' option in MBL Z adjuster
9 years ago
f08b0d034f
Merge pull request #3328 from RicardoGA/RC_Babystepping_fix
...
Babystepping Fix
9 years ago
6b1d2263a2
Babystepping Fix
9 years ago
6e0d627c8c
Unbreak the Delta radius clipping
9 years ago
949172606f
Fix manual Y movement on delta (regression).
9 years ago
b98f72b483
Small optimization for ftostr43
9 years ago
a393941d2d
Combine "XYZ" with MSG_LEVEL_BED_HOMING
9 years ago
097cc75ba8
Patch _lcd_level_bed draw to fix flicker, show proper offset
9 years ago
1e1a18e091
Remove extra semicolon in ultralcd.cpp
9 years ago
0b4f65dca8
Always limit blink to ~1 second intervals
9 years ago
0d6609c3c5
lcd_goto_menu should set lcdDrawUpdate to 2
9 years ago
af89ccf96a
Use flag to defer lcd return-to-status
9 years ago
641b30217e
Patch prevEncoderPosition compile issue
...
Thanks to @jbrazio #3301
9 years ago
92882fcc51
Allow lcd_implementation_drawedit to draw a message
9 years ago
fcedfd6e99
Clean up num2str functions, extend ftostr43
9 years ago
f543aaa54e
Apply standard pin test to buttons
...
This is the easiest way to make button pin testing consistent without
renaming all the button pins. Just make a macro especially for testing
if button pins are set, since they are named consistently in the pins
files.
9 years ago
6a4d394fff
Fix pointer-to-string issues with set_home_offsets and _lcd_level_bed_homing
9 years ago
f0b96f5cae
Merge pull request #3276 from thinkyhead/rc_sdprint_and_lcd_sleuth
...
Refinements, fixes, reduced stack usage in CardReader
9 years ago
4ed8351e3d
Revert use of enqueue_and_echo_command_now
9 years ago
b60ea95adf
Keep blinking limited to LCD_UPDATE_INTERVAL
9 years ago
8cb04816b5
Apply PID_AUTOTUNE_MENU option to ultralcd.cpp
9 years ago
14afe1a017
Move to Z=0 for G28 when using Manual Bed Leveling
...
copy of 406992f9dd
9 years ago
c606ed447a
Add "G29 S4" to fine tune Z level for Mesh Bed Leveling.
...
Also add mbl.z_offset to the EEPROM, bumping the version to V23.
9 years ago
f394c0639e
Merge pull request #3230 from jbrazio/bugfix/ultra-lcd-warning
...
Fix a compiler warning in ultralcd.cpp
9 years ago
0da744b7b0
Further cleanup of comments, partial Doxygen-style
...
Following up on #3231
9 years ago
80f221ed11
Fixed: warning: extra tokens at end of #endif directive
9 years ago
5e5d250832
Added gplv3 header to all Marlin files
9 years ago
04fa9d4f47
Make Autotune options into Menu Edit Items
9 years ago
e3f583a3be
Fixes for PID AutoTune from menu
...
Fixes for #3189
Setting a temp is still missing
9 years ago
3b3e8a02b5
Initial implementation of PID Autotune Menu Items
...
Adds the parameter U to M303. If U1 is included , it will use the
PID-values from the auto-tune.
9 years ago
15fccd43ee
Fix spacing of an #endif
9 years ago
6a3529247f
"Homing" as a translatable string
9 years ago
c97c2dcaf7
Use const parameters instead of static casting
...
Alternative fix to #3149
9 years ago
4bbea5124d
Support for multiple PWM fans
9 years ago
4634feaeab
Merge pull request #3012 from thinkyhead/fix_command_injection
...
Use a serial line buffer to prevent queue corruption
9 years ago
e5fd43f343
Implement BABYSTEPPING for COREXY and COREXZ
9 years ago
8fe7420310
Use a separate serial line buffer
9 years ago
7d25c107a8
Merge pull request #3149 from esenapaj/patch-1
...
suppress warnings
9 years ago
d56c6af24e
Merge pull request #3114 from thinkyhead/rc_reverse_lcd_menu
...
Option to reverse the click-wheel direction in menus
9 years ago
cc291aeb3c
Move definition of "blink" to main ultralcd file
9 years ago
8f24475e02
Simplify limiting encoderLine in END_MENU
9 years ago
fbef2f5b61
Implement reverse menu direction in ultralcd.cpp
9 years ago
6e1bc03d3b
Additional wrapping for #3140
9 years ago
1c384930f3
Merge pull request #3140 from thinkyhead/rc_fix_macro_expansion
...
Wrap macros to prevent bad expansions
9 years ago
8de7a6f9b1
suppress warnings
9 years ago
c73f1b2471
Extend stack_overflow_protection for lcd_move_e and _lcd_level_bed
...
Extend stack_overflow_protection for lcd_move_e() and _lcd_level_bed() with
a refined method of 3050.
9 years ago
f9ded2a7c4
Wrap macros to prevent bad expansions
9 years ago
b45a0c4c60
Fix bugs in edit submenus so they return to origin
...
Expected behavior: After editing a value the menu should return to the
previous place with the edited item selected.
Actual behavior: Either the top (back) item from the previous screen is
selected, or the menu jumps up another level.
Solution: Pass the correct arguments to `lcd_goto_menu` on click when
editing a value.
9 years ago
f18d3f451a
Limit LCD move_to_x/y coordinates for deltas
...
Related to MarlinFirmware/MarlinDev#270
9 years ago
ff13070b59
Use _BV macros, patch up others
9 years ago
209f5f21e0
Use macros where possible
...
Apply `constrain`, `NOMORE`, `NOLESS` and `CRITICAL_SECTION` macros
wherever possible.
9 years ago
3a3d358df9
Fix Printrboard with LCD (redo)
...
Based on #2860 - rebased for RCBugFix
9 years ago
eb85342fd9
Merge pull request #2989 from AnHardt/fix2661
...
Pre home display - Stepper release
9 years ago
e736779d7e
blink for char-lcds
...
Implement and test blinking for char-lcds
# Conflicts:
# Marlin/ultralcd_implementation_hitachi_HD44780.h
solved
9 years ago
fd9e94e5a4
Fix crashes when the Z axis is moved via LCD
...
Fix crashes when the Z axis is moved via LCD
by calling `plan_buffer_line` only when there is enough room in the
planner buffer, to avoid endless recursion.
A brief description about what went wrong is in #1166
9 years ago
4882a7eded
more suitable display format for delta printer
9 years ago
06555febdd
Using SET_INPUT instead of pinMode
9 years ago
a64bcd53e9
reusing millis()
9 years ago
83c4131ba3
Cleaning up, getting rid of the fake encoder count variable.
9 years ago
5eeea2f611
Fixing Rigidbot LCD Panel Support
9 years ago
60d5658da8
Revert nozzle_bed_fan_menu_items
...
For some reason that I cannot determine, using a sub-function causes
the Tune sub-menu to act strangely, yet replacing the function call
with its code content works perfectly.
9 years ago
bb4efcf603
Handle temp callbacks when THERMAL_PROTECTION_HOTENDS is not defined
...
by alternate definition for the callback macros
9 years ago
96d0d04b8f
Update LCD buttons less frequently
...
Move slow_buttons_update into the LCD_UPDATE_INTERVAL block
lcd_implementation_read_slow_buttons() will then be executed ~10 times a
second.
9 years ago
c956b52c4a
Babystep Multiplier
...
Analog to https://github.com/MarlinFirmware/MarlinDev/pull/250 by
@RicardoGA
Restore the Babystep Multiplicator functionality and now it's available
for X/Y/Z
9 years ago
be7167ed97
Change XY formatting on LCD (PR#2740)
...
According to #123 negative values for XY at or below -100 are displaying incorrectly, dropping the first digit. Deltas can easily have XY values in this range. This PR adds a function to display floats/ints formatted like `_123`, `-123`, `_-12`, or `__-1` as appropriate and applies it to the XY coordinates on Hitachi displays. It also moves the Z value to the right to be consistent with the XY formatting.
9 years ago
754b13d8fe
Patch issue #2315
9 years ago
0c7f7ebcfb
Styling adjustments (PR#2668 & PR#2670)
...
Keep "astyled" reformatting
9 years ago
03f0edb57e
Fix high LCD status screen update frequency (PR#2655)
9 years ago
5d65a36dee
Give lcd_sd_status an UNKNOWN state (PR#180)
9 years ago
7ac7ddbf20
Show nozzles, heaters, and extruders numbered 1-4
9 years ago
5bc480fee8
Fix Move E menu items
9 years ago
fc882c34a3
Init lcd_sd_status as false to force lcd_update test
...
Replaces #145 which is way out of date
9 years ago
e27dd5c22d
Conditionalize functions that rely on SDSUPPORT
9 years ago
558665cd90
Constrain Tune > Nozzle/Flow menu items
9 years ago
f7f6b5faae
Fix lcd_move_e compile error (PR#143)
...
Fix a compile error introduced in #98
9 years ago
2b30e8ac99
Conditionals for ULTIPANEL without SDSUPPORT
9 years ago
b23d765991
Added Extrude From Multiple Extruders from LCD feature
9 years ago
6292d9e815
Rename ENABLE_AUTO_BED_LEVELING
...
With the introduction of the #if ENABLED(…)
reads better than
9 years ago
46453905d6
Apply remaining ENABLED/DISABLED conditionals
9 years ago
270c766de2
SDCARDDETECT -> SD_DETECT, added docs
...
- `SD_DETECT_PIN` replaces `SDCARDDETECT`
- `SD_DETECT_INVERTED` replaces `SDCARDDETECTINVERTED`
- Revise the description of `SD_DETECT_INVERTED`
- Add a note about the override of `SD_DETECT_INVERTED` in
`Conditionals.h`
9 years ago
8d3b74cc6e
Rename SDCARDDETECT to SDCARDDETECT_PIN
...
- Rename the pin so it can be tested with `PIN_EXISTS`
- Fix some incorrect tests for `SDCARDDETECT`
9 years ago
94a796c8cc
Rename BEEPER to BEEPER_PIN
...
For consistency with other pins, allowing use of `PIN_EXISTS` macro.
9 years ago
0d8989fc14
Overridable Options - Part 7 (PR#2559)
...
Apply `ENABLED` / `DISABLED` macros to LCD-related files.
9 years ago
c66955aaf9
Mark unchanging arrays as const (PR#2494)
...
The compiler may be able to optimize if it knows an array won’t be
changing.
9 years ago
69b0490b77
Show minimal preheat options in menus (PR#2471)
9 years ago
722829b058
Move buzzing code to buzzr.h & buzzer.cpp (PR#2307)
...
at least the lcd independent part from Marlin_main.cpp.
10 years ago
a274769f4f
Clean up spacing and comments
...
Also clean up some trailing spaces in a few other sources
10 years ago
6ab7b560af
Rework buzzing (PR#2296)
...
by:
Moving HAS_LCD_BUZZ macro to Coditionals.h
Renaming HAS_LCD_BUZZ to HAS_BUZZER to make clear is has nothing to do with the lcd.
Removing the ULTRALCD condition.
Moving declaration of lcd_buzz() out of the ULTRA_LCD block in ultralcd.h
Moving definition of lcd_buzz() out of the ULTIPANEL block in ultralcd.cpp
Renaming lcd_buzz() to buzz() to make clear is has nothing to do with the lcd.
All buzzing code is now only dependent on the existence of a BEEPER-pin or the definition of a LCD_USE_I2C_BUZZER.
To do: Check the conditions for the BEEPER-pin in all pin-files.
10 years ago
90f858aa85
Use translated strings for axis movement (PR#2280)
...
Suggest we use the translated strings here. They use (except for
German) the phrasing “Move X” instead of just the axis letter, but they
should fit the available space. The “Extruder” string would be the
same, except it will be translated.
10 years ago
e7e964432b
consistency name for multiplier
...
replace extruder_multiply with extruder_multiplier
like feedrate_multiplier or volumetric_multiplier
10 years ago
f18f689c01
Replace MSG_F? with MSG_N?
...
To avoid double definitions.
I prefer to read N for Number not for Nozzle.
10 years ago
bc0764894a
Shift call of start_watching_heater() into setTargetHotend()
...
to warrant watching is set or reset.
Make setTargetBed() in _lcd_preheat() dependant of TEMP_SENSOR_BED.
Use disable_all_heaters() in lcd_cooldown() and abort_on_endstop_hit.
10 years ago
ca8d1756d5
Define fixes
...
Fixed a couple defines that were not changed or commented out.
10 years ago
a83bf18ee1
More functional seperation
...
Moved SDCARDDETECTINVERTED and SDSLOW to Conditionals.h.
Added U8GLIB_LM6059_AF to define display specific actions.
Added reminder to compile in u8glib
10 years ago
047e688e93
Changed ADAFRUIT_ST7565 to ELB_FULL_GRAPHIC_CONTROLLER
...
Rename of define to avoid confusion between the controller and the
display which had similar names.
10 years ago
41f8cdb3a6
ADAFRUIT_ST7565
...
Added support for new display type
10 years ago
fcfd99c1ae
Add comments to lcd_control_temperature_menu
10 years ago
9b3d4380d3
Only watch the heater that was set
10 years ago
54deb9eea3
Enable WATCH_TEMP_PERIOD by default
10 years ago
8f8bf3a897
Make Marlin actually compile when #define REPRAPWORLD_KEYPAD is uncommented
10 years ago
d4c74b8f8c
Don't apply M428 if an error occurs
...
- Also move audio feedback into the command
- Added shorthand for `lcd_buzz` availability
10 years ago
d065d37822
Add M428 to set home_offset logically
10 years ago
0f687b5dda
Merge branch 'Development' into eeprom_in_gcode
...
Latest upstream commits
10 years ago
Scott Lahteine