Scott Lahteine
a8b6b6a128
Merge pull request #4252 from thinkyhead/rc_rename_hpb
...
Replace PLA/ABS preheating with generic
2016-07-12 20:00:33 -07:00
Scott Lahteine
ecd5e810ac
No delay for the smallest LCD moves
2016-07-12 18:09:01 -07:00
Scott Lahteine
2b9515d60f
Merge pull request #4281 from AnHardt/lang-system
...
Don't use UTF-strlen() if the text is not UTF
2016-07-12 17:21:28 -07:00
Scott Lahteine
e9f62d8fdb
Remove extraneous conditions for encoder position
2016-07-12 16:41:00 -07:00
AnHardt
54d35230df
Don't use UTF-strlen() if the text is not UTF
2016-07-12 19:59:03 +02:00
Scott Lahteine
4865447830
Merge pull request #4276 from esenapaj/Suppress-warnings
...
Suppress warnings
2016-07-11 19:08:59 -07:00
Scott Lahteine
6e68dd292b
Merge pull request #4243 from thinkyhead/rc_fix_static_scrolling
...
Improve STATIC_ITEM implementation
2016-07-11 18:25:00 -07:00
Scott Lahteine
d17b161832
Don't draw current screen if simply changing screens
2016-07-11 18:14:04 -07:00
Scott Lahteine
096f9981d1
Scroll to the top when changing screens
2016-07-11 18:14:04 -07:00
Scott Lahteine
155af6b861
Rename vars, add comments for menu macros
2016-07-11 18:14:04 -07:00
Scott Lahteine
31f2cf5f6f
Make encoderLine signed for proper compares
2016-07-11 18:14:03 -07:00
Scott Lahteine
d2099fef0d
Left-justify thermistor info
2016-07-11 18:14:03 -07:00
Scott Lahteine
85aeb02aa6
Invert headings on Graphical LCD
2016-07-11 18:14:03 -07:00
Scott Lahteine
13dc619f43
Scroll static screens more simply
2016-07-11 18:14:02 -07:00
Scott Lahteine
5051723c2e
Redraw after cursor correction in STATIC_ITEM
2016-07-11 18:14:02 -07:00
esenapaj
58177a1602
Suppress warnings
2016-07-12 08:22:24 +09:00
Scott Lahteine
10ebf28ee3
Allow override of ENCODER_FEEDRATE_DEADZONE, lower default for Viki
2016-07-11 15:43:08 -07:00
Scott Lahteine
6121c9018a
Merge pull request #4265 from thinkyhead/rc_buzzer_patchup
...
Two strategies to address a stuck buzzer
2016-07-10 19:46:15 -07:00
Scott Lahteine
71674059c3
Two strategies to address a stuck buzzer
2016-07-10 19:25:23 -07:00
Petr Zahradnik
eaf9e615ce
Total print time for LCD correction (hours:minutes format)
2016-07-10 13:08:05 +02:00
Scott Lahteine
f9e08b1fcd
Merge pull request #4254 from AnHardt/killscreen
...
Add a kill-screen
2016-07-09 20:44:42 -07:00
AnHardt
faac2bcfdb
Add a kill-screen
2016-07-10 04:50:45 +02:00
Scott Lahteine
1026e5b071
Replace PLA/ABS preheating with generic
2016-07-09 18:06:51 -07:00
AnHardt
de3a169336
Always define MIN_Z_HEIGHT_FOR_HOMING even if 0
...
Always define MIN_Z_HEIGHT_FOR_HOMING even if 0
Always make a potential rise to `home_offset[Z_AXIS]` possible in G28.
Get rid of some very ugly constructs in MBL (ultralcd.cpp).
2016-07-08 15:08:32 +02:00
Scott Lahteine
834ad14c8d
Add quickstop_stepper to update current position with stepper.quick_stop()
2016-07-07 16:37:22 -07:00
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