Scott Lahteine
f9e4717f5b
Merge pull request #5892 from thinkyhead/rc_msg_heating_pstr
...
Use PSTR for MSG_HEATING
2017-02-22 12:26:08 -06:00
Scott Lahteine
34cba42104
Use PSTR for MSG_HEATING
2017-02-22 11:30:19 -06:00
Roxy-3D
584d147a02
fixup the indentation
2017-02-22 07:23:54 -07:00
Roxy-3D
e443e0e2a9
Fix scoping issues for double click to Z-Babystepping
2017-02-21 18:15:28 -07:00
Roxy-3D
17d1cd7c09
Double Click of Encoder Wheel Jumps to Z-BabyStepping
2017-02-21 18:08:19 -07:00
Roxy-3D
48d862377a
Double Click of Encoder Wheel Jumps to Z-BabyStepping
2017-02-21 18:04:31 -07:00
Scott Lahteine
cfdc189796
Merge pull request #5856 from thinkyhead/rc_fix_bad_comment
...
Remove non-applicable comment on MANUAL_Z_HOME_POS
2017-02-20 17:54:30 -06:00
Scott Lahteine
2efdc72aa5
Merge pull request #5876 from thinkyhead/rc_hotend_status
...
Add status_printf to print messages to the lcd status line.
2017-02-20 17:29:27 -06:00
dot-bob
cd68380ce6
Add status_printf to print messages to the lcd status line.
...
Also add a hotend indicator to the heating message displayed on the lcd status line.
2017-02-20 15:26:54 -06:00
Scott Lahteine
012aff6823
Merge pull request #5862 from thinkyhead/rc_fix_a_thing
...
Finish reducing of ABL_BILINEAR_SUBDIVISION
2017-02-18 21:36:28 -06:00
Scott Lahteine
b9187020c4
Finish reducing of ABL_BILINEAR_SUBDIVISION
2017-02-18 20:01:19 -06:00
Scott Lahteine
e282b72151
Remove non-applicable comment on MANUAL_Z_HOME_POS
2017-02-18 05:14:43 -06:00
Scott Lahteine
49d562d23d
Merge pull request #5855 from thinkyhead/rc_followup_5840
...
Apply DISTINCT_E_FACTORS to sync_from_steppers
2017-02-18 04:51:01 -06:00
Scott Lahteine
57f92a4632
Apply DISTINCT_E_FACTORS to sync_from_steppers
...
Followup to #5840
2017-02-18 04:36:41 -06:00
Scott Lahteine
4da8b1494b
Merge pull request #5854 from thinkyhead/rc_fixup_m600
...
M600 cleanup and bugfix
2017-02-18 04:27:13 -06:00
Scott Lahteine
dd02dba6e6
Merge pull request #5840 from MagoKimbra/rc_fix_lin_advanced_step_to_mm
...
Fix steps_to_mm for active extruders
2017-02-18 04:25:53 -06:00
Scott Lahteine
6e0b3fcc08
Optimize M600 heater status LCD items
2017-02-18 04:08:00 -06:00
Scott Lahteine
44b4e116bd
Commentary / style in gcode_M600
2017-02-18 04:08:00 -06:00
Scott Lahteine
561904345f
Tweak config ordering for M600
2017-02-18 00:01:31 -06:00
Scott Lahteine
7fdc620ef7
Merge pull request #5850 from thinkyhead/drop_some_comments
...
Remove some old code comments
2017-02-17 16:45:44 -06:00
Scott Lahteine
284d6de9da
Remove some old code comments
2017-02-17 15:25:56 -06:00
MagoKimbra
3685224c1a
Fix steps_to_mm for active extruders
2017-02-15 21:45:39 +01:00
Scott Lahteine
babe1d211c
Merge pull request #5794 from thinkyhead/rc_m600_improve
...
M600 wait for heatup, prevent stepper timeout, etc.
2017-02-15 05:38:06 -06:00
Scott Lahteine
4578c573fe
Pause the print job timer while in M600
2017-02-15 05:29:34 -06:00
Scott Lahteine
bfe6f71794
Simplify filament_change_beep function
2017-02-15 05:29:34 -06:00
Scott Lahteine
8289ea1316
Use a short name for the filament "endstop"
2017-02-15 05:29:34 -06:00
Scott Lahteine
d9dcef8a87
Spacing, coding standards
2017-02-15 05:29:34 -06:00
Scott Lahteine
931914e679
Apply M600 updates to all configs
2017-02-15 05:29:34 -06:00
Roxy-3D
8bf0b496b9
Improve M600 with timeout, wait for heatup.
2017-02-15 05:29:34 -06:00
Scott Lahteine
58b8e0cae7
Merge pull request #5837 from thinkyhead/rc_fix_mbl_homing
...
Fix broken homing in MBL
2017-02-15 04:48:30 -06:00
Tannoo
c40fe2113c
Fix for broken MBL
...
LCD call was waiting forever, causing the system to hang.
2017-02-15 04:39:22 -06:00
Scott Lahteine
4d4745c0eb
Parenthesize some menu defines for safety
2017-02-14 23:12:27 -06:00
Scott Lahteine
20ef0a6e27
Merge pull request #3152 from thinkyhead/sd_alpha_sort
...
SD files alphabetical sort in LCD menus
2017-02-14 21:48:57 -06:00
Scott Lahteine
47f9883b0f
Dynamic allocation for SDCARD_SORT_ALPHA
2017-02-14 21:37:25 -06:00
Scott Lahteine
a561bd5e3a
New feature: SDCARD_SORT_ALPHA
2017-02-14 21:37:24 -06:00
Scott Lahteine
c04d6b5aa6
Merge pull request #5829 from thinkyhead/rc_fix_isr_reentry
...
Combine fixes for LIN_ADVANCE and temperature ISR
2017-02-14 20:36:58 -06:00
Scott Lahteine
467f01435f
Merge pull request #5816 from thinkyhead/rc_abl_virt_reduce
...
Reduce memory use by ABL_BILINEAR_SUBDIVISION slightly
2017-02-14 08:41:44 -06:00
Scott Lahteine
97b6fb6381
Reduce / optimize LIN_ADVANCE code
2017-02-14 07:52:03 -06:00
Sebastianv650
271ced7341
Prevent re-entering of temperature ISR
...
If Marlin is inside the temperature ISR, the stepper ISR is enabled. If
a stepper event is now happening Marlin will proceed with the stepper
ISR. Now, at the end of the stepper ISR, the temperatre ISR gets enabled
again. While Marlin proceed the rest of the temperature ISR, it's now
vulnerable to a second ISR call.
2017-02-14 07:52:03 -06:00
Sebastianv650
1b59766fcb
Cleanup position_float
...
Hopefully fixes Marlin #5481
2017-02-12 13:09:06 +01:00
Scott Lahteine
a950c31e2d
Merge pull request #5815 from thinkyhead/rc_pulses_per_step
...
Give encoder pulse/steps conditionals their own block
2017-02-12 04:14:00 -06:00
Scott Lahteine
7176de8605
Merge pull request #5814 from thinkyhead/hotend_loop_always
...
Make HOTEND_LOOP more consistent, let compiler optimize it
2017-02-12 04:13:14 -06:00
Scott Lahteine
adec219ca5
Merge pull request #5811 from thinkyhead/fix_two_strings
...
No space after X: or A: in M114 output
2017-02-12 04:11:51 -06:00
jes
eaa829b58c
Reduce memory use by ABL_BILINEAR_SUBDIVISION slightly
2017-02-12 04:09:48 -06:00
Scott Lahteine
1c99ca82d8
Give encoder pulse/steps conditionals their own block
2017-02-12 03:57:57 -06:00
Scott Lahteine
e44294bb4d
Make HOTEND_LOOP more consistent, let compiler optimize it
2017-02-12 02:50:38 -06:00
Scott Lahteine
701f4a6d9d
Merge pull request #5729 from Bob-the-Kuhn/guaranteed-BLTouch-detection
...
guaranteed BLTouch detection
2017-02-12 01:13:35 -06:00
Scott Lahteine
c15b9a6a06
No space after X: or A: in M114 output
2017-02-12 00:10:03 -06:00
Scott Lahteine
e1702816f6
Fix SD_CHECK_AND_RETRY condition
...
Addressing #5806
2017-02-11 23:55:56 -06:00
Scott Lahteine
c64ecf95e2
Merge pull request #5808 from thinkyhead/rc_delta_float_radius
...
Cast DELTA_PRINTABLE_RADIUS to float in sq()
2017-02-11 23:43:46 -06:00
