Scott Lahteine
4823791eb0
Merge pull request #3228 from esenapaj/patch-1
...
Fix spelling
2016-03-25 00:40:51 -07:00
jbrazio
5e5d250832
Added gplv3 header to all Marlin files
2016-03-24 18:01:20 +00:00
esenapaj
89a845659a
Fix spelling
...
PROBABLE ->PROBEABLE
This is follow-up to #3069 ?
2016-03-25 02:13:37 +09:00
Scott Lahteine
af32a7d5d6
M120/M121 also set endstops non-homing state
2016-03-24 03:24:23 -07: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
c5857f96c8
Merge pull request #3182 from thinkyhead/rcbugfix_printrboard_revf
...
Add support for Printrboard RevF
2016-03-24 00:12:06 -07:00
Scott Lahteine
f774420488
Merge pull request #3196 from thinkyhead/rc_controllerfan_bug
...
Make DISABLE_INACTIVE_X, etc., true if missing
2016-03-24 00:11:46 -07:00
AnHardt
1c6a16d5bb
Send position updates to RH
...
Send position updates to RH where RH can not know the end position.
For example after G28 RepetierHost assumes to be at the homing-point,
but with a servo probe we are much higher. Now the RH-software-endstops
will prevent us from going down (if activated). With this patch the
internal position of RH is updated with `current_position[]`.
2016-03-23 13:30:50 +01:00
AnHardt
6486e8b74a
Call buzz() directly from M428
2016-03-22 15:05:04 +01:00
Scott Lahteine
b1a3a95ad4
Tweak controllerFan to save a cycle or two
2016-03-20 22:11:09 -07:00
Scott Lahteine
10caee2b7c
Merge pull request #3187 from AnHardt/target_extruder_number
...
Fix extrudernum in MSG_INVALID_EXTRUDER
2016-03-20 17:15:22 -07:00
Scott Lahteine
1cc316f1fd
Merge pull request #3082 from thinkyhead/updated_2820
...
This is quite comprehensive. If probes are disabled in any case when they shouldn't be, I'm sure we will hear about it soon.
2016-03-20 17:10:38 -07:00
Scott Lahteine
7bf5d117e7
Merge pull request #3069 from thinkyhead/rc_delta_compat_m48
...
Delta-compatible extensions to M48
2016-03-20 17:09:18 -07:00
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
338b69c24b
Fix extrudernum in MSG_INVALID_EXTRUDER
...
SERIAL_ECHO is not very good in printing uint8_t - so cast. to int.
2016-03-20 11:39:06 +01: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
59483221d5
Move stepper DAC to a separate file
2016-03-19 19:24:26 -07:00
Scott Lahteine
5d0570cea0
Make digitalPotWrite depend on HAS_DIGIPOTSS
2016-03-19 19:24:26 -07:00
Scott Lahteine
f96bc03081
Add M907-M910 g-codes support for Printrbot Rev. F
2016-03-19 19:24:26 -07:00
Scott Lahteine
cf7c444aff
Apply unknown_position_error elsewhere
2016-03-19 05:13:40 -07:00
Scott Lahteine
eda5190581
Check for known position in M48
2016-03-19 05:13:40 -07:00
Scott Lahteine
68085ca855
Updated M48 friendly for DELTA
...
Partial implementation with reference to MarlinFirmware/Marlin#3011
2016-03-19 05:13:40 -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
AnHardt
3f45a1acf9
Check probes only when deployed
...
Aim: Test probes in update_endstops only when activated
Changes:
Configurations
Add define for FIX_MOUNTED_PROBE to handle the situation where formerly ENDSTOPS_ONLY_FOR_HOMING had to be set, or lowering the nozzle below Z_PROBE_OFFSET_FROM_EXTRUDER could give an "endstop hit" message.
Add define for Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to indicate a common situation, that we have a probe but it is connected to an endstop pin
Add some comments
Shift some entries to have related things together.
Conditionals.h
We have a probe (HAS_Z_MIN_PROBE) if one of the pins is defined AND one of the probes is defined.
SanityCheck.h
Add some tests if the probe is connected and if we have defined a probe.
stepper.cpp
Changes to test the probe only when it is deployed (z_probe_is_active).
Test update_endstops() when the probe is deployed.
MarlinMain.cpp
a. set and reset z_probe_is_active in deploy_z_probe(), stow_z_probe() and dock_sled()
b. set and reset z_probe_is_active in the case a z-servo is moved to a defined position. The only remaining unhandled servo move is in M280 where we do not end in a defined position. If you want to handle a probe use M401/402
c. skip deploying/stowing when already deployed/stowed in the dedicated deploy/stow functions.
d. Handle the new FIX_MOUNTED_PROBE in parallel to a servo driven probe/endstop.
To do: In another PR. handle all probes in deploy/stow_z_probe.
Sort out SERVO_LEVELING vs. HAS_SERVO_ENDSTOPS.
2016-03-19 02:00:08 -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
AnHardt
1c889cd303
Refresh previous_cmd_ms during run_z_probe()
...
Refresh previous_cmd_ms during run_z_probe() to prevent:
stepper shutdown for expired DEFAULT_STEPPER_DEACTIVE_TIME
and extrudes for expired EXTRUDER_RUNOUT_SECONDS
(https://github.com/MarlinFirmware/MarlinDev/issues/238 )
2016-02-28 23:20:12 +01:00
AnHardt
4b02f33e69
Distribute config-changes to the other configurations
2016-02-28 23:20:04 +01:00
AnHardt
32ae9f9ab7
Fix stepper shutdown during waiting for temperatures
...
In the wait loops of M109 M190 idle() is called, what checks
stepper_inactive_time against previous_cmd_ms.
Because we can be several minutes inside the loop, resetting
previous_cmd_ms only outside the loop caused stepper shutdowns.
The name of previous_cmd_ms does not really reflect its use. It's set
not only when a new command was received or executed but also in many of
the movement routines. For that the little extension of using it during
the wait will (hopefully) not hurt.
# Conflicts:
# Marlin/Configuration_adv.h
2016-02-28 16:58:50 +01:00
AnHardt
b6e69e71ce
Make stepper shutdown after inactivity dependent
...
Make stepper shutdown after inactivity dependent on a new set of
#defines.
DISABLE_INACTIV_X
DISABLE_INACTIV_Y
DISABLE_INACTIV_Z
DISABLE_INACTIV_E
And make exemplaric Configuration.
Names can be discussed.
This makes the disabling of the steppers independent from the DISABLE_?
settings witch shut down the steppers immediately.
2016-02-28 16:58:42 +01:00
AnHardt
051325ccd7
Introduce axis_homed
...
Introduce additional variable axis_homed to replace axix_known_position
when the coordinate display should indicate the axis is not homed.
This is to distinguish between "not homed" and "inexact position possible
because stepper was disabled".
# Conflicts:
# Marlin/ultralcd_implementation_hitachi_HD44780.h
solved
2016-02-28 16:58:28 +01:00
Scott Lahteine
100271e6ac
minor cleanup in gcode_T
2016-02-27 19:56:56 -08:00
Scott Lahteine
6a4f06d35d
Fix GCode handling of spaces between command letter and first digit
2016-02-26 18:42:59 -08:00
CONSULitAS
ea8409ad5d
Fix: current_command_args contains command
...
@thinkyhead
Hi Scott,
your code from a0f362c@thinkyhead is great, but you forgot to skip the
command.
Symptom `M117 Test`shows `M117 Test` on LCD instead of `Test`.
see also
https://github.com/MarlinFirmware/Marlin/commit/a0f362c735401ebbcd95de3f
6f8e3c2f17ecc770 lines 941, 2851 and so on
Greetings and welcome back
Jochen
2016-02-24 09:35:04 +01:00
Scott Lahteine
e1beaf61eb
Merge pull request #2985 from AnHardt/adv-ok
...
Repair N in ADVANCED_OK
2016-02-18 17:06:26 -08:00
Scott Lahteine
0c9db67273
Merge pull request #2983 from AnHardt/ok-echo
...
Replace the "ok" in M280, M301, M304, M851 with output not including …
2016-02-17 19:09:41 -08:00
Scott Lahteine
8eaba020fb
Merge pull request #2973 from thinkyhead/fix_splash_url
...
Remove references to marlinfirmware.org
2016-02-17 17:05:06 -08:00
Scott Lahteine
be691b51f1
Remove references to marlinfirmware.org
...
The domain is gone and doesn’t redirect, so for now show no URL on the boot screen.
2016-02-17 14:41:46 -08:00
Scott Lahteine
83ffc9eb4f
Show raw steps in M114
...
This is a proposed change. This section of M114 output is a debug
extension according to RepRap wiki.
2016-02-15 15:59:24 -08:00
Scott Lahteine
373e8a1ad4
Fixes for COREXY and COREXZ coordinates
2016-02-15 15:59:24 -08:00
unknown
31656e68bc
Fix for homing X and Y before raising Z when Z_SAFE_HOMING is set.
2016-02-15 15:53:40 -06:00
unknown
8ea55323d8
Fix for not raising Z before homing X and Y
2016-02-15 14:52:04 -06:00
Scott Lahteine
711e5db19a
Tweak comment in process_next_command
2016-02-09 18:16:35 -08:00
Scott Lahteine
400e9329be
Allow spaces after a code letter
2016-02-09 18:03:13 -08:00
Scott Lahteine
cdcb80f3c5
Allow no-space after initial command
...
Addresses issue #2715
2016-02-09 18:00:35 -08:00
AnHardt
6f473f7fc6
Repair N in ADVANCED_OK
...
Send the correct line number.
If no N was in the command - non't send an N.
2016-02-09 19:23:26 +01:00
AnHardt
efbd705eda
Replace the "ok" in M280, M301, M304, M851 with output not including an "ok"
...
Replace the "ok" in M280, M301, M304, M851 with output not including an "ok"
to avoid senting two "ok"s for a single g-code.
Doing the same for M105 would break the input filters of the hosts.
For M105 the other "ok" is omitted.
2016-02-09 13:36:03 +01:00
Scott Lahteine
8e66028d25
Apply the ABL rotation matrix to the extruder offset.
2016-02-08 14:22:18 -08:00
Richard Wackerbarth
f6950acb8e
Residual unused variable — Backport
2015-12-10 19:48:08 -06:00
AnHardt
57da1b8497
Host parseble output for M109, M190 and M303
...
Make the output of M105 more similar to Repetier.
Make the text-print pert of M105 an extra function to make it reusable. `print_heaterstates()`
Use `print_heaterstates()` in M019, M190 and M303
2015-12-07 15:37:53 -06:00
AnHardt
fcceb98191
Unglobalize no_wait_for_cooling
2015-12-07 15:34:26 -06:00
Richard Wackerbarth
e293ea57f0
Unbalanced brackets in setPwmFrequency
...
This is a back port of the correct in issue #248
2015-11-30 05:44:32 -06:00
Scott Lahteine
17c23bbaf3
Shorten gcode_M221 yet function the same
2015-11-12 00:03:22 -06:00
Scott Lahteine
c0e791dbe9
Only look for "N" line number as first parameter
2015-11-12 00:03:22 -06:00
Scott Lahteine
b4af4441c5
Clean up watchdog impl.
2015-11-12 00:03:22 -06:00
Scott Lahteine
9bdab4f3a8
Clean up "else" and other spacing
2015-11-12 00:03:21 -06:00
Richard Wackerbarth
25d636c9e0
Compiler issues (PR#2696)
2015-11-11 23:52:11 -06:00
Scott Lahteine
ba6a243197
DEBUG message has no parameter (PR#2671)
2015-10-03 22:03:03 -05:00
Scott Lahteine
0c7f7ebcfb
Styling adjustments (PR#2668 & PR#2670)
...
Keep "astyled" reformatting
2015-10-03 22:02:45 -05:00
fmalpartida
0f149ea0c6
LCD home button causes repeated homing (PR#175)
...
Fix: increased debounce delay.
2015-09-14 06:31:49 -05:00
Scott Lahteine
b825567e0f
Drop www. from marlinfirmware.org (PR#175)
2015-09-14 06:28:53 -05:00
Scott Lahteine
bc50db9cf6
Implement PID_ADD_EXTRUSION_RATE
2015-09-12 07:53:20 -05:00
Scott Lahteine
fabf3ae4a0
Add final Z raise after Delta probe
2015-09-12 07:23:24 -05:00
Shane Francis
4c8330c15c
Trim Adjustments for Delta Configurations
2015-09-03 01:05:33 -05:00
Scott Lahteine
962120d1d2
Fix spacing in some conditional blocks
2015-08-27 20:59:09 -05:00
Richard Wackerbarth
20b4772155
Create DEBUG_LEVELING_FEATURE
2015-08-27 20:52:08 -05:00
Scott Lahteine
194f98ff95
Debug messages for homing and leveling
2015-08-27 20:52:08 -05:00
Richard Wackerbarth
6292d9e815
Rename ENABLE_AUTO_BED_LEVELING
...
With the introduction of the #if ENABLED(…)
reads better than
2015-08-27 20:52:08 -05:00
Christian Lefrançois
9897a9147c
Update ABL comments (PR#95)
...
* Updates the auto bed leveling comments ONLY.
* Renames "Z probe" word usage in //comments and #errors properly.
2015-08-26 05:51:38 -05:00
Scott Lahteine
23d742bf06
Don't free the stack array plane_equation_coefficients (PR#83)
2015-08-16 06:53:24 -05:00
Scott Lahteine
e3b1e08777
Patch G30 to use raise_z_for_servo (PR#73)
2015-08-15 21:47:04 -05:00
Scott Lahteine
a1eb90d5c0
Save another 30 bytes in gcode_SET_Z_PROBE_OFFSET
2015-08-12 21:26:32 -05:00
Scott Lahteine
91122277f4
Reduce gcode_SET_Z_PROBE_OFFSET by 88 bytes
2015-08-12 21:26:25 -05:00
AnHardt
5707a2c3d5
indexindexIntoAB is only vald for !DELTA
2015-08-11 17:32:11 -05:00
AnHardt
d8860f9ad9
Alway end at the same point
...
Always end at [RIGHT_PROBE_BED_POSITION, BACK_PROBE_BED_POSITION]
Regardles the evennes of auto_bed_leveling_grid_points.
2015-08-11 17:32:11 -05:00
AnHardt
4ca8f4a9a7
Always zigzag
...
Use the shortest way between probing-points.
2015-08-11 17:32:11 -05:00
AnHardt
3d23424121
Add array indexIntoAB[xx][yy]
...
and use it.
2015-08-11 17:32:11 -05:00
AnHardt
e2d69f66b2
Make Z_PROBE a Z_MIN_PROBE (PR#65)
...
Currently we use the probe exclusively as a device to find the build platform(bed).
For the currently supported setups this means, we use it as a additional min-endstop.
A triggered when not deployed probe disturbs the homing process for max-endstops.
Rename ENDSTOPPULLUP_ZPROBE to ENDSTOPPULLUP_ZMIN_PROBE
Rename Z_PROBE_ENDSTOP_INVERTING to Z_MIN_PROBE_ENDSTOP_INVERTING
Rename Z_PROBE_ENDSTOP to Z_MIN_PROBE_ENDSTOP
Rename DISABLE_Z_PROBE_ENDSTOP to DISABLE_Z_MIN_PROBE_ENDSTOP
Rename Z_PROBE_REPEATABILITY_TEST to Z_MIN_PROBE_REPEATABILITY_TEST
Rename Z_PROBE_ENDSTOP to Z_MIN_PROBE_ENDSTOP
Adjust comments accordingly
Remove Z_MAX check for the probe in update_endstops().
Using an delta related idea of @clefranc from #61 ,
extended to the general change for all setups.
Tested with Prusa i3, max-z-endstop and permanently triggered z-probe.
Worked for @clefranc's delta.
2015-08-11 14:41:36 -05:00
Richard Wackerbarth
9d8cc24abf
Continue from the line following the M999 (PR#60)
...
If the printer is going to accept the M999,
then it should continue from that line number.
2015-08-08 08:08:02 -05:00
Scott Lahteine
46453905d6
Apply remaining ENABLED/DISABLED conditionals
2015-08-03 16:04:48 -05:00
Richard Wackerbarth
b227d8c128
Supply a VERSION in a short form for displays
...
The long descriptor will still be available in M115
2015-08-03 08:21:09 -05:00
AnHardt
4f46df5dab
Make bootscreen configurable for the graphic displays
...
Saves about 473 byte of progmem and 28 bytes of RAM.
2015-08-03 07:13:00 -05:00
Scott Lahteine
b4abb0ae7f
Apply ENABLED / DISABLED to Marlin core files (PR#2558)
2015-07-31 01:03:58 -05:00
Scott Lahteine
9d151bb61b
servo_endstop_angles -> servo_endstop_angle
2015-07-30 23:35:57 -05:00
Scott Lahteine
1f63293624
servo_endstops -> servo_endstop_id
2015-07-30 23:35:57 -05:00
Scott Lahteine
ed4a6371ad
Add HAS_SERVO_ENDSTOPS to simplify conditonals
2015-07-30 23:35:57 -05:00
Scott Lahteine
ae9274be05
Fix minor compiler warnings in for loops
2015-07-30 23:31:58 -05:00
Scott Lahteine
4a58e447a1
Add array size to servo_endstop_angles (PR#2553)
2015-07-30 23:27:38 -05:00
AnHardt
d03f037a92
Get rid of malloc() and free() (PR#2549)
...
Just the minimal changes to qr_solve.cpp and .h to get rid of malloc() and free().
Saves about 656 bytes of progmem (library-code)
and 22 bytes for static variables.
Should use exactly the same amount of stack as it did before on the heap.
2015-07-30 17:50:31 -05:00
Scott Lahteine
3b2b2313ff
Combine if block related to SERVO_ENDSTOPS
2015-07-30 16:39:05 -05:00
Scott Lahteine
0af2a80e06
Make SERVO_ENDSTOP_ANGLES 2-dimensional
2015-07-30 16:38:56 -05:00
Scott Lahteine
9f48798ffd
Replace ENABLED with DEFINED for SERVO_ENDSTOPS (PR#2542)
2015-07-30 07:55:29 -05:00
Richard Wackerbarth
ae00fad75b
Rename as M100
2015-07-27 20:31:59 -05:00
Richard Wackerbarth
a401d738df
There is an echo in here
2015-07-27 20:31:59 -05:00
Richard Wackerbarth
ed7d45e8f5
Memory watcher
2015-07-27 20:31:59 -05:00
Scott Lahteine
bea6739774
Don't include Z_RAISE_AFTER_PROBING if not used (PR#2527)
2015-07-27 20:24:33 -05:00
Scott Lahteine
e4c01f1c7e
Simplify init with ARRAY_BY_EXTRUDERS1 macro (PR#2507)
2015-07-26 20:40:27 -05:00
Scott Lahteine
e2957df05c
Shorthand for do_blocking_move_to
2015-07-24 22:07:41 -05:00
Scott Lahteine
819c5b9b50
Adjust comment on Z adjustment
2015-07-24 22:07:41 -05:00
Scott Lahteine
5a7356b6fc
Patch for G29 final Z position
...
Include all the necessary pieces to get the final Z position after
probing the bed, and add commentary about other possible changes.
2015-07-24 22:07:41 -05:00
AnHardt
088e09e052
Add forgotten Marlin_main.cpp
2015-07-24 22:04:49 -05:00
Scott Lahteine
b116c096bd
Reduce set_homing_bump_feedrate, save 42 bytes (PR#2512)
...
Updates to `set_homing_bump_feedrate`:
- Move the string into Program Memory, reduce length by 31 bytes
- Use an auto to get the divisor, adjust it on error
- Set feedrate once, at the end
2015-07-24 22:00:25 -05:00
Scott Lahteine
469843427d
Reduce code in gcode_M81 (PR#2497)
2015-07-23 08:14:00 -05:00
Scott Lahteine
c66955aaf9
Mark unchanging arrays as const (PR#2494)
...
The compiler may be able to optimize if it knows an array won’t be
changing.
2015-07-22 21:37:37 -05:00
Scott Lahteine
278aa15301
Add COUNT macro and apply
2015-07-22 18:16:05 -05:00
Scott Lahteine
aac2b9aa9d
Reduce code in gcode_M84 (PR#2492)
...
`gcode_M84` only needs to call `finishAndDisableSteppers`, which calls
all the other functions.
2015-07-22 17:22:01 -05:00
Scott Lahteine
e83eac312e
Move plan_arc next to prepare_move
2015-07-19 16:18:46 -05:00
Scott Lahteine
5c5936508d
G2/G3 Arcs for Delta
...
- Update prepare_move_delta to take a target argument
- Add Delta support to plan_arc
2015-07-19 16:18:46 -05:00
Scott Lahteine
3b23ccd366
Patch servos code for move
...
- Have `Servo::attach` explicitly return -1 if it fails
- Check for -1 in `Servo::move` because `servoIndex` might be 0
- Make `attach` / `detach` calls conditional on `SERVO_LEVELING`
- Move `SERVO_LEVELING` define to `Conditionals.h`
2015-07-19 11:24:23 -07:00
Patrick Bogen
fba4e6241b
Specify print format for reporting invalid tmp_extruder (PR#2465)
2015-07-18 16:40:01 -05:00
AnHardt
d15d869267
Rename axis_is_at_home() to set_axis_is_at_home() (PR#2464)
...
to make clear - it's not a question but an order.
2015-07-18 10:27:21 -05:00
Scott Lahteine
f209b755a5
Move the Z probe as far as needed to trigger the switch (PR#2461)
2015-07-16 20:02:44 -05:00
Scott Lahteine
0f1df62389
Fixup comments in code_seen
2015-07-16 16:40:52 -05:00
Scott Lahteine
2945eb6650
Call code_seen only once per parameter
2015-07-16 16:40:52 -05:00
Scott Lahteine
db23b9b184
Minor tweak to M204 code (PR#2457)
2015-07-16 16:35:13 -05:00
Scott Lahteine
81d42406b7
Move braces in homeaxis to prevent a hanging else (PR#2451)
2015-07-16 10:25:54 -05:00
AnHardt
ed6598adf5
Corrected Bed Height vs. Bed Topology for verbosity > 3
...
and cleaned out some tabs.
Everything else is a rebased PR#2017 as proposed by @CptanPanic
2015-07-15 19:51:40 -05:00
brian
62302ceb9e
Add calculation of difference between auto-correct bed level plane, and measured topo map.
2015-07-15 19:51:40 -05:00
AnHardt
49609f6c14
Activate the new servo.move() function
...
by replacing the sequences (attach, write, delay, detach), and their conditions with the new function in Marlin.main.cpp
and removing the old configuration in the ABL part of Configuration.h
2015-07-15 17:39:43 -05:00
Scott Lahteine
87a872e103
Use st_get_position_mm where possible (PR#2411)
2015-07-12 22:15:54 -05:00
Scott Lahteine
2e0da8abdc
Allow N to take a negative argument (PR@2402)
2015-07-12 22:14:25 -05:00
Scott Lahteine
447dbd6fa5
Add STEPPER_RESET_PIN support
2015-07-11 16:04:11 -05:00
Scott Lahteine
6b1b8cb2b3
Also nullify spaces before the checksum asterisk (PR#2409)
2015-07-10 09:03:07 -05:00
Scott Lahteine
4e9d658141
Prevent a hanging SERIAL_ECHO_START in M111
2015-07-07 06:59:10 -05:00
Scott Lahteine
6b494c1535
Use disable_all_heaters in M111
2015-07-07 06:59:10 -05:00
Scott Lahteine
15190d40df
Add extra EOL after M111
2015-07-07 06:59:10 -05:00
AnHardt
d421f5250d
Correct the sign of zprobe_zoffset for G29 (PR#@391)
...
Sign flipped with #2167 .
See also comments
https://github.com/MarlinFirmware/Marlin/issues/2040#issuecomment-118568355
and following.
2015-07-07 06:55:33 -05:00
Scott Lahteine
52fcc743ab
Replace "target" with "destination" in M600 (PR#2374)
...
- Also fix a bug in `M600` where `Z_MAX_ENDSTOP_INVERTING` is being
used as the index into the `destination[AxisEnum]` array.
2015-07-04 05:55:25 -05:00
AnHardt
23c8c5348f
Z-height fix V2b (PR#2351)
...
here the other two occurences of `Z_PROBE_OFFSET_FROM_EXTRUDER` are
replaced with `zprobe_zoffset`.
2015-07-02 20:30:40 -05:00
Todd Swindoll
a111fbbd0a
z-probe offset fix (PR#2361)
...
verified via 1.0.2 tag that compiles by multiple people,
credit for the fix goes to paulusjacobus for the initial find and
sniffle for the correction so M851 works.
2015-07-02 20:28:07 -05:00
Scott Lahteine
9682ed455e
Fix comment on M83, add comment to prepare_move
2015-06-28 08:20:19 -05:00
AnHardt
36746143a1
Correct output of M48 (PR#2336)
...
n_samples is an uint8_t .
Got printouts like:
50 of 2 ...
2015-06-27 06:08:40 -05:00
Scott Lahteine
f6ca5a8da8
Allow "M110 N123" without a checksum
2015-06-26 18:13:54 -05:00
Scott Lahteine
aaad65ff5d
Include a comment documenting M110
2015-06-26 18:13:54 -05:00
Scott Lahteine
862c72b030
Put the mandatory test of gcode_N first
2015-06-26 18:13:54 -05:00
Scott Lahteine
30976f9773
Allow M110 to handle a second N argument
2015-06-26 18:13:53 -05:00
Scott Lahteine
5ccb1c9e7d
Use millis for M600 audio feedback interval
2015-06-25 20:45:03 -05:00
Scott Lahteine
fb16a83b8a
Cleanup M600 documentation comments
2015-06-25 20:45:03 -05:00
Scott Lahteine
97ec224d72
Replace target with destination in M600
2015-06-25 20:45:03 -05:00
Scott Lahteine
4ce9ddbb74
Check the temperature before filament change
2015-06-25 20:45:03 -05:00
AnHardt
722829b058
Move buzzing code to buzzr.h & buzzer.cpp (PR#2307)
...
at least the lcd independent part from Marlin_main.cpp.
2015-06-22 22:31:48 -04:00
schlotzz
1e9cf905c7
Enable ZigZag AutoBedLeveling on Deltas (PR#2273)
...
ZigZag has been disabled by fault due to do_topography_map
2015-06-15 20:26:25 -05:00
AnHardt
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.
2015-06-15 06:13:26 -05:00
Scott Lahteine
29122db2fa
Fix ULTRA_LCD spelling in HAS_LCD_BUZZ
2015-06-15 06:12:34 -05:00
Scott Lahteine
e2a4a83586
Don't re-apply Z_RAISE_BETWEEN_PROBINGS in probe_pt (PR #2281 )
2015-06-12 22:39:35 -05:00
MagoKimbra
eb81982fcd
Fix error next command in autotune (PR#2274)
...
Now send only temperature for T or B, but not send OK.
Host interprets the line to show the right temperature, but not in
response to M105 then stop and send commands until it ends the autotune.
2015-06-12 07:10:38 -05:00
AnHardt
55b23c896a
Optimise out_of_range_error() (PR#2265)
...
by avoiding the strncopy()
2015-06-12 02:20:40 -05:00
AnHardt
45642b7fe8
Respect DISABLE_AXIS settings (PR#2216)
...
when DEFAULT_STEPPER_DEACTIVE_TIME is over
instead of simply turn off all.
2015-06-11 11:35:05 -05:00
Scott Lahteine
962b107341
Prevent current_command_args from bypassing nul (PR#2270)
2015-06-09 16:07:10 -05:00
Scott Lahteine
ff6081be3a
Parse N[0-9]+[ ]* differently (PR #2263 )
...
More general solution to skip N[0-9]+[ ]* in the parser as in #2218
2015-06-08 17:06:49 -05:00
Scott Lahteine
96a3fba8ac
Reverse the sign of zprobe_zoffset
...
- When editing on the LCD, minus now means below the nozzle
- Stores the opposite sign in EEPROM, so bumped to “V20”
2015-06-08 05:09:27 -05:00
paclema
8d295547be
* Auto filament change on CHANGEFILAMENT feature. Now you can activate this option that extrude filament until you press the button.
2015-06-06 19:45:45 -05:00
Richard Wackerbarth
ad09d6a60f
3 Step Allen Key Probe
2015-06-06 17:48:27 -05:00
AnHardt
e400fce271
Merge pull request #2221 from MagoKimbra/Dryrun
...
Insert Debug DRYRUN Repetier Host compatible
2015-06-03 12:30:48 +02:00
AnHardt
c3fe6e61ae
Merge pull request #2229 from AnHardt/position-out-of-range
...
Fix out_of_range_error()
2015-06-03 09:46:22 +02:00
AnHardt
d1f4471000
Merge pull request #2146 from Wackerbarth/Versioning
...
Versioning
2015-06-02 18:31:21 +02:00
AnHardt
17b0ec84ed
Fix out_of_range_error()
...
For sprintf_P() the first parameter has to be a `char*` not `const char*`.
2015-06-02 11:50:32 +02:00
AnHardt
35af5ef23e
Merge pull request #2225 from Wurstnase/naming
...
consistency name for multiplier
2015-06-02 10:18:22 +02:00
wurstnase
e7e964432b
consistency name for multiplier
...
replace extruder_multiply with extruder_multiplier
like feedrate_multiplier or volumetric_multiplier
2015-06-01 22:33:22 +02:00
MagoKimbra
76306f9073
Insert Debug DRYRUN Repetier Host compatible
2015-06-01 18:34:45 +02:00
MagoKimbra
881146bc22
Fix problem Width Cura
2015-06-01 17:25:32 +02:00
AnHardt
9d2a980bcf
Merge pull request #2170 from thinkyhead/beep_M600_elsewise
...
Slight size reduction by adding idle()
2015-05-30 12:42:32 +02:00
AnHardt
2728dc0606
Merge pull request #2194 from thinkyhead/reduce_strings
...
Redo "invalid extruder" to save 304 bytes
2015-05-30 11:05:08 +02:00
Scott Lahteine
be5236e839
Reduce setTargetedHotend by removing the switch
2015-05-29 18:03:58 -07:00
Scott Lahteine
06f401e7e5
Redo "invalid extruder" to save 264 bytes
...
- Use `setTargetedHotend` in `M200`, as with other commands that use
`T` for the extruder
- Synthesize the "invalid extruder" message, obviating several long
strings
2015-05-28 22:25:28 -07:00
Scott Lahteine
1a882bcc2e
Merge pull request #2193 from thinkyhead/ignore_unrecognized_commands
...
Ignore unknown commands if they start with G, M, or T
2015-05-28 22:03:48 -07:00
Scott Lahteine
a672872717
Merge pull request #2187 from AnHardt/MAX6675M105
...
Print active extruder with M105 for MAX6675
2015-05-28 18:12:48 -07:00
Scott Lahteine
9beed830eb
Drop commented code_is_good lines
2015-05-28 17:53:47 -07:00
Scott Lahteine
068d4a1eb2
Ignore unknown commands if they start with G, M, or T
2015-05-28 17:44:09 -07:00
Scott Lahteine
c5c9d12630
Merge pull request #2183 from AnHardt/displayinit
...
Initialize the display earlier
2015-05-28 16:29:18 -07:00
Scott Lahteine
0564625757
Update M33 for new gcode parser
2015-05-28 14:17:39 -07:00
AnHardt
af7e3f5076
Print active extruder with M105 for MAX6675
...
Was omitted when T0 is a MAX6675.
2015-05-28 19:03:16 +02:00
AnHardt
f0523b5816
Initialize the display earlier
...
to have it ready to display errors during (temperature)-setup.
2015-05-28 16:08:17 +02:00
Scott Lahteine
03d5709b09
M110 is a known command
...
- The command parser now displays “unknown command” in more cases.
Known commands must be added to the `switch` inside `process_commands`
to suppress the error.
2015-05-26 20:31:18 -07:00
Scott Lahteine
d76a01194d
Slight size reduction by adding idle()
2015-05-26 20:08:21 -07:00
Richard Wackerbarth
5ea139fd79
Revised Versioning mechanism
2015-05-25 15:53:14 -05:00
Scott Lahteine
68f6f149d0
Reduce code size with out_of_range_error function
...
- Affects code size when automatic bed leveling is enabled
2015-05-24 20:18:02 -07:00
Scott Lahteine
b55f8718c3
Indent G90/G91, G92
2015-05-22 17:34:08 -07:00
Scott Lahteine
b0d520b109
Indent G30, G31/G32
2015-05-22 17:33:17 -07:00
Scott Lahteine
ffe27a6225
Indent G29
2015-05-22 17:32:46 -07:00
Scott Lahteine
86083badc2
Indent G4, G10/G11, G28
2015-05-22 17:32:27 -07:00
Scott Lahteine
47d7a9cb5e
Indent G2/G3
2015-05-22 17:31:38 -07:00
Scott Lahteine
350f239d84
Indent G0/G1
2015-05-22 17:31:24 -07:00
Scott Lahteine
15a2351675
No need for +1 on initial seen_pointer
2015-05-22 15:31:30 -07:00
Scott Lahteine
550dd87b2a
Set seen_pointer before calling code_value
2015-05-22 15:11:48 -07:00
Scott Lahteine
04a1622172
Merge pull request #2127 from Wackerbarth/Kossel_Pro
...
Kossel Pro
2015-05-21 18:43:26 -07:00
Scott Lahteine
f919a2fed1
Merge pull request #2134 from AnHardt/preheat-all
...
Shift call of start_watching_heater() into setTargetHotend()
2015-05-21 18:36:28 -07:00
AnHardt
0c0ace2a04
Remove start_watching_heater() fom M104 and M109
2015-05-22 01:44:50 +02:00
Scott Lahteine
bde9c70d42
Suppress the line mismatch error after M303
2015-05-21 16:27:22 -07:00
Scott Lahteine
50bd7493cc
Merge pull request #2108 from thinkyhead/m33_long_filename_host_support
...
M33 LONG_FILENAME_HOST_SUPPORT
2015-05-21 16:22:47 -07:00
Scott Lahteine
4d11b29959
Merge pull request #2113 from thinkyhead/command_sanitizer
...
Command sanitizer
2015-05-21 16:21:58 -07:00
Richard Wackerbarth
735bf2d35f
Describe Custom M Code
2015-05-21 08:06:33 -05:00
Scott Lahteine
f39658c822
M120 and M121 are reversed
2015-05-21 00:17:44 -07:00
AnHardt
89d2ee6f13
Make output on display dependant of ULTRA_LCD
2015-05-20 22:03:16 +02:00
AnHardt
f4a93ed997
Add a string parameter to kill()
...
Makes the output on the LCD adjustable.
2015-05-20 20:53:48 +02:00
Scott Lahteine
a0f362c735
Simplify & optimize with current_command_args
2015-05-18 07:08:04 -07:00
Scott Lahteine
adc8fcb77f
More parser comments, optimize code_seen, save with goto
2015-05-18 07:08:04 -07:00
Scott Lahteine
c6d8dd19d9
use fetched value
2015-05-18 07:08:04 -07:00
Scott Lahteine
1116e13f5a
Further optimization of command parser
2015-05-18 07:08:03 -07:00
Scott Lahteine
3a4c3ab76e
Pre-sanitize the command before handling
...
- Use a global pointer for the current sanitized command
- Pre-sanitize the current command to bypass `N` and nullify `*`,
removing the need for handlers to bypass, ignore, or nullify these
parts, and reducing overhead for `code_seen`, etc.
- Pre-skip leading whitespace.
- Only look for G, M, T codes at the start of the command.
- Verify that G, M, T codes are followed by command codes.
2015-05-18 07:06:51 -07:00
Scott Lahteine
0f2c9bacfd
M33 LONG_FILENAME_HOST_SUPPORT
2015-05-17 17:36:32 -07:00
Scott Lahteine
3feaef6526
Have G92 set the nozzle position on Delta and SCARA
2015-05-17 17:08:05 -07:00
Scott Lahteine
6c27eaf864
Merge pull request #2101 from thinkyhead/code_style
...
Code style and a dangling "else"
2015-05-17 03:39:08 -07:00