Scott Lahteine
160a2be117
Change cancel_heatup to wait_for_heatup
2016-07-06 09:17:50 -07:00
Scott Lahteine
ef8980bfa0
Shorter labels for Print Stats info
2016-07-03 16:00:24 -07:00
Scott Lahteine
2ed625dafa
Fix compiler warnings for static screens
2016-07-03 15:26:17 -07:00
Scott Lahteine
982f10e6a0
Use STATIC_ITEM for LCD message display
2016-07-02 15:47:15 -07:00
Petr Zahradnik
43ff0ce35f
Rewritten FILAMENT_CHANGE_ENABLE feature
2016-07-02 15:34:33 -07:00
Scott Lahteine
51b7820686
Patch up About Printer sub-menus
2016-07-02 15:22:34 -07:00
Anthony Birkett
7a377c1d75
Add "About Printer" information menu.
...
Includes:
*firmware version / branch / date.
*extruder count
*board information (name, serial details, power supply type)
*thermistors (names, min/max temperatures)
*printer statistics (PRINTCOUNTER details)
Thanks to @thinkyhead for contributions.
2016-07-02 15:22:26 -07:00
Scott Lahteine
bd491818d6
Reduce storage requirements for strings, make some PGM
2016-06-27 20:36:18 -07:00
Edward Patel
da88b00585
MBL: Add support for max z endstop
...
See https://github.com/MarlinFirmware/Marlin/issues/4088
2016-06-25 21:58:02 +02:00
Scott Lahteine
74878d1f16
Always do a brief delay in lcd_quick_feedback
2016-06-24 14:46:10 -07:00
Scott Lahteine
bb9c67b4b5
Tweak some feedrate vars
2016-06-22 03:27:31 -07:00
Scott Lahteine
bbf5b486c3
Add an SD Card stop function, use in ultralcd
2016-06-17 18:27:14 -07:00
Scott Lahteine
1000563d80
Make M851 standard with a bed probe
2016-06-17 15:19:42 -07:00
edwilliams16
114d9db7d0
Show babysteps on the LCD in mm, not steps
2016-06-15 23:03:24 -07:00
Alexander Leisentritt
c2b7ef1e7e
"e" was renamed to "eindex" in a previous commit
2016-06-15 11:11:16 +02:00
Scott Lahteine
4d2119f83a
_lcd_move => _lcd_move_xyz
2016-06-12 17:14:19 -07:00
Scott Lahteine
811967923a
Fix manual_move to move the correct E stepper
2016-06-12 17:14:19 -07:00
Scott Lahteine
b322ac4417
No need to check ULTIPANEL with DOGLCD
2016-06-11 16:50:06 -07:00
Scott Lahteine
ae9b09fe94
menu => screen
2016-06-11 14:53:39 -07:00
Scott Lahteine
45ea8749d3
Wrap all items depending on ULTIPANEL
2016-06-11 14:27:34 -07:00
Blue-Marlin
378ff92e98
manage_manual_move(); -> ULTIPANEL
...
Makr the call of `manage_manual_move() ` depandent of `ULTIPANEL`
2016-06-10 23:36:57 +02:00
Scott Lahteine
e2d4919c01
Merge pull request #3991 from thinkyhead/rc_axis_units
...
Rename some vars to clarify their relationship to acceleration
2016-06-09 20:57:01 -07:00
João Brázio
5b5aa1572b
Non-blocking buzzer
2016-06-09 20:20:05 -07:00
Scott Lahteine
72c6f2923f
axis_steps_per_unit => axis_steps_per_mm
2016-06-09 17:04:51 -07:00
Scott Lahteine
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`
2016-06-09 17:04:50 -07:00
Scott Lahteine
b23f710034
Cleanup and naming for num-to-string functions
2016-06-08 13:12:27 -07:00
Scott Lahteine
47b5c55c29
Implement the delayed-move technique
2016-06-05 02:29:49 -07:00
Scott Lahteine
a3e25a0fca
Instead of trying to move now, set a flag to move asap
2016-06-05 02:29:48 -07:00
Scott Lahteine
43947072d5
Merge pull request #3895 from thinkyhead/rc_singlenozzle_part_2
...
SINGLENOZZLE: EXTRUDERS versus HOTENDS
2016-06-04 15:23:17 -07:00
Scott Lahteine
c2362c1b3c
Apply Marlin coding standards to MBL class
2016-06-03 21:43:32 -07:00
Edward Patel
c06de0f097
MBL: Added keeping MBL active when homing single axises for #3750
2016-06-03 21:42:29 -07:00
Scott Lahteine
cd441ce652
SINGLENOZZLE: EXTRUDERS versus HOTENDS
2016-06-03 17:38:03 -07:00
Scott Lahteine
32f8300cc6
Merge pull request #3944 from thinkyhead/rc_eboston_lcd_contrast
...
Improved LCD contrast handling
2016-06-03 17:08:41 -07:00
Scott Lahteine
664b299a51
This fix is not DELTA compatible
2016-06-02 17:16:19 -07:00
Scott Lahteine
064efb20e0
Also call clear_command_queue for lcd_sdcard_stop
2016-06-02 17:16:19 -07:00
Scott Lahteine
6277395e1e
set_current_position_from_planner() after stepper.quick_stop()
2016-06-02 17:16:19 -07:00
Scott Lahteine
381bc6f0b0
set_position => set_position_mm
2016-06-02 17:16:19 -07:00
Scott Lahteine
efa7209acf
Improved LCD contrast handling
...
Based on MarlinFirmware/MarlinDev#200 from @eboston
2016-06-02 16:17:34 -07:00
Scott Lahteine
bd97bbc52a
Make HAS_LCD_CONTRAST a boolean flag
2016-05-31 11:47:02 -07:00
Scott Lahteine
3861f1e0da
Merge pull request #3908 from jbrazio/bugfix/3826
...
Closes #3826 : SD printing will now pause and stop the print counter
2016-05-30 00:08:57 -07:00
Scott Lahteine
dc22097b3a
Fix some of array initializations
...
- In `stepper.h` init `count_direction` array
- In `ultralcd.cpp` init `autotune_temp` array
2016-05-29 20:55:13 -07:00
João Brázio
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.
2016-05-30 00:56:39 +01:00
Scott Lahteine
a4ed988c60
Two index finding functions for MBL
2016-05-23 14:25:42 -07:00
Scott Lahteine
8218558953
Update comments, rename next_ping_ms, followup to #3797
2016-05-19 16:44:57 -07:00
AnHardt
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)
2016-05-19 15:41:09 +02:00
Scott Lahteine
754b0152f5
Fix MBL zigzag calls
2016-05-15 12:35:01 -07:00
Scott Lahteine
14cd0f4c92
Merge pull request #3740 from thinkyhead/rc_lcd_home_options
...
Individual Axis Homing LCD menu items
2016-05-12 11:59:46 -07:00
João Brázio
09150cae79
Individual Axis Homing LCD menu items
2016-05-11 19:28:19 -07:00
Scott Lahteine
4dc4e2063f
Add REVERSE_ENCODER_DIRECTION option
2016-05-11 15:39:28 -07:00
Scott Lahteine
51109d4af7
Use AxisEnum with _lcd_babystep()
2016-05-05 21:04:30 -07:00
Scott Lahteine
b65ea98d6b
Localize babystepping in the Temperature class
...
So that `ultralcd.cpp` doesn’t need to worry about the details.
2016-05-05 15:00:31 -07:00
esenapaj
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.
2016-05-05 18:01:39 +09:00
Scott Lahteine
084f6b5b44
Temperature singleton class
2016-05-04 19:42:12 -07:00
Scott Lahteine
b4b5c7a6b7
Merge pull request #3670 from thinkyhead/rc_scoovo_controller
...
Use directional buttons when defined
2016-05-03 17:42:18 -07:00
Scott Lahteine
ddafb859e2
Use directional buttons when defined
2016-05-03 12:50:49 -07:00
esenapaj
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.
2016-05-03 18:28:37 +09:00
Scott Lahteine
60c6efb75c
Merge pull request #3653 from thinkyhead/rc_bed_temp_watch_merge
...
Introduce temp watch protection for the bed
2016-05-01 13:58:28 -07:00
gralco
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
2016-05-01 13:12:51 -07:00
Scott Lahteine
96f51f400f
Planner singleton class
2016-04-30 17:26:50 -07:00
Scott Lahteine
5e4e535ce8
Stepper and Endstops as singleton objects
2016-04-30 17:26:50 -07:00
Scott Lahteine
88c6693b9e
Fix a typo in #3586 to fix MBL
2016-04-22 20:04:08 -07:00
Scott Lahteine
003aab6dfd
Revert MBL menus to "known" working point
2016-04-21 12:59:55 -07:00
Scott Lahteine
dc2281d2f4
Add nextMenu, nextEncoderPosition to change menus after handler loop
2016-04-20 20:19:12 -07:00
Scott Lahteine
7fa2bda1b9
Give the "alive dot" its own blink
2016-04-20 18:57:17 -07:00
Scott Lahteine
9d5e1f32fd
Use axis_homed in _lcd_level_bed_homing, item in Prepare before homing
2016-04-20 18:53:33 -07:00
Scott Lahteine
9bcb72e7f8
Further patches to MBL - break up into more handlers
2016-04-20 16:37:35 -07:00
Scott Lahteine
3f6ae85748
Fix some MBL display issues for DOGLCD
2016-04-20 16:36:45 -07:00
Scott Lahteine
3db5a75f30
Merge pull request #3568 from thinkyhead/rc_various_fixes
...
General code cleanup, improved naming, etc.
2016-04-19 20:53:38 -07:00
Scott Lahteine
78747b1328
min_pos/max_pos => sw_endstop_min/sw_endstop_max
2016-04-19 19:43:38 -07:00
Scott Lahteine
ba84d8d091
Allow setting PIDTEMP and PIDTEMPBED together or apart
2016-04-19 18:09:29 -07:00
Scott Lahteine
4f04bf7fe8
Show steps done in the babystep display
2016-04-18 20:52:38 -07:00
Scott Lahteine
c242bee449
Add a final lift, if configured, in Manual Bed Leveling
2016-04-17 00:12:46 -07:00
Scott Lahteine
234987ee2f
Fix MBL lift
2016-04-16 14:17:06 -07:00
Scott Lahteine
e0830bf8f1
Don't use LCD alert unless error or alert level is reset later
2016-04-15 18:48:49 -07:00
Scott Lahteine
866c5be395
Merge pull request #3500 from thinkyhead/rc_shrink_menu_macros
...
Reduce redundancy in MENU_ITEM code
2016-04-14 19:09:14 -07:00
Scott Lahteine
4fb8013be1
Reduce redundancy in MENU_ITEM code
2016-04-14 18:42:06 -07:00
Scott Lahteine
2129db581e
Simplify MBL movement, zigzag
2016-04-14 16:58:42 -07:00
Scott Lahteine
0493fccc0b
mbl.active is a bool now
2016-04-14 16:58:42 -07:00
Scott Lahteine
b05f448317
Comments on MBL menu items
2016-04-14 16:58:42 -07:00
Scott Lahteine
fda8f96f00
Fix bug in lcd_preheat_pla0123 and lcd_preheat_abs0123
...
Trying to preheat a non-existent extruder causes a crash.
2016-04-14 15:48:43 -07:00
Scott Lahteine
2ae7394640
More fine-grained control of LCD redraw
2016-04-12 21:34:34 -07:00
Scott Lahteine
3a1ac14bbc
Merge pull request #3437 from thinkyhead/rc_lcd_encoder_movement
...
More bits when encoderPosition is cast as signed
2016-04-11 17:03:23 -07:00
Scott Lahteine
386140f361
Test time difference in safe way
2016-04-10 18:09:31 -07:00
Scott Lahteine
8198cc30b5
More bits when encoderPosition is cast as signed
2016-04-09 14:22:12 -07:00
Scott Lahteine
4e17187c96
Merge pull request #3426 from thinkyhead/rc_no_unhomed_lcd_move_on_delta_scara
...
No LCD Move for unhomed Delta/SCARA
2016-04-07 19:29:45 -07:00
Scott Lahteine
5fc6daba2b
Disallow REPRAPWORLD_KEYPAD moves on Delta/SCARA until homed
2016-04-07 18:40:54 -07:00
Scott Lahteine
165e73794a
Tweak encoderPosition non-zero test
2016-04-07 16:09:42 -07:00
Scott Lahteine
479d307a44
Disable LCD Move XYZ for unhomed Delta/SCARA
2016-04-07 16:09:42 -07:00
Scott Lahteine
fb38d698db
Add feedback after "Click to Begin"
2016-04-05 15:35:05 -07:00
Scott Lahteine
582b58e660
Add audio feedback to edit items
2016-04-05 14:51:11 -07:00
Scott Lahteine
a70c3ffc21
Minor syntax tweak with encoderPosition
2016-04-05 14:51:11 -07:00
Scott Lahteine
0f247187b8
Drop extra setting of currentMenu
2016-04-05 14:51:11 -07:00
Scott Lahteine
24cde86a4f
Fix syntax highlighting of menu_edit_type lines
2016-04-05 14:51:11 -07:00
Scott Lahteine
86372cd394
Add underscore to internal lcd move function names
2016-04-05 14:51:11 -07:00
Scott Lahteine
aa97328cd3
Use min_pos/max_pos for _lcd_move
2016-04-05 14:51:10 -07:00
Scott Lahteine
f936df9507
Small cleanup of feedrate dead-zone
2016-04-05 14:51:10 -07:00
Scott Lahteine
f5c2fb27cd
Handle defer_return_to_status in lcd_goto_menu
2016-04-05 14:51:10 -07:00
Scott Lahteine
8459f7fa5c
Use ms
where possible.
2016-04-05 14:51:10 -07:00
Scott Lahteine
34ce9c4c1c
Restore save previous for menu edit items
2016-04-05 14:26:36 -07:00
Scott Lahteine
1220dfd5d6
Fix: menu edit items saving position twice
2016-04-04 16:36:04 -07:00
Scott Lahteine
d771174797
Merge pull request #3337 from esenapaj/patch-2
...
suppress warnings
2016-04-03 17:01:22 -07:00
Scott Lahteine
7a2f73c6db
Remove extra comma from LCDHandlerAction
2016-04-03 16:27:30 -07:00
Scott Lahteine
3fbf67e5ce
Patch MBL feedback and event handling
2016-04-03 16:27:30 -07:00
Scott Lahteine
ef2fbaec98
Headings for menu sub-items, actions, etc.
2016-04-03 16:27:29 -07:00
Scott Lahteine
dc109ac4e2
Move MBL code to its logical place
2016-04-03 16:27:29 -07:00
Scott Lahteine
6730408ec1
Move lcd_autostart_sd to its logical place
2016-04-03 16:27:29 -07:00
Scott Lahteine
056b80dc53
Have "back" menu items go to the previous item
2016-04-03 16:27:29 -07:00
Scott Lahteine
c94482168b
Add MSG_LEVEL_BED_CANCEL for MBL
2016-04-03 16:27:29 -07:00
esenapaj
f9e1a0ee6c
suppress warnings
2016-04-04 06:48:53 +09:00
Scott Lahteine
771ee1c1a9
Update MBL menu sub-function names
2016-04-02 18:20:47 -07:00
Scott Lahteine
d659777e70
Fix MBL to handle re-entrant calls
2016-04-02 18:14:49 -07:00
Scott Lahteine
5719fcba51
Add MSG_LEVEL_BED_DONE and MSG_LEVEL_BED_WAITING
2016-04-02 18:14:49 -07:00
Scott Lahteine
d1c45ff80b
More user interaction in MBL
2016-04-02 18:14:49 -07:00
Scott Lahteine
240b71ee1c
Give names to lcdDrawUpdate values
2016-04-02 18:14:48 -07:00
Scott Lahteine
b0a3c7a91c
Add feedback sounds to MBL items
2016-04-02 17:08:43 -07:00
Scott Lahteine
782c598e66
Use ftostr43 with '+' option in MBL Z adjuster
2016-04-02 17:08:43 -07:00
Scott Lahteine
f08b0d034f
Merge pull request #3328 from RicardoGA/RC_Babystepping_fix
...
Babystepping Fix
2016-04-02 16:48:45 -07:00
RicardoGA
6b1d2263a2
Babystepping Fix
2016-04-02 14:53:57 -06:00
Alexander Hirzel
6e0d627c8c
Unbreak the Delta radius clipping
2016-04-02 12:58:39 -04:00
Alexander Hirzel
949172606f
Fix manual Y movement on delta (regression).
2016-04-02 10:48:13 -04:00
Scott Lahteine
b98f72b483
Small optimization for ftostr43
2016-04-01 17:54:16 -07:00
Scott Lahteine
a393941d2d
Combine "XYZ" with MSG_LEVEL_BED_HOMING
2016-04-01 17:51:03 -07:00
Scott Lahteine
097cc75ba8
Patch _lcd_level_bed draw to fix flicker, show proper offset
2016-04-01 17:51:03 -07:00
Scott Lahteine
1e1a18e091
Remove extra semicolon in ultralcd.cpp
2016-04-01 17:51:03 -07:00
Scott Lahteine
0b4f65dca8
Always limit blink to ~1 second intervals
2016-04-01 17:51:03 -07:00
Scott Lahteine
0d6609c3c5
lcd_goto_menu should set lcdDrawUpdate to 2
2016-04-01 17:07:40 -07:00
Scott Lahteine
af89ccf96a
Use flag to defer lcd return-to-status
2016-04-01 17:07:39 -07:00
Scott Lahteine
641b30217e
Patch prevEncoderPosition compile issue
...
Thanks to @jbrazio #3301
2016-04-01 17:07:39 -07:00
Scott Lahteine
92882fcc51
Allow lcd_implementation_drawedit to draw a message
2016-04-01 17:04:33 -07:00
Scott Lahteine
fcedfd6e99
Clean up num2str functions, extend ftostr43
2016-04-01 16:52:59 -07:00
Scott Lahteine
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.
2016-04-01 15:12:12 -07:00
Scott Lahteine
6a4d394fff
Fix pointer-to-string issues with set_home_offsets and _lcd_level_bed_homing
2016-03-30 12:32:25 -07:00
Scott Lahteine
f0b96f5cae
Merge pull request #3276 from thinkyhead/rc_sdprint_and_lcd_sleuth
...
Refinements, fixes, reduced stack usage in CardReader
2016-03-29 18:30:18 -07:00
Scott Lahteine
4ed8351e3d
Revert use of enqueue_and_echo_command_now
2016-03-29 16:23:12 -07:00
Scott Lahteine
b60ea95adf
Keep blinking limited to LCD_UPDATE_INTERVAL
2016-03-28 19:41:13 -07:00
Scott Lahteine
8cb04816b5
Apply PID_AUTOTUNE_MENU option to ultralcd.cpp
2016-03-25 19:31:56 -07:00
Edward Patel
14afe1a017
Move to Z=0 for G28 when using Manual Bed Leveling
...
copy of 406992f9dd
2016-03-25 04:58:44 -07:00
Edward Patel
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.
2016-03-25 04:58:43 -07:00
Scott Lahteine
f394c0639e
Merge pull request #3230 from jbrazio/bugfix/ultra-lcd-warning
...
Fix a compiler warning in ultralcd.cpp
2016-03-25 01:14:54 -07:00
Scott Lahteine
0da744b7b0
Further cleanup of comments, partial Doxygen-style
...
Following up on #3231
2016-03-25 00:45:56 -07:00
jbrazio
80f221ed11
Fixed: warning: extra tokens at end of #endif directive
2016-03-24 19:33:25 +00:00
jbrazio
5e5d250832
Added gplv3 header to all Marlin files
2016-03-24 18:01:20 +00:00
Scott Lahteine
04fa9d4f47
Make Autotune options into Menu Edit Items
2016-03-24 02:00:08 -07:00
WPBack
e3f583a3be
Fixes for PID AutoTune from menu
...
Fixes for #3189
Setting a temp is still missing
2016-03-24 01:47:30 -07:00
WPBack
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.
2016-03-24 01:46:37 -07:00
Scott Lahteine
15fccd43ee
Fix spacing of an #endif
2016-03-20 20:32:55 -07:00
Scott Lahteine
6a3529247f
"Homing" as a translatable string
2016-03-19 04:41:03 -07:00
Scott Lahteine
c97c2dcaf7
Use const parameters instead of static casting
...
Alternative fix to #3149
2016-03-19 03:36:53 -07:00
Scott Lahteine
4bbea5124d
Support for multiple PWM fans
2016-03-19 03:10:18 -07:00
Scott Lahteine
4634feaeab
Merge pull request #3012 from thinkyhead/fix_command_injection
...
Use a serial line buffer to prevent queue corruption
2016-03-19 01:43:54 -07:00