Scott Lahteine
06332f20be
Merge pull request #3113 from jbrazio/bugfix/3061-stop-print-time-counter
...
Stop print timer with M105/M109
2016-03-20 17:05:07 -07:00
AnHardt
b39b54031b
Fix KEEPALIVE_STATE
...
Add return to NOT_BUSY for M105
Replace WAIT_FOR_USER with PAUSED_FOR_USER
Add Travis test for FILAMENTCHANGEENABLE
2016-03-20 10:41:56 +01:00
Scott Lahteine
41145e6e81
Patch drain_queued_commands_P
...
Fix a SNAFU that should have been caught in #3012
2016-03-19 20:10:41 -07:00
Scott Lahteine
38b0082bf2
Additional tweaks to M42 exit conditions
2016-03-19 03:10:18 -07:00
Scott Lahteine
4bbea5124d
Support for multiple PWM fans
2016-03-19 03:10:18 -07:00
Scott Lahteine
637cc03686
Fix M109 so it won't wait for cooling
...
Addressing issue #2767
2016-03-19 03:00:58 -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
Scott Lahteine
963a92ceda
Patch idle forevermore
2016-03-18 22:38:35 -07:00
Scott Lahteine
7ec7bb31c4
Send a Busy signal to hosts during long processes, wait for input, etc
...
If Marlin is blocking the serial input or command queue for any length
of time (for example more than 2 seconds), it needs to send a message
to serial out to inform the host that it is busy. Marlin should only
send these messages out when busy, and preferably not when trying to
print formatted output.
2016-03-18 22:38:35 -07:00
Scott Lahteine
80277cc9c8
drain_queued_commands_P now returns true if there are more
2016-03-18 17:56:48 -07:00
Scott Lahteine
8fe7420310
Use a separate serial line buffer
2016-03-18 16:46:20 -07:00
Scott Lahteine
7d25c107a8
Merge pull request #3149 from esenapaj/patch-1
...
suppress warnings
2016-03-18 15:40:14 -07:00
Scott Lahteine
e8fa843c2d
Merge pull request #3164 from epatel/epatel/RCBugFix
...
Fix for #3160 MESH_BED_LEVELING broke correct G1 movement in Z
2016-03-16 02:40:54 -07:00
Scott Lahteine
d7c6fd5c2f
Merge pull request #3146 from thinkyhead/rc_enabled_true_false
...
Support "true" and "false" in the ENABLED macro
2016-03-15 17:35:55 -07:00
Edward Patel
cb0dbfa3b5
Fix for #3160 MESH_BED_LEVELING broke correct G1 movement in Z
2016-03-16 01:26:00 +01:00
Scott Lahteine
6e1bc03d3b
Additional wrapping for #3140
2016-03-15 01:18:58 -07:00
Scott Lahteine
1c384930f3
Merge pull request #3140 from thinkyhead/rc_fix_macro_expansion
...
Wrap macros to prevent bad expansions
2016-03-15 00:25:34 -07:00
esenapaj
a4314c4907
Use local variable in recalc_delta_settings()
...
diagonal_rod hadn't been used anywhere.
2016-03-15 06:47:27 +09:00
esenapaj
8de7a6f9b1
suppress warnings
2016-03-15 06:34:02 +09:00
Scott Lahteine
4b648793f2
Use ENABLED with DISABLE_[INACTIVE_][XYZ]
2016-03-13 22:15:45 -07:00
Scott Lahteine
3f5fbbd398
Merge pull request #3124 from jbrazio/bugfix/update-g29-auto-level-bed-topography
...
Update the bed topography output done by G29
2016-03-13 03:51:43 -07:00
Scott Lahteine
f9ded2a7c4
Wrap macros to prevent bad expansions
2016-03-12 22:38:55 -08:00
jbrazio
a645860431
All print timer related activity now uses print_job_start(), print_job_timer() or print_job_stop()
2016-03-12 07:16:39 +00:00
jbrazio
1981e53d68
M109 R option if misused could cause a wait-forever situation
2016-03-12 06:24:24 +00:00
João Brázio
4d4a842cfb
Update the bed topography output done by G29
2016-03-10 13:24:17 +00:00
João Brázio
793cd0ae3b
Clean up the code a bit
2016-03-10 11:52:43 +00:00
jbrazio
986b508ff7
Print timer now stops when it sees the last extruder temperature being shutdown
2016-03-08 18:11:02 +00:00
AnHardt
fd5414c6ea
Z_RAISE_BEFORE_HOMING -> MIN_Z_HEIGHT_FOR_HOMING
...
rebased
corrected spelling
changed to #elif for error
Still with MIN_Z_HEIGHT_FOR_HOMING but con be done with (folder wide) search-replace when we have a better name.
2016-03-08 17:50:23 +01:00
Scott Lahteine
b7928a000a
Merge pull request #3108 from AnHardt/M110+
...
M110 and M29 rework
2016-03-08 03:54:07 -08:00
Scott Lahteine
5cba0b4187
Merge pull request #3111 from thinkyhead/rc_drop_old_condition
...
Drop obsolete test for leading "N"
2016-03-08 03:07:25 -08:00
Scott Lahteine
302d1bfbc4
Drop obsolete test for leading "N"
2016-03-08 02:25:11 -08:00
AnHardt
37b857e8ec
M110 ang M29 rework
...
Add 'ok' output for G29 actually closing the file.
Handle M110 when received without linenumber/checksumm.
2016-03-07 22:27:01 +01:00
Scott Lahteine
fac85f6fa1
Merge pull request #3102 from jbrazio/bugfix-g28-multiple-z-movements
...
Bugfix: G28 was lifting Z-axis multiple times
2016-03-07 03:52:00 -08:00
jbrazio
642e3699ce
Z-axis was being lift multiple times if Z_SAFE_HOMING was enabled and Z_RAISE_BEFORE_HOMING was greater than zero
2016-03-07 03:49:11 +00:00
Scott Lahteine
501f63802a
Merge pull request #3077 from Blue-Marlin/watchdogreset-in-kill
...
Add Watchdog timer reset in kill()
2016-03-06 16:21:39 -08:00
Scott Lahteine
ef68c1910c
Check that the temperature is close to target
2016-03-06 05:51:56 -08:00
Scott Lahteine
ea9fd1200b
Fix M109 so it won't wait for cooling
...
Addressing issue #2767
2016-03-06 05:51:56 -08:00
Scott Lahteine
ff13070b59
Use _BV macros, patch up others
2016-03-06 05:51:55 -08:00
Scott Lahteine
209f5f21e0
Use macros where possible
...
Apply `constrain`, `NOMORE`, `NOLESS` and `CRITICAL_SECTION` macros
wherever possible.
2016-03-06 05:51:55 -08:00
Scott Lahteine
6e64895c30
Merge pull request #3001 from AlwaysTinkering/RCBugFix
...
Rc bug fix - Fix for issue #2931
2016-03-06 00:20:29 -08:00
Scott Lahteine
34b8b9f0f5
Merge pull request #2995 from thinkyhead/rcbugfix_corexy_corexz
...
Add CORE support to st_get_position_mm (and elsewhere)
2016-03-06 00:17:03 -08:00
Scott Lahteine
3a3d358df9
Fix Printrboard with LCD (redo)
...
Based on #2860 - rebased for RCBugFix
2016-03-05 22:13:00 -08:00
Scott Lahteine
eb85342fd9
Merge pull request #2989 from AnHardt/fix2661
...
Pre home display - Stepper release
2016-03-05 21:30:17 -08:00
Scott Lahteine
14f3ca1b2e
Merge pull request #2978 from thinkyhead/tool_offset_abl_rcbugfix
...
Apply bed leveling matrix when switching extruders
2016-03-05 21:23:25 -08:00
lrpirlet
0fb507a75d
correct raise_z_for_servo
2016-03-05 20:19:53 -08:00
Blue-Marlin
b4e5e0f11d
Add Watchdog reset in kill()
...
Add watchdog reset in the kill loop to simplify recovering.
2016-03-04 00:35:18 +01:00
Scott Lahteine
222d13d5ed
Merge pull request #3051 from thinkyhead/rcbugfix_dual_axis_offset
...
Code cleanup in gcode_T
2016-03-02 03:45:40 -08:00
Scott Lahteine
186629aee8
Merge pull request #3057 from jbrazio/3034-z_raise_after_probing_fix
...
Fix Z_RAISE_AFTER_PROBING for non DELTA printers
2016-03-02 03:14:27 -08:00
jbrazio
67e15aac3d
As pointed out by @Blue-Marlin the previous code would raise the Z axis
...
twice for a servo based probe.
2016-03-01 00:22:48 +00:00
jbrazio
17cc2a9663
Z_RAISE_AFTER_PROBING value was being ignored by Marlin because
...
raise_z_after_probing() was only called if the printer type was set to a
DELTA or if the printer had a docking sled for the probe.
2016-02-29 15:48:26 +00:00