Commit graph

838 commits

Author SHA1 Message Date
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