zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
8074 commits 1 branch 0 tags 156 MiB
Commit graph

2054 commits

Author SHA1 Message Date
Scott Lahteine 7de7552069 Merge pull request #4133 from MagoKimbra/Single_home_axis_delta 
Single home Axis Delta need simple sync_plan_position
 2016-06-23 21:14:22 -07:00
Scott Lahteine 15a6b49f37 Simplified probe_pt (in G30) 2016-06-23 20:25:46 -07:00
Scott Lahteine 6a7045b9bf Remove clean_up_after_endstop_move 2016-06-23 20:23:19 -07:00
Scott Lahteine 2a4f866561 Simplified probe_pt (in G29) 2016-06-23 20:22:28 -07:00
Scott Lahteine 89a2aa026b Simplified probe_pt (in M48) 2016-06-23 19:22:45 -07:00
Scott Lahteine f8530c5d1f Simplified probe_pt function (G28 grid) 2016-06-23 19:09:32 -07:00
Scott Lahteine c376c08042 Simplified probe_pt function (part 1) 2016-06-23 19:00:29 -07:00
Scott Lahteine 9a71b7f8ad Fix debug message for 3-point leveling 2016-06-23 18:17:31 -07:00
Scott Lahteine 550c03a5a9 Drop raise_z_after_probing function 2016-06-23 18:11:54 -07:00
Scott Lahteine bb38c816af Always raise in deploy_z_probe / stow_z_probe 2016-06-23 18:00:20 -07:00
Scott Lahteine 68f3350050 Cleanup M401 / M402 2016-06-23 17:04:41 -07:00
Scott Lahteine 3afda99adf Regular handlers for G31 / G32 2016-06-23 17:04:13 -07:00
Scott Lahteine 6803c8e37e Move Z up before, or down after XY, for "blocking move" 2016-06-23 15:50:13 -07:00
MagoKimbra 570f3bbc07 Single home Axis Delta need simple sync_plan_position 2016-06-23 23:09:47 +02:00
Scott Lahteine 7b2fadd598 Apply some fixes from Andreas 
Derived from
https://github.com/AnHardt/Marlin/commit/6e8ede8c694fa4d9e3c769840b09d56
7f8d8e0dd
 2016-06-22 17:35:59 -07:00
Scott Lahteine bd01592816 Goodbye MECHANICAL_PROBE 2016-06-22 17:13:33 -07:00
Scott Lahteine 2640d13a9f Simplify initial raise in M48 2016-06-22 16:53:04 -07:00
Scott Lahteine 3763d45656 Return Z position in run_z_probe 2016-06-22 16:52:32 -07:00
Scott Lahteine 1f48b5c30f Pass a raise to probe_pt, not a Z position 2016-06-22 16:40:21 -07:00
Scott Lahteine 6fdd5ba246 Save and restore feedrate in more places 2016-06-22 16:40:20 -07:00
Scott Lahteine fe173c2bc6 Generalized probe raise, use for after probing 2016-06-22 14:44:30 -07:00
Scott Lahteine 7da3080761 Simpler cleanup in G28 / G29 2016-06-22 14:44:30 -07:00
Scott Lahteine 15229d988b Fix compile error for bed matrix in M48 2016-06-22 14:04:46 -07:00
Scott Lahteine c01352cbd5 Add a dependency for z servo macros 2016-06-22 14:04:23 -07:00
Scott Lahteine c3794bd695 Add HAS_PROBING_PROCEDURE conditional 2016-06-22 14:03:22 -07:00
Scott Lahteine bb9c67b4b5 Tweak some feedrate vars 2016-06-22 03:27:31 -07:00
Scott Lahteine 5158bd6e93 Screen out G29 E for sled and allen key, allow single probe 2016-06-22 03:20:33 -07:00
Scott Lahteine ccae92588d Cleanup debug in G28 and G29 2016-06-22 03:20:33 -07:00
Scott Lahteine b4a9d2366c Use a macro for kinematic sync_plan_position 2016-06-22 03:20:33 -07:00
Scott Lahteine bfccf26294 Use sync_plan_position_delta where needed 2016-06-22 03:20:33 -07:00
Scott Lahteine a6b8c67df4 Move probe deploy after setup call in G29 2016-06-22 03:20:33 -07:00
Scott Lahteine e69916d1bd Split up endstop_move functions 2016-06-22 03:20:33 -07:00
Scott Lahteine 0e18a4897b Simpler handling of sled/allen-key in probe_pt 2016-06-22 03:20:33 -07:00
Scott Lahteine 1a92e2ef18 Comment on run_z_probe 2016-06-22 03:20:33 -07:00
Scott Lahteine 68e0e5855e For all probes, at the end of G29 simply raise and stow 2016-06-22 03:20:33 -07:00
Scott Lahteine c3023f8cc5 Make M401/M402 available with HAS_BED_PROBE 2016-06-22 03:20:33 -07:00
Scott Lahteine 9f0c255c69 Show uncorrected position in set_bed_level_equation_3pts 2016-06-22 03:20:33 -07:00
Scott Lahteine 07298ac992 Initialize current_position to home_offset on boot 2016-06-22 03:20:33 -07:00
Scott Lahteine d50539583a Make XY_PROBE_SPEED a general probe option 2016-06-22 03:04:47 -07:00
Scott Lahteine 2798499b71 XY_TRAVEL_SPEED => XY_PROBE_SPEED 2016-06-22 02:45:25 -07:00
Scott Lahteine 88dc543584 Add a macro for XY_TRAVEL_FEEDRATE 2016-06-22 02:23:50 -07:00
Scott Lahteine 3996242e9d Allow Z_MIN_PROBE_REPEATABILITY_TEST solo 2016-06-21 01:56:40 -07:00
Scott Lahteine 26a9cd0b08 Move run_z_probe to earlier block 2016-06-21 01:25:23 -07:00
Scott Lahteine 7f8a2025af Move raise_z_after_probing into earlier block 2016-06-21 01:03:40 -07:00
Scott Lahteine 2530371516 Always disable probe at the end of G29 2016-06-20 16:40:44 -07:00
Scott Lahteine 6aba98e470 Comment on setup_for_endstop_move 2016-06-20 16:40:44 -07:00
Scott Lahteine 04e88d008e Clear up ordering in G30 2016-06-20 16:40:44 -07:00
Scott Lahteine ed75b0ea11 Make clean_up function available for probes 2016-06-20 16:28:45 -07:00
Scott Lahteine 51d52cb52a Make run_z_probe available for any bed probe 2016-06-20 16:02:36 -07:00
Scott Lahteine f6b09cf465 Always use deploy/stow for dock_sled 2016-06-20 15:51:01 -07:00
Scott Lahteine 3b457c2dd3 Use deploy/stow with FIX_MOUNTED_PROBE too 2016-06-20 15:25:01 -07:00
Scott Lahteine 7e9d4a68d4 Always raise Z (if needed) for servo deploy/stow 2016-06-19 20:17:13 -07:00
Scott Lahteine 9beb3f2f5e Merge pull request #4097 from thinkyhead/rc_fil_runout_cleanup 
FIL_RUNOUT_INVERTING false by default
 2016-06-19 19:46:14 -07:00
Scott Lahteine f215b30932 Merge pull request #4093 from thinkyhead/rc_probe_without_abl 
Make Z Probe options independent of ABL
 2016-06-19 19:44:25 -07:00
Scott Lahteine 2fd2301928 FILRUNOUT => FIL_RUNOUT 2016-06-19 19:25:26 -07:00
Scott Lahteine de12228758 Make Z Probe options independent of ABL 2016-06-19 18:47:27 -07:00
Scott Lahteine add0032820 Improve FILAMENT_RUNOUT_SENSOR, FILRUNOUT_PIN 2016-06-19 18:13:33 -07:00
Scott Lahteine 400e13d136 Output a message for SD read errors 2016-06-19 17:14:56 -07:00
Roxy-3D 96b8bcca84 Merge pull request #4081 from thinkyhead/rc_tweaky_m48_tweaks 
Cleanup of M48
 2016-06-18 22:21:16 -05:00
Scott Lahteine b7e3c1bbc4 Tweak M48 output conditions 2016-06-18 16:17:53 -07:00
Scott Lahteine 1dad912b03 Adjust M48 raise / move handling 2016-06-18 15:38:24 -07:00
Scott Lahteine 46d3ef2223 Simplify sample_set probe_pt call in M48 2016-06-18 15:38:23 -07:00
Scott Lahteine a647b05f82 Shrink some debug code in G28 2016-06-18 15:38:23 -07:00
Scott Lahteine 4edf813bde Just-in-time declaration style in M48 2016-06-18 15:38:23 -07:00
Juan Ricardo Gomez Anaya c475291e19 Fix M851 
Minor change missing in the process of standardize the gcode M851
 2016-06-18 15:19:07 -07:00
Scott Lahteine 4e860babbc Allow setting xy_travel_speed for delta leveling also 2016-06-18 01:40:49 -07:00
Scott Lahteine d36d4edd80 Tweak partial homing code 2016-06-18 01:16:50 -07:00
Scott Lahteine d3a05de96e Save and restore feedrate in probe functions 2016-06-18 01:16:26 -07:00
Scott Lahteine defcacc1a9 Delete some obsolete Z servo macros 2016-06-17 18:49:17 -07:00
Scott Lahteine 3a150f07c2 Merge pull request #4073 from thinkyhead/rc_temp_mystery 
Minor tweaks to M109 / M190
 2016-06-17 17:49:50 -07:00
Scott Lahteine bd4ec727e7 Merge pull request #4066 from thinkyhead/rc_M851_with_probe 
Make M851 standard with a bed probe
 2016-06-17 17:32:55 -07:00
Scott Lahteine 692a6e7c91 Merge pull request #4065 from thinkyhead/rc_goodbye_xy_servos 
Remove support for XY servo endstops
 2016-06-17 17:32:08 -07:00
Scott Lahteine de177ba6c9 Minor tweaks to M109 / M190 2016-06-17 17:26:21 -07:00
Scott Lahteine 1000563d80 Make M851 standard with a bed probe 2016-06-17 15:19:42 -07:00
Scott Lahteine f66a194159 Merge pull request #4062 from jbrazio/bugfix/compiler-warnings 
Fixes misc gcc warnings
 2016-06-17 14:23:28 -07:00
Scott Lahteine 1bed392c68 HAS_Z_ENDSTOP_SERVO => HAS_Z_SERVO_ENDSTOP 2016-06-17 14:20:17 -07:00
Scott Lahteine 47ce810f52 Remove support for XY servo endstops 2016-06-17 14:19:17 -07:00
João Brázio d1e5dc6319
Fixes misc gcc warnings 2016-06-17 20:24:24 +01:00
Scott Lahteine ef3bef6b9e Fix feedrate in gcode_T (max_feedrate is mm/s) 2016-06-16 16:03:14 -07:00
MagoKimbra 008d0637dd Fix gcode_T 2016-06-16 09:05:36 +02:00
Scott Lahteine da90bbe0eb Merge pull request #4010 from thinkyhead/rc_toolchange_adjust 
Fixup position adjustment on toolchange
 2016-06-15 21:10:33 -07:00
Scott Lahteine 4b93989a77 MBL Z adjustment on toolchange 2016-06-15 20:49:36 -07:00
Scott Lahteine 9c800d1f8c Position adjustment for bed leveling 2016-06-15 20:49:36 -07:00
esenapaj 44f091a413 Fix for the PR #4023(Add macros to move servos) 
・Add missing ')'
 2016-06-15 22:34:55 +09:00
Scott Lahteine 52ac2a62ee Merge pull request #4013 from thinkyhead/rc_toolchange_no_move 
Use "Tn S1" to change tools without moving
 2016-06-14 20:13:01 -07:00
Scott Lahteine d2a00b74e3 Merge pull request #4004 from thinkyhead/rc_feedrate_in_gcode_T 
Use linear feedrate in gcode_T, not volumetric
 2016-06-14 20:10:08 -07:00
Scott Lahteine 8d8180e028 Parse M905 args in Marlin_main.cpp 2016-06-13 19:25:28 -07:00
Scott Lahteine 2b340f5acb patch LIN_ADVANCE to use code_value_float 2016-06-13 18:54:25 -07:00
Scott Lahteine b708196770 Merge pull request #4032 from AnHardt/bootscreen-delay 
Show bootscreen later
 2016-06-13 18:27:05 -07:00
Scott Lahteine 587de1b6b6 Merge pull request #3676 from thinkyhead/rc_lin_advance_feature 
Advance extrusion algorithm – LIN_ADVANCE
 2016-06-13 18:04:58 -07:00
AnHardt b4fedec0d1 Show bootscreen later 
Init display and show bootscreen later, but init display in `kill()`
to init outputs before the bootscreen delays but being able to display
kill errors.
 2016-06-14 01:59:50 +02:00
Scott Lahteine 4fbe818163 Add macros to move servos 2016-06-12 15:38:30 -07:00
Scott Lahteine 7fb69e24fb Use "Tn S1" to change tools without moving 2016-06-11 15:58:45 -07:00
Scott Lahteine b75e648f2c Clarify names of prepare_move functions 2016-06-11 15:32:49 -07:00
Scott Lahteine 0e2bfd0769 Use linear feedrate in gcode_T, not volumetric 2016-06-10 18:27:01 -07:00
Scott Lahteine 6d62a4ffc8 Patch LIN_ADVANCE for style and forward-compatibility 2016-06-09 21:03:27 -07:00
Sebastianv650 fb8e880734 Add LIN_ADVANCE 2016-06-09 21:03:27 -07: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 4980ecc1f7 Smaller binary using inline gcode argument getters 2016-06-08 17:03:28 -07:00
Reid Rankin 16212432c9 G20/21 and M149 support, and code_value() refactor 
This is an update of MarlinDev PR #196.

G20/21: support for switching input units between millimeters and
inches.
M149: support for changing input temperature units.

In support of these changes, code_value() and code_value_short() are
replaced with an array of functions which handle converting to the
proper types and/or units.
 2016-06-08 16:51:10 -07:00
Scott Lahteine cca047424d MBL: cel => cell 2016-06-07 19:10:39 -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 d7e4e8e9be Fix a typo in #3955 2016-06-04 02:09:58 -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 f2fb66c00d With SINGLENOZZLE only set temperature for the active tool 2016-06-03 17:38:03 -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 4e13cd3f35 Merge pull request #3955 from MagoKimbra/RCBugFix 
Fix M428 width DELTA & SCARA
 2016-06-03 15:50:37 -07:00
Scott Lahteine 8529122af1 Merge pull request #3946 from thinkyhead/rc_g28_servo_raise_before_stow 
Raise the servo probe before stow outside ABL context
 2016-06-03 15:45:36 -07:00
MagoKimbra f499be084a Fix M428 width DELTA & SCARA 2016-06-03 23:23:23 +02: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 9eecb4404b Make raise_z_after_probing null sometimes 2016-06-02 16:56:49 -07:00
Scott Lahteine b3a37b493d Patch G28 servo stow to use Conditionals, raise_z_after_probing 2016-06-02 16:56:49 -07:00
Scott Lahteine efa7209acf Improved LCD contrast handling 
Based on MarlinFirmware/MarlinDev#200 from @eboston
 2016-06-02 16:17:34 -07:00
lrpirlet 3aefa04386 Raise the servo probe before stow outside ABL context 2016-06-01 21:53:45 +02:00
Scott Lahteine d698c89971 Fix bad movement in gcode_T when switching 2016-05-31 19:14:33 -07:00
Scott Lahteine 1a01a44a94 Merge pull request #3936 from thinkyhead/rc_sav_mk1 
Support for SAV_3DGLCD OLED LCD controller
 2016-05-31 18:46:25 -07:00
Scott Lahteine bd97bbc52a Make HAS_LCD_CONTRAST a boolean flag 2016-05-31 11:47:02 -07:00
Scott Lahteine 55ef04a566 Need to call dac_init() in setup() for DAC_STEPPER_CURRENT 
As reported by https://github.com/MarlinFirmware/Marlin/pull/3182#issuecomment-222595488
 2016-05-30 23:35:06 -07:00
Scott Lahteine 360adc6a3b Small reduction in M421 code 2016-05-23 14:25:42 -07:00
Scott Lahteine a4ed988c60 Two index finding functions for MBL 2016-05-23 14:25:42 -07:00
Scott Lahteine cadf441059 Merge pull request #3798 from AnHardt/extend-M421 
Extend M421 with I and J parameters
 2016-05-20 16:17:23 -07:00
AnHardt f5a036510f Extend M421 with I and J parameters 
Extend M421 with I and J parameters
 2016-05-21 00:18:09 +02:00
Edward Patel c7d90dc5ec Add option to configure G28 all axis resting position for MBL 2016-05-20 11:52:27 -07:00
Scott Lahteine 8218558953 Update comments, rename next_ping_ms, followup to #3797 2016-05-19 16:44:57 -07:00
AnHardt e761bdbb4b Remove SF_ARC_FIX from G5 (Cubic B-spline) 
Remove SF_ARC_FIX from G5 (Cubic B-spline).
SF_ARC_FIX is a fix for G2/G3 (arcs) where Skeinforge always produced relative instead of absolute coordinates for the endpoint of an arc.
It's very unlikely this is also a problem with Cubic B-splines. More likely is copying from the G2/G3 code.
 2016-05-19 21:00:12 +02:00
AnHardt 2207001333 No compromises for the manage_heater() 
No compromises for the manage_heater(). manage_heater() will return immediately when there is nothing to do, but needs a constant detaT to work proper.
Calling idle() only every 200ms results in a display update every ~2 seconds - that should be enough.
For the other functionalities in idle() and manage_inactivity() 200ms is a lot but hopefully works.
 2016-05-19 20:52:11 +02:00
João Brázio e6effb8f35
Implements S1 argument in M999 2016-05-19 00:13:33 +01:00
Scott Lahteine 4041508ffb Function decl. in headers don't need "extern" 2016-05-17 18:35:01 -07:00
Scott Lahteine d66e53c42b Merge pull request #3782 from thinkyhead/rc_home_z_before_g29 
Require homing of Z before G29
 2016-05-17 17:53:56 -07:00
Scott Lahteine 552516ddf5 Merge pull request #3781 from AnHardt/minor-delta-segmenting-speedup 
Minor DELTA segmentation speedup
 2016-05-17 17:17:38 -07:00
Scott Lahteine a28970784c XYZ unhomed 2016-05-17 17:02:53 -07:00
Scott Lahteine a9926b71a4 Require homing of Z before G29 2016-05-17 16:57:12 -07:00
AnHardt 41e9569dbc Minor DELTA segmentation speedup 
Minor DELTA segmentation speedup by pulling calculations out of the loop.
 2016-05-18 01:49:30 +02:00
Scott Lahteine 3016dfe484 Merge pull request #3744 from thinkyhead/rc_bezier_curves 
Add BEZIER_CURVE_SUPPORT — G5 command
 2016-05-17 13:57:38 -07:00
Scott Lahteine d0ac4541d3 Merge pull request #3775 from jbrazio/bugfix/followup-3770 
G29: Report final position back to host when using MBL
 2016-05-17 13:55:26 -07:00
João Brázio b6a3aef297
G29: Report final position back to host when using MBL 2016-05-17 01:27:59 +01:00
esenapaj 95f30529a6 Add stowing process for MECHANICAL_PROBE 2016-05-16 18:12:10 +09:00
esenapaj e2b87f6c85 Separate Z_PROBE_ALLEN_KEY from MECHANICAL_PROBE 2016-05-16 18:12:10 +09:00
Scott Lahteine 754b0152f5 Fix MBL zigzag calls 2016-05-15 12:35:01 -07:00
Scott Lahteine 13175ce7da Fix error checking in M421 2016-05-14 17:12:44 -07:00
João Brázio 8a18c52002 Adds an option to disable print job timer auto start 2016-05-14 15:22:44 -07:00
João Brázio a79267217b M78 now allows stats reset using the S78 argument 2016-05-14 15:22:44 -07:00
Scott Lahteine a713043acd Merge pull request #3749 from esenapaj/patch-3 
Enclose all #error strings by double-quotes
 2016-05-14 15:01:56 -07:00
Scott Lahteine 3cfea3ff12 Merge pull request #3752 from AnHardt/fix-FIX_MOUNTED_PROBE 
G29 missing FIX_MOUNTED_PROBE condition
 2016-05-14 15:00:42 -07:00
Scott Lahteine ddac17a195 Add BEZIER_CURVE_SUPPORT (G5 XYZEFIJPQ) 2016-05-14 14:52:08 -07:00
AnHardt 8a4376d51f Idle during long arcs 
Idle during long arcs
to prevent from watchdog resets during high segmented fast arcs.
 2016-05-14 00:29:13 +02:00
esenapaj 888443ca1e Enclose all #error strings with apostrophes 2016-05-13 21:10:23 +09:00
AnHardt b74af78736 Make arc support (G2/G3) configurable 
Saves about 2669 bytes when deactivated. (About 1% for a AT2560, about __4%__ for a AT644!)
 2016-05-13 13:27:45 +02:00
AnHardt aef2559bd8 fix-FIX_MOUNTED_PROBE 
Add a forgotten condition
 2016-05-13 12:07:17 +02:00
Scott Lahteine aaeadf0cbd If no "B" parameter given, get 1 byte 2016-05-11 15:30:08 -07:00
Scott Lahteine a6d594665b Print an error on bad i2c request 
Reference: https://github.com/MarlinFirmware/Marlin/pull/3713#issuecomment-218333678
 2016-05-11 15:30:02 -07:00
Scott Lahteine 56dd31ea3c Use code_value_long for potentially large values 
Addressing #3711
 2016-05-10 09:15:31 -07:00
Scott Lahteine 96b71e62c0 Fix dipping on DELTA robots during G29 
- Addressing #3689, et. al.
 2016-05-08 18:28:46 -07:00
Scott Lahteine 15fc93d742 Cleanup and consolidate probe conditionals for clarity 2016-05-08 12:59:43 -07:00
Scott Lahteine 084f6b5b44 Temperature singleton class 2016-05-04 19:42:12 -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
esenapaj a82cfcff2d Follow-up the PR #3631(Encapsulate Stepper, ... 
Follow-up the PR #3631(Encapsulate Stepper, Planner, Endstops in singleton classes)

plan_bed_level_matrix -> planner.bed_level_matrix in multi extruders section of Marlin_main.cpp
It probably fix the Issue #3658(plan_bed_level_matrix not declarate).

movesplanned() -> planner.movesplanned() in ADVANCED_OK section of Marlin_main.cpp
It fix compilation error when ADVANCED_OK is enabled
 2016-05-02 22:04:26 +09:00
Scott Lahteine 462a8a951e A little extra gcode_T spacing 2016-04-30 17:26:50 -07:00
Scott Lahteine 96f51f400f Planner singleton class 2016-04-30 17:26:50 -07:00
Scott Lahteine 5076d12344 Localize M119 in Endstops 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 6d3e4e1f8f Prevent stuck M109/M190 when target is changed 2016-04-30 17:03:54 -07:00
Scott Lahteine c3ef9993b9 Merge pull request #3625 from jbrazio/feature/print-counter 
Print job statistics
 2016-04-29 15:31:14 -07:00
João Brázio 1491d682fb
Miscellaneous tweaks on PrintCounter 2016-04-29 23:13:59 +01:00
João Brázio d6cfcc9c8b
Added new G-Code: M78 2016-04-29 23:13:58 +01:00
Scott Lahteine f4706bb90e Keepalive not needed while waiting for temperatures 2016-04-28 21:11:15 -07:00
Blue-Marlin e58e281473 Fix feedrate after toolchange 
The fix is simple. Most changes are because of changed indendation,
bacause of leaving early for wrong tool number
 2016-04-27 00:57:45 +02:00
Scott Lahteine ec82e1e05d Merge pull request #3616 from thinkyhead/rc_fixup_some_movement 
General cleanup around high level move functions
 2016-04-25 20:23:38 -07:00
Scott Lahteine abeab792cb General cleanup around high level move functions 
- Use new `DEBUG_POS` macro for `DELTA` debug
- Neaten up `prepare_move` a smidgen
- Remove an old commented `prepare_move()` line
 2016-04-25 20:02:24 -07:00
Scott Lahteine 68d0347e67 Call report_current_position after M206 / M428 2016-04-25 18:43:28 -07:00
Scott Lahteine dcb4cdaa9e Call report_current_position instead of gcode_M114 directly 2016-04-25 18:43:27 -07:00
gralco 840e13f664 Introduce M108 cancel heatup for the hotend and bed 
This G-code is asynchronously handled in the get_serial_commands() parser.
 2016-04-25 08:33:33 -06:00
João Brázio a901555da4 Moved G29 debug output before matrix.set_to_identity() 2016-04-22 20:57:22 -07:00
Scott Lahteine 1caa2628da Use sync_plan_position_e function elsewhere 2016-04-20 13:02:19 -07:00
Scott Lahteine c7df961144 Fix G92 so it only sets the plan position once 2016-04-20 13:01:58 -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 ac69fad96d lowercase "stop" function 2016-04-19 19:43:54 -07:00
Scott Lahteine 39ee9c526b setTargetedHotend => get_target_extruder_from_command 2016-04-19 19:43:54 -07:00
Scott Lahteine cafa8b8ce3 Rename filament runout items 2016-04-19 19:43:39 -07:00
Scott Lahteine 27b2e2e786 Document some variables 2016-04-19 19:43:39 -07:00
Scott Lahteine a4062a47ac Rename baricuda variables 2016-04-19 19:43: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 a26d70e932 Apply indentation to gcode_M303, PID_autotune 2016-04-18 19:04:45 -07:00
Scott Lahteine ba66336503 Output error for disabled M303 2016-04-18 19:03:45 -07:00
Scott Lahteine 5905ec5ba8 Merge pull request #3541 from thinkyhead/rc_mbl_one_last_lift 
Add a final lift, if configured, in Manual Bed Leveling
 2016-04-17 17:20:02 -07:00
Jeff K 90c49f5a14 Fixed invalid addressing (overflow) of position_shift / software endstops 
Signed-off-by: Jeff K
 2016-04-17 19:28:50 -04:00
Scott Lahteine c242bee449 Add a final lift, if configured, in Manual Bed Leveling 2016-04-17 00:12:46 -07:00
Scott Lahteine 837df6108c Fix borked set_bed_level_equation_lsq 2016-04-16 20:35:42 -07:00
Scott Lahteine 4b75b11a53 Wrap defines in parentheses in configs, M48 2016-04-16 18:21:09 -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 a8e4d7c135 Merge pull request #3477 from alephobjects/BedTempHysteresis 
Implementation of M190 bed temp hysteresis
 2016-04-15 16:20:58 -07:00
esenapaj 5ecd75eeb3 Fix for PR #3502(General cleanup of arc code) 2016-04-16 07:22:07 +09:00
gralco 8ec8d59df8 Use #if TEMP_RESIDENCY_TIME > 0 rather than #ifdef TEMP_RESIDENCY_TIME 2016-04-15 11:20:32 -06:00
Scott Lahteine 6e52b0b723 Merge pull request #3504 from thinkyhead/rc_fix_debugging 
Fix debugging of vector_3
 2016-04-14 19:08:30 -07:00
Scott Lahteine 88367a37f7 Merge pull request #3227 from thinkyhead/rc_home_offsets_and_limits 
Relating current_position, min_pos, max_pos, and home_offset
 2016-04-14 18:50:43 -07:00
Scott Lahteine b20bf1826d Fix debugging of vector_3 2016-04-14 18:45:26 -07:00
Scott Lahteine b243844690 Merge pull request #3502 from thinkyhead/rc_fix_arcs_bugs 
General cleanup of arc code
 2016-04-14 18:19:44 -07:00
Scott Lahteine 2129db581e Simplify MBL movement, zigzag 2016-04-14 16:58:42 -07:00
Scott Lahteine 0493fccc0b mbl.active is a bool now 2016-04-14 16:58:42 -07:00
Scott Lahteine 8e5099fa0c Update software endstop positions with M206, M428, G92, etc. 2016-04-14 16:47:22 -07:00
Scott Lahteine 5cfb2533d6 Initial cleaning up of arc code 2016-04-14 16:43:49 -07:00
Scott Lahteine 9ce4264fda Merge pull request #3490 from thinkyhead/rc_mbl_adjustments 
Document some movement functions, rename a local
 2016-04-13 20:55:20 -07:00
esenapaj 2eb1b102f8 Support for "mechanical probe" with Allen Key as a special case 2016-04-13 20:34:12 -07:00
Scott Lahteine cfcd3d7b3e Rename z_offset local to zoffset 2016-04-13 20:09:20 -07:00
Scott Lahteine 5fd20ecac3 Comments on some movement functions 2016-04-13 20:09:20 -07:00
Scott Lahteine a781a6f955 Apply esenapaj 3479 and delta/scara position bugfix 2016-04-13 17:41:20 -07:00
Scott Lahteine 525d8256d4 Merge pull request #3481 from thinkyhead/rc_extruder_offset_array 
Fix: gcode_T using non-existent Z offset
 2016-04-12 18:23:08 -07:00
Scott Lahteine 46881c846c Add comments for extruder offset options 2016-04-12 17:16:58 -07:00
Scott Lahteine edf376ce0d Fix: gcode_T using non-existent Z offset 
As noted by @snowzach in #3461
 2016-04-12 17:15:10 -07:00
gralco 178aeb79c8 Implementation of M190 bed temp hysteresis 2016-04-12 08:56:14 -06:00
Scott Lahteine 0439483bc8 Merge pull request #3476 from thinkyhead/rc_debug_leveling_gcode_t 
Add DEBUG_LEVELING output for gcode_T
 2016-04-11 21:03:15 -07:00
Scott Lahteine 63d8893f5d Add DEBUG_LEVELING output for gcode_T 2016-04-11 20:45:10 -07:00
Scott Lahteine f840c7de4d Initialize stepper counts for Delta/SCARA 2016-04-11 19:02:35 -07:00
Scott Lahteine 56acaf3594 Merge pull request #3469 from thinkyhead/rc_aleph_cooldownfix 
Fix for M109 and M190 cooldown
 2016-04-11 18:01:01 -07:00
gralco c218db136a Fix for M109 and M190 cooldown 
Also removes the re-definition of now inside M190's while loop
 2016-04-11 17:12:23 -07:00
Scott Lahteine c5a2ce4366 Merge pull request #3446 from thinkyhead/rc_fixup_M206_and_mesh 
Fix home_offset handling and account for it in G29
 2016-04-11 16:49:01 -07:00
Scott Lahteine b1bb1c7989 Merge pull request #3466 from thinkyhead/rc_look_for_leveling_bug 
Add CORE support to st_set_position and plan_set_position
 2016-04-11 16:45:00 -07:00
Scott Lahteine fdee2be49c More logging of matrix behavior 2016-04-11 00:06:33 -07:00
Scott Lahteine 7f265db3ef Move sync_plan_position after DEBUG_LEVELING 2016-04-10 23:40:11 -07:00
Scott Lahteine 02550af7c3 Merge pull request #3453 from thinkyhead/rc_jbrazio_m190 
ELAPSED / PENDING for rollover-safe time checking
 2016-04-10 20:25:02 -07:00
Scott Lahteine 803845ec18 Add a case for M113 to process_next_command 2016-04-10 18:53:03 -07:00
Scott Lahteine 386140f361 Test time difference in safe way 2016-04-10 18:09:31 -07:00
Scott Lahteine 1b7356b3a1 Account for home_offset in G29 handler 2016-04-10 15:35:02 -07:00
Scott Lahteine f3562dd895 Have M206 alter current_position, M428 use new function 2016-04-10 15:35:01 -07:00
Scott Lahteine 6d465321b5 Adjust timeout code in host_keepalive 2016-04-09 16:58:17 -07:00
Scott Lahteine 50c3140040 Merge pull request #3414 from thinkyhead/rc_host_timeout_mods 
Host Keepalive configurable timeout with 2s default
 2016-04-08 21:45:45 -07:00
Scott Lahteine 1acf901b63 Adjustments to residency_start_ms handling 2016-04-08 21:20:23 -07:00
gralco 907aed57db Fix bug which can cause an infinite M109 loop 
Since residency_start_ms is -1 when entering the heatup while loop whilst the hotend temp is close to the target them already then it may not escape.

Hence "Start the TEMP_RESIDENCY_TIME timer when we reach target temp for the first time."
 2016-04-08 21:20:23 -07:00
jbrazio dd3a06a95a Implemented M155 and M156, a generic TWI/I2C interface for Marlin 2016-04-08 20:14:37 -07:00
Scott Lahteine 843aa90b5a Merge pull request #3434 from thinkyhead/rc_more_debug_leveling 
Additional debug leveling output
 2016-04-08 18:57:18 -07:00
Scott Lahteine a644ab1de4 Minor patch ups to G29 
This may fix a subtle bug caused by doing `G29` more than once without
`G28` between.
 2016-04-08 17:53:15 -07:00
Scott Lahteine cba2698871 Additional DEBUG_LEVELING output 2016-04-08 17:53:15 -07:00
Scott Lahteine 5e18d650c4 Merge pull request #3427 from thinkyhead/rc_better_SERIAL_ECHOPAIR 
No casting needed for SERIAL_ECHOPAIR
 2016-04-07 19:29:18 -07:00
Scott Lahteine e0b0d1eb6b Add M113 to get/set Host Keepalive 2016-04-07 19:25:56 -07:00
Scott Lahteine 85883da90c Implement basic HOST_KEEPALIVE_INTERVAL 2016-04-07 19:25:56 -07:00
Scott Lahteine 098fb8f8c9 Merge pull request #3413 from thinkyhead/rc_probe_G30_position 
Report the probe position in G30
 2016-04-07 19:25:33 -07:00
Scott Lahteine c9c7c66b95 Merge pull request #3421 from jbrazio/bugfix/m109-EXTRUDE_MINTEMP-expansion 
M109: Protect against EXTRUDE_MINTEMP expansion
 2016-04-07 19:18:34 -07:00
Scott Lahteine d7cbb2eec9 Merge pull request #3403 from jbrazio/feature/stopwatch 
Print job timer rework
 2016-04-07 19:18:03 -07:00
Scott Lahteine dc19b69697 No casting needed for SERIAL_ECHOPAIR 2016-04-07 16:33:21 -07:00
João Brázio 471d30cc1c
M109: Protected against EXTRUDE_MINTEMP expansion 2016-04-07 12:50:57 +01:00
João Brázio 7c7e30f4cc
Adherence to the new OOP coding standards 2016-04-07 12:41:09 +01:00
Scott Lahteine 865dcf3fb4 Fix FILAMENT_WIDTH_SENSOR measurement 
Only measure and store filament width when E is going forward.
 2016-04-06 19:48:04 -07:00
Scott Lahteine 2f6c5fe2da Report the probe position in G30 2016-04-06 16:55:21 -07:00
João Brázio e48d0263bf Bugfix: M32 was still using the old print timer 2016-04-06 04:41:36 +01:00
João Brázio e8b80d8c20 Implemented M75, M76, M77 to control the print timer 2016-04-06 04:38:42 +01:00
João Brázio eb61051556 Rework the print job timer to use the stopwatch class 2016-04-06 04:34:03 +01:00
Scott Lahteine 98f2e9fc83 Reduce string storage required for DEBUG_LEVELING 2016-04-05 19:04:42 -07:00
Scott Lahteine 1af5d7b35f Add more leveling-debug output 2016-04-05 18:31:10 -07:00
Scott Lahteine 56e8e2b0eb Final tweaks to M111 output 2016-04-04 15:36:07 -07:00
João Brázio d819a4aff9 Fixes #3346, followup #3343: variables must defined with the static keyword to work with PROGMEM when defined inside functions 2016-04-04 15:02:18 +01:00
Scott Lahteine de39056f68 Merge pull request #3343 from thinkyhead/rc_fix_m111_output 
Fix M111 output using pgm_read_word, as required
 2016-04-03 17:44:38 -07:00
Scott Lahteine fd0ac371b0 Fix M111 output using pgm_read_word as required 
As noted by @taratata2016 in https://github.com/MarlinFirmware/Marlin/issues/3300#issuecomment-204687275
 2016-04-03 17:33:06 -07:00
Scott Lahteine d771174797 Merge pull request #3337 from esenapaj/patch-2 
suppress warnings
 2016-04-03 17:01:22 -07:00
Scott Lahteine d24f14a799 Add HAS_TEMP_HOTEND define 2016-04-03 16:18:49 -07:00
esenapaj f9e1a0ee6c suppress warnings 2016-04-04 06:48:53 +09:00
Scott Lahteine 80b8fd1cad Add MSG_HOME_OFFSETS_APPLIED 2016-04-02 18:14:49 -07:00
Scott Lahteine bc86ee0271 Simplify homeaxis with some macros 2016-03-30 18:44:05 -07:00
Scott Lahteine 82ef101ed5 Deploy & Stow in G29 for Delta + Z Servo Endstop 2016-03-30 16:41:16 -07:00
Scott Lahteine de333c4fea Merge pull request #3279 from thinkyhead/rc_filament_width_sensor 
FILAMENT_SENSOR -> FILAMENT_WIDTH_SENSOR
 2016-03-30 12:16:27 -07:00
Scott Lahteine 8def2c31db Merge pull request #3284 from thinkyhead/rc_stop_watchheat_lcdset0 
Fix temperature checking conditions (backwards!)
 2016-03-30 12:10:39 -07:00
Scott Lahteine 8bf5f7c676 Merge pull request #3282 from jbrazio/bugfix/m104-timer-wont-start 
M104 not starting the print timer
 2016-03-30 11:54:16 -07:00
Scott Lahteine 31450ad498 Fix temperature checking conditions (backwards!) 2016-03-30 11:52:03 -07:00
João Brázio 187c183c20 M104 was not starting the print timer 2016-03-30 11:33:24 +01:00
Scott Lahteine 507aef055f Patch broken M404 2016-03-29 20:54:31 -07:00
Scott Lahteine 1a79b13b7a FILAMENT_SENSOR -> FILAMENT_WIDTH_SENSOR 2016-03-29 20:54:31 -07:00
Scott Lahteine 5f32184254 Merge pull request #3278 from thinkyhead/rc_cleanup_m111_redo 
Echo all debug levels in M111, default to DEBUG_NONE
 2016-03-29 20:34:31 -07:00
Scott Lahteine 05765fb570 Add DEBUGGING macro 2016-03-29 19:50:01 -07:00
Scott Lahteine 4402760739 Echo all debug levels in M111, default to DEBUG_NONE 
Redo of #3268 by @jbrazio
 2016-03-29 19:18:45 -07:00
Scott Lahteine f0b96f5cae Merge pull request #3276 from thinkyhead/rc_sdprint_and_lcd_sleuth 
Refinements, fixes, reduced stack usage in CardReader
 2016-03-29 18:30:18 -07:00
Scott Lahteine 12c0bf9521 Merge pull request #3277 from jbrazio/bugfix/m190-temp-never-reached 
M190 bed temp is never reached
 2016-03-29 18:28:51 -07:00
João Brázio c6577aea60 M190 bed temp was never reached 2016-03-30 01:03:20 +01:00
Scott Lahteine 27d70599d4 Change openFile default to "not-push" instead of "do-replace" 2016-03-29 03:16:35 -07:00
Scott Lahteine 3252df7998 Minor cleanup to filament sensor code 2016-03-28 20:04:34 -07:00
Scott Lahteine 0b8ef5eba6 Split get_command into units, rename to get_available_commands 2016-03-28 06:00:04 -07:00
Scott Lahteine 545f7997ea Continue on empty lines instead of returning 2016-03-28 05:37:36 -07:00
Scott Lahteine 3dcf6d42ff Don't store escaped serial characters if comment_mode 2016-03-28 05:37:36 -07:00
Scott Lahteine 5f8e52aefb Minor cleanup to command dispatcher 2016-03-28 05:37:36 -07:00
Scott Lahteine f1ed310322 Add NUMERIC compare macros to simplify code 2016-03-28 03:52:49 -07:00
jbrazio 443e6d26fe Formatted multi-line comments 2016-03-27 04:36:36 +01:00
Scott Lahteine e4039a9b5b Merge pull request #3250 from esenapaj/patch-1 
Fix typo
 2016-03-26 00:41:31 -07:00
Scott Lahteine cd4c3e90bc Send a busy signal every 10 seconds instead of every 2 2016-03-25 22:15:40 -07:00
Scott Lahteine 26168676e7 Merge pull request #3246 from thinkyhead/rc_fix_numeric_filenames 
Fix: current_command_args skips digits at the front
 2016-03-25 16:38:36 -07:00
esenapaj f54315c728 Fix typo 
These are salvaged from closed-PR #3216.
 2016-03-26 08:37:17 +09:00
Scott Lahteine f423716c6a Fix: current_command_args skips digits at the front 
Closes #3245
 2016-03-25 16:12:41 -07:00
Scott Lahteine 18de9f55ac Merge pull request #3242 from thinkyhead/rc_epatel_mesh_fixes 
Updated Mesh Bed Leveling
 2016-03-25 06:48:12 -07:00
Scott Lahteine 3a1e6b1752 Merge pull request #3243 from AnHardt/homed 
axis_known_position -> axis_homed
 2016-03-25 06:36:46 -07:00
AnHardt 94962ee678 axis_known_position -> axis_homed 
In all these cases we want the axis to be homed. If we could have lost
some steps is secondary.

Reenables homing seperate axis with DISABLE_X / DISABLE_Y true.
 2016-03-25 14:05:20 +01:00
Edward Patel 14afe1a017 Move to Z=0 for G28 when using Manual Bed Leveling 
copy of 406992f9dd
 2016-03-25 04:58:44 -07:00
Edward Patel c606ed447a Add "G29 S4" to fine tune Z level for Mesh Bed Leveling. 
Also add mbl.z_offset to the EEPROM, bumping the version to V23.
 2016-03-25 04:58:43 -07:00
Scott Lahteine 5d8036e554 Code cleanup around MOTOR_CURRENT_PWM options 2016-03-25 04:23:46 -07:00
Scott Lahteine 0da744b7b0 Further cleanup of comments, partial Doxygen-style 
Following up on #3231
 2016-03-25 00:45:56 -07:00
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
Scott Lahteine d580a0d186 Use "+=" in plane rotation 2015-05-17 01:51:14 -07:00
Scott Lahteine 2f3a410cb0 Fix a potential hanging "else" bug 2015-05-17 01:50:30 -07:00
Scott Lahteine b83e3f0905 Combine "Bed X: " strings 2015-05-17 01:49:52 -07:00
Scott Lahteine 7dfb8becdb Adjust some names and types in Marlin_main.cpp 2015-05-17 01:48:51 -07:00
Scott Lahteine c966aa26ff Comments in Marlin_main.cpp 2015-05-17 01:47:53 -07:00
Scott Lahteine c54a2ea042 Adjust spacing in Marlin_main.cpp and stepper.* 2015-05-17 01:47:02 -07:00
Scott Lahteine 072625ccad Update headings in Marlin_main.cpp and stepper.cpp 2015-05-17 01:44:53 -07:00
Scott Lahteine 16032f149f Rename to codenum as a consistency 2015-05-16 23:17:35 -07:00
Scott Lahteine 273a4a253f Merge pull request #2096 from thinkyhead/cherry_picking3 
Hide M117 with no LCD
 2015-05-16 21:10:28 -07:00
Scott Lahteine 64825a3d1e Merge pull request #2095 from thinkyhead/cherry_picking2 
Add gcode_line_error to reduce code size
 2015-05-16 21:09:15 -07:00
Scott Lahteine ca79282eaf Hide M117 with no LCD 2015-05-16 20:59:04 -07:00
Scott Lahteine ce218cafdb Add gcode_line_error to reduce code size 2015-05-16 20:54:58 -07:00
Scott Lahteine 46d59784ad Rename preocess_command to process_next_command 2015-05-16 20:47:40 -07:00
Scott Lahteine 19166a92e4 Merge pull request #2057 from Wurstnase/serial_wait 
add plan buffer remaining for 'P' and block buffer remaining 'B'
 2015-05-14 04:57:08 -07:00
Scott Lahteine e97fcafd0e Merge pull request #2076 from thinkyhead/mendel_inverting 
Use MSG_OK in M105
 2015-05-14 04:54:11 -07:00
Scott Lahteine 0f6cd3640b Drop extraneous ok_to_send 2015-05-14 04:38:09 -07:00
Scott Lahteine 0ce355d9e7 Use MSG_OK in M105 2015-05-14 03:33:38 -07:00
Scott Lahteine 7b3acfbb6f Merge pull request #2072 from thinkyhead/better_arc_code 
Consolidate arc code, remove motion_control.*
 2015-05-14 00:27:22 -07:00
Scott Lahteine 68ce419147 Note on segment size 2015-05-13 19:11:36 -07:00
Scott Lahteine 8b92249f18 Bring arc_offset into auto scope 2015-05-13 19:00:46 -07:00
Scott Lahteine 80807b2d71 Consolidate arc code, remove motion_control.* 2015-05-13 18:52:41 -07:00
Scott Lahteine f65833931d Formatting tweaks 2015-05-13 02:02:19 -07:00
Scott Lahteine 747fd5801c Merge pull request #2055 from thinkyhead/thermal_unified 
Combine thermal runaway and watch-period
 2015-05-12 08:04:29 -07:00
Scott Lahteine 6e5572228d Merge pull request #2064 from thinkyhead/wait_before_g28 
Split up prepare_move by type
 2015-05-12 07:53:11 -07:00
Scott Lahteine 27ad381e25 Allow fractional seconds in G4 and M0 2015-05-12 07:52:08 -07:00
Scott Lahteine b2bd9aae7c SCARA_SEGMENTS_PER_SECOND 2015-05-12 04:18:15 -07:00
Scott Lahteine bd20bd5444 Merge pull request #2063 from chris-bo/autobed_sled 
improve sled handling
 2015-05-12 03:29:21 -07:00
Scott Lahteine 9e95ceb3fc Split up prepare_move by type 
- For better encapsulation add inlines for each prepare_move type
- Move controllerFan vars inside the function as statics
- Some formatting cleanup
- Rename `ClearToSend` as `ok_to_send`
 2015-05-12 02:08:20 -07:00
Christian Bohn f48599f172 add pin definition to some motherboards 2015-05-12 10:02:23 +02:00
Scott Lahteine b5200e184c Remove extra setup_for_endstop_move 2015-05-12 01:01:53 -07:00
Scott Lahteine 8d814de558 Return void in prevent_dangerous_extrude 2015-05-12 00:55:00 -07:00
Scott Lahteine 367e2eb9f4 Global setup_for_endstop_move 2015-05-12 00:51:22 -07:00
Scott Lahteine fa951f8a0b Always do st_synchronize() before G28 2015-05-12 00:31:51 -07:00
Christian Bohn 27a3b1d895 disable sled pin by default 2015-05-12 08:51:01 +02:00
Christian Bohn fb44b53ae3 sled improvements 
- create sled pin definition
- G28 Works with sled
 2015-05-11 23:22:19 +02:00
Wurstnase 46d1932380 add plan buffer remaining for 'P' and block buffer remaining 'B' 2015-05-11 13:04:00 +02:00
Scott Lahteine 8a0dc4d54a Merge pull request #1922 from Wurstnase/serial_wait 
Serial wait
 2015-05-10 23:10:25 -07:00
Wurstnase 526ad82d20 activate advanced_ok and no_timeout 2015-05-11 08:01:51 +02:00
Scott Lahteine 2445ae3d3a Combine thermal runaway and watch-period 
- Make thermal protection for all hotends and/or bed into simple
switches
- Now enable `WATCH_TEMP_PERIOD` when `THERMAL_PROTECTION_HOTENDS` is
enabled
- Move detailed thermal parameters to `Configuration_adv.h`
- Add sanity checks to warn about old configurations
- Change `WATCH_TEMP_PERIOD` to seconds instead of milliseconds
 2015-05-10 22:52:01 -07:00
Scott Lahteine 4097207c75 Merge pull request #2041 from thinkyhead/watch_temp 
More thermal protection
 2015-05-10 21:39:05 -07:00
Scott Lahteine 9b3d4380d3 Only watch the heater that was set 2015-05-10 20:26:45 -07:00
Scott Lahteine f73f4ce555 Make some z probe and servo code tweaks 2015-05-09 19:11:19 -07:00
Scott Lahteine 54deb9eea3 Enable WATCH_TEMP_PERIOD by default 2015-05-08 22:36:02 -07:00
Wurstnase 0cb87795a3 advanced 'ok' 
ok N(linenumber) P(bufferremaining)
the host can use this to send the data much faster.

Some pseudo code:
If (bufferremaining > 0)  send command
## as long there is free buffer send command

Also
if (linenumber > lastsend - bufferremaining) send command
## as long last linenumber received is bigger than lastsend (host) - last bufferremaining received
 2015-05-08 22:28:51 +02:00
Wurstnase 182e0d99c9 Merge remote-tracking branch 'Marlin8bit/Development' into serial_wait 2015-05-08 21:27:18 +02:00
Scott Lahteine 7f3252eea9 Merge pull request #1999 from paclema/Filrunout_configurable_script 
Added configurable script for filrunout from configuration.h
 2015-05-08 04:39:59 -07:00
Scott Lahteine 79633a74ab Fix MBL compile error 2015-05-06 14:25:13 -07:00
Scott Lahteine 777f2d3820 Merge pull request #2018 from fmalpartida/bugFixing 
Bug corrected: persistent HOMING message when HOME button pressed for homing.
 2015-05-05 00:12:32 -07:00
Scott Lahteine ecb46de349 Merge pull request #2013 from bq/Fix_lowercase 
Fixed lowercase change missing on commit a22a228b.
 2015-05-04 23:50:56 -07:00
fmalpartida 150a35eff8 Bug corrected: 
Persistent homing message.
Message was declared as an alert, therefore it was persistent.
Updated to message.
 2015-05-04 19:48:49 +02:00
Gina Häußge ab246ab032 Reverting changes to error messages on serial console 
This reverts the changes done to the error message for line number mismatches done in commit d43cc2dd5f
 2015-05-04 15:03:00 +02:00
Ivan Galvez Junquera 59529b755d Fixed lowercase change missing on commit a22a228b. 
Servo.cpp and Servo.h were changed to lowercase in Makefile but not their actual filenames.
 2015-05-04 09:44:34 +02:00
Scott Lahteine 1f039cde61 Merge pull request #1992 from thinkyhead/too_many_probes 
Stow Z probe on M402 without extra raise
 2015-05-03 20:40:26 -07:00
Scott Lahteine ca8cec8e8a Merge pull request #1998 from paclema/Filament_runout_fix 
Fixed sintaxis error of filament runout
 2015-04-29 19:53:25 -07:00
Scott Lahteine d4c74b8f8c Don't apply M428 if an error occurs 
- Also move audio feedback into the command
- Added shorthand for `lcd_buzz` availability
 2015-04-29 19:05:48 -07:00
Scott Lahteine d065d37822 Add M428 to set home_offset logically 2015-04-29 18:26:16 -07:00
paclema 013a09dbe6 Added configurable script for filrunout form configuration.h 2015-04-29 21:38:40 +02:00
paclema 4dcc0fd55a Fixed sintaxis error of filament runout 2015-04-29 21:32:27 +02:00
Scott Lahteine ce3caf447b Tweak how homeaxis deploys and stows 2015-04-28 19:17:48 -07:00
Scott Lahteine a235dca79c Stow z on M402 without extra raise 2015-04-28 19:10:07 -07:00
Scott Lahteine 3688256f86 Merge pull request #1974 from thinkyhead/eeprom_in_gcode 
Make EEPROM reproducible in GCode
 2015-04-27 22:35:41 -07:00
Scott Lahteine 31516e2a3b Merge pull request #1985 from Arengorn/Development 
Update of servo.h
 2015-04-27 22:10:02 -07:00
Scott Lahteine 0f687b5dda Merge branch 'Development' into eeprom_in_gcode 
Latest upstream commits
 2015-04-27 21:47:47 -07:00
Scott Lahteine 28aef684b4 Merge pull request #1957 from Voxel8/sjk/home_y_before_x 
Allow Y to home before X with option in Configuration_adv.h.
 2015-04-27 21:41:14 -07:00
Scott Lahteine 71a0b1a5bb Disable endstops between homing bumps 2015-04-27 21:14:30 -07:00
Scott Lahteine c36226c4dc Fix homing Z position 
Add `sync_plan_position()` after `axis_is_at_home(axis)` to keep the
planner position in sync when homing.
 2015-04-27 20:55:19 -07:00
Scott Lahteine ff178d8cf7 Change M421 to take coordinates 
This makes `M421` more amenable for irregular matrices
 2015-04-27 19:48:34 -07:00
Bernardo ff67ee73fc Update Marlin_main.cpp 
Corrected "servo.h" to "Servo.h" because of the updated filename.
 2015-04-27 23:29:16 -03:00
Steve Kelly 98ca46006c Allow Y to home before X with option in Configuration_adv.h. 
This addresses comments in #1956 and #1079. In particular, this is useful
when both endstops are stationary on a CoreXY system, and the Y axis needs
to be homed before the X so the flags are aligned.
 2015-04-27 16:17:30 -04:00
Scott Lahteine 0fca084ea6 Make EEPROM reproducible in GCode 
With these changes the output of `M503 S0` is all you need to restore
the EEPROM. Building on this it is straightforward to save and restore
the EEPROM state using the SD card or external GCode file.

- Added `M145` to set “heatup states” for the LCD menu
- Added `M420` to toggle Mesh Bed Leveling
- Added `M421` to set a single Mesh coordinate
- Extended `Config_PrintSettings` with added M codes
- Cleaned up some comments here and there
 2015-04-26 20:56:33 -07:00
Scott Lahteine d43cc2dd5f M111 - Debug Level 
- Add `M111` as a standard option to set the debug level
- Implement `DEBUG_ECHO` in `process_commands`
- Other debug levels (e.g., `DEBUG_DRYRUN`) need more work
 2015-04-26 20:08:45 -07:00
Scott Lahteine a22a228bcc Rename files to move them in the IDE 2015-04-25 21:04:54 -07:00
Scott Lahteine 0438f0d835 Merge pull request #1924 from thinkyhead/raise_z_for_m401_m402 
Raise Z for M401 and M402
 2015-04-24 22:41:12 -07:00
Scott Lahteine b275946a52 Merge pull request #1966 from thinkyhead/g4_dwell_message 
G4 shows status message only if no message is set already
 2015-04-24 22:02:37 -07:00
Scott Lahteine 182f2cda35 Minor cleanup of M48 2015-04-24 21:26:36 -07:00
Scott Lahteine 3a6fd912cd Latest upstream commits, merged 2015-04-24 21:14:13 -07:00
Scott Lahteine 3c9e94e035 Merge pull request #1964 from AnHardt/Max6675again 
Add variant for MAX6675 in M104
 2015-04-24 20:44:45 -07:00
Scott Lahteine 56ff46eb8b Improve code_has_value test 2015-04-24 20:43:16 -07:00
Scott Lahteine ce142afdda G4 shows status message only if no message is set already 
- Address issue raised in #1961
 2015-04-24 20:13:01 -07:00
Scott Lahteine 35e79d56a5 Remove set-coordinate extension of G28 2015-04-24 19:23:12 -07:00
Scott Lahteine 3a74bb5039 Merge pull request #1945 from Wurstnase/max_endstopp 
Max endstopp
 2015-04-24 19:17:38 -07:00
AnHardt 0fed46360c Add variant for MAX6675 in M104 
Else will throw error:
@:0 B@:0
Error:No thermistors - no temperature
[ERROR] Error:No thermistors - no temperature

when no bed is defined
 2015-04-24 16:43:19 +02:00
Scott Lahteine 588ed70d4a Latest upstream commits, merged 2015-04-23 21:18:48 -07:00
Scott Lahteine 0165560333 Apply zprobe_zoffset in axis_is_at_home 
Ensure the probe offset will always be included when homing Z.
 2015-04-23 21:12:38 -07:00
Scott Lahteine 075386e7fe Merge pull request #1959 from thinkyhead/lcd_move_rate 
Include axis parameter to ultralcd's line_to_current
 2015-04-23 21:06:57 -07:00
Scott Lahteine 2558c10c6c Use the slower feedrate for XY axes 2015-04-23 20:06:17 -07:00
Scott Lahteine 64268f3312 Fixup axis_is_at_home a little 2015-04-23 18:16:44 -07:00
Scott Lahteine 996d0a9185 Squish the code down a little 2015-04-23 18:06:36 -07:00
Scott Lahteine 8534bc376c Fix homing of YZ with DUAL_X_CARRIAGE 2015-04-23 17:56:37 -07:00
Scott Lahteine 3b97a7d446 Merge pull request #1944 from AnHardt/beep2 
More Beeper clean up
 2015-04-23 17:50:02 -07:00
Wurstnase be9e4ceddc fix typo 
c'n'p ftw :/
 2015-04-23 10:35:14 +02:00
unknown c26d816839 filter any 0 2015-04-22 12:09:57 +02:00
Wurstnase 61ae43f35e v <-> code_value 2015-04-20 23:31:10 +02:00
Wurstnase da0d91a79b max endstopp 
no user will home to 0 with a max endstopp
 2015-04-20 23:28:46 +02:00
AnHardt 064f2b37d0 More Beeper clean up. 
Centralised beep code to lcd_buzz().
From gcode_M300() and lcd_quick_feedback().

Enforced max. duration for M300 to 5 seconds.

Corrected description in 'Configuration.h'

LCD_FEEDBACK_FREQUENCY_HZ 0 gives now a silent delay of
LCD_FEEDBACK_FREQUENCY_DURATION_MS.
 2015-04-20 11:11:13 +02:00
Wurstnase 92575cecca new timout/add adv_ok 2015-04-20 00:22:40 +02:00
AnHardt 671aaf2dc9 Minor fix for M300 
Corrected wrong order of parameters.
 2015-04-19 13:25:20 +02:00
Scott Lahteine d931220a65 Tweak comments 2015-04-18 23:12:29 -07:00
Scott Lahteine 47847765e2 Add M410 QuickStop command 2015-04-18 23:07:48 -07:00
Wurstnase b09a957fce make 'wait' optional and mark as workaround 2015-04-16 21:42:54 +02:00
Scott Lahteine 63b98b8280 Raise Z for M401 and M402 2015-04-16 07:24:33 -07:00
wurstnase d69da22f7c last_command_time inside get_command() 2015-04-16 16:20:23 +02:00
wurstnase 574e2d856e remove config 2015-04-16 13:07:20 +02:00
paclema cde5eee2a5 Removed unnecessary comments 2015-04-15 19:01:09 +02:00
paclema e1b69db6d1 Fixed M48 mismatch between n and P parameter on documentation 2015-04-15 18:17:58 +02:00
Scott Lahteine e0e68c5cbc Rename servos[] array in Marlin to servo[] 2015-04-14 03:13:25 -07:00
Scott Lahteine 642f6a92bc fix type of code_has_value 2015-04-13 18:02:17 -07:00
Scott Lahteine 17ad80c1e1 Spacing in XYZ_CONSTS 2015-04-13 17:58:47 -07:00
Scott Lahteine 09d60e0128 Naming and code comments 2015-04-13 17:17:36 -07:00
Mehmet Sutas 5a9e45cc4a Fix Syntax Error Filament Runout Statement 2015-04-13 22:37:18 +03:00
Scott Lahteine ccddc280be Apply three more commits 2015-04-12 22:47:44 -07:00
Scott Lahteine ac2b23f574 Homing fixes 
- Prevent `Z_SAFE_HOMING` from homing Z twice in some cases
- Allow `G28` with XYZ values of 0 to explicitly set the position
- Don’t add `home_offset` when setting XYZ explicitly in `G28`
- Add `code_has_value` function to check for the presence of a numeric
value (could just test for space or nul to allow other types of values)
 2015-04-11 20:06:48 -07:00
Scott Lahteine 5fe382949b Some G-Codes comment cleanup 2015-04-10 16:16:13 -07:00
Scott Lahteine 8b16ebe705 Break out prevent_dangerous_extrude feature 
- It’s inline here, but could be a macro and duplicated for
`planner.cpp`
 2015-04-09 22:40:37 -07:00
Scott Lahteine 9189cc66ab Fix moves for DELTA for MANUAL_BED_LEVELING 
- Use `line_to_current` in place of `plan_buffer_line`
 2015-04-09 04:32:14 -07:00
Scott Lahteine 2ca099d1e7 Merge pull request #1876 from thinkyhead/cold_extrude 
Catch dangerous extrude before trying several
 2015-04-09 03:21:19 -07:00
Scott Lahteine a00ebf03d4 Merge pull request #1868 from AnHardt/LCD_STR 
Moved the definitions of the LCD_STR_* to Conditionals.h
 2015-04-09 01:56:23 -07:00
Scott Lahteine 1269c445ab Catch dangerous extrude before trying several 2015-04-09 01:40:48 -07:00
AnHardt 540dbb35e2 And an other MSG_BED in Marlin_main.cpp 2015-04-09 01:16:06 +02:00
AnHardt 14d4419e16 Replaced SERIAL_PROTOCOLPGM(MSG_BED) with SERIAL_PROTOCOLPGM("Bed") 
Resolved some warnings in Marlin_main.cpp regarding compares of signed and unsigned integers by replacing 'int' or 'uint16_t' with 'uint8_t'.
 2015-04-08 23:59:01 +02:00
AnHardt 6a514f3dc9 Aplied HAS_LCD_CONTRAST also to Marlin_main.cpp 
and cleaned typo.
 2015-04-08 13:26:29 +02:00
Scott Lahteine 3162971cd6 current_position not static 2015-04-08 01:05:39 -07:00
Scott Lahteine 27cb90da8b IsStopped / IsRunning inline 2015-04-08 00:56:19 -07:00
Scott Lahteine e03da4805b Merge pull request #1774 from epatel/Development 
Mesh bed leveling: Added G29 S3 + finer display steps during manual input + bug fix
 2015-04-07 19:24:46 -07:00
Scott Lahteine f7c4e7e19f Fix G29 not deploying in some instances 2015-04-07 15:38:29 -07:00
Edward Patel 002340f32c Merge branch 'Development-Marlin' into Development 2015-04-07 22:49:12 +02:00
Scott Lahteine c379f17117 Encapsulate setting of homing_bump_feedrate 2015-04-06 23:21:33 -07:00
Scott Lahteine d20f42c883 Don't stow the probe until the last grid point! 
- Address Issue #1682 at hash #issuecomment-89756858
 2015-04-06 20:58:09 -07:00
Scott Lahteine 6d084c017f Fix typo in FWRETRACT handler 
Should be `retracting` and not `retract`
 2015-04-06 17:04:22 -07:00
Edward Patel 2f0081bbb5 Compile error fix! Fix for merge artifacts. 2015-04-05 04:16:16 +02:00
Edward Patel ea10601406 Merge branch 'Development-Marlin' into Development 
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
 2015-04-05 04:06:02 +02:00
Scott Lahteine 61f8394361 Compare indices instead of floats for probe actions 2015-04-04 05:01:16 -07:00
Scott Lahteine 0935084141 Fix manage_inactivity 
- Document `manage_inactivity` function
- Allow `EXTRUDER_RUNOUT_PREVENT` to work with all extruders
- Use faster `memcpy` for copying coordinates
 2015-04-03 23:42:50 -07:00
Scott Lahteine c065da52ec Spacing and spelling 2015-04-03 22:54:48 -07:00
Scott Lahteine 8680b515b0 Fix missing tmp_extruder -> target_extruder 2015-04-03 22:12:49 -07:00
Scott Lahteine c185912c19 Latest upstream commits, mostly 2015-04-03 21:58:48 -07:00
Scott Lahteine 1e5c18bb14 Add code_value_short and SERIAL_CHAR 2015-04-03 21:43:30 -07:00
Scott Lahteine 84e4edaea7 Add M48 comment for #1794 2015-04-03 19:52:00 -07:00
Scott Lahteine b98ebd517e disable / enable_all_steppers functions 2015-04-03 19:25:22 -07:00
Scott Lahteine 713953d8c1 Upstream commits, allow no extruder in M105 2015-04-03 19:16:38 -07:00
Scott Lahteine 8f893eb8df Merge pull request #1798 from thinkyhead/fixup_probing 
Fix probe height at G28 start
 2015-04-03 19:03:00 -07:00
Scott Lahteine dde7e11f8e Merge branch 'Development' into fixup_tr 
Latest upstream commits
 2015-04-03 18:56:52 -07:00
Scott Lahteine abd7fc36b6 Fix probe height at G28 start 2015-04-03 18:54:55 -07:00
Scott Lahteine 610c8c5471 Merge pull request #1795 from thinkyhead/fixup_probing 
Finish pin tests
 2015-04-03 18:44:44 -07:00
Scott Lahteine e4934164e4 Merge pull request #1790 from Wurstnase/fix_home_z 
fix feedrate for homing z
 2015-04-03 18:35:09 -07:00
Scott Lahteine a469d796e1 Add cleanups needed for #1772 2015-04-03 18:14:57 -07:00
Scott Lahteine c0ca26cd50 Merge branch 'Development' into fixup_probing 
Latest upstream commits
 2015-04-03 18:05:17 -07:00
Scott Lahteine 5c1f08a35f Merge pull request #1772 from croadfeldt/Merge_cleanup 
Z_PROBE_ENDSTOP
 2015-04-03 18:04:31 -07:00
Scott Lahteine 92119d0f7d Static delta[] for SCARA 2015-04-03 16:46:56 -07:00
Scott Lahteine 6b919e14c1 Group all universal variables 2015-04-03 15:45:41 -07:00
Scott Lahteine 21cd2e4fae Merge branch 'Development' into fixup_probing 
Latest upstream commits
 2015-04-03 15:32:15 -07:00
Scott Lahteine 0e8182bbf2 Additional pin tests, cleanup 2015-04-03 15:31:35 -07:00
Wurstnase 45565b680d second wrong feedrate 2015-04-03 18:01:28 +02:00
Wurstnase 581b2aae04 fix feedrate for homing z 
max_feedrate is in mm/s. line_to_destination needs a feedrate in mm/min because there is feedrate/60.
 2015-04-03 16:11:32 +02:00
AnHardt 23cd54755f Fix typo in Marlin_main.cpp 
related to current_position[Z_AXIS] and retract_zlift.

'+ =' -> '+='

Fix for #1786
 2015-04-02 14:50:31 +02:00
Scott Lahteine e96df67630 Clarify thermal_runaway_protection 
- Add comments documenting `thermal_runaway_protection`
- Add an enum for the thermal runaway states
- Add macros for temperature helper functions
- Fix a glitch with the z probe sled in homeaxis
 2015-04-02 05:10:14 -07:00
Edward Patel 6b91b7b411 Mesh bed leveling: Added G29 S3 + finer steps in manual probing. 
* Use "G29 S3 Xn Yn Zn.nn" to modify bad probed point manually
* Changed manual Z steps from 0.05 to 0.025 and made brought it to Configuration.h
 2015-04-01 21:18:51 +02:00
Chris Roadfeldt 26dc80bf2d Typo fixed... 2015-04-01 13:47:17 -05:00
Chris Roadfeldt a57862e29f Cleaning up code in prep for merge with upstream. 2015-04-01 11:40:24 -05:00
Chris Roadfeldt 745d9fe1a4 Merge remote-tracking branch 'MarlinFirmware/Development' into Merge_cleanup 
Conflicts:
	Marlin/Marlin_main.cpp
 2015-04-01 10:31:02 -05:00
Scott Lahteine 9593f09b99 Merge pull request #1764 from thinkyhead/probe_leveling 
Fix homing and leveling
 2015-04-01 02:00:39 -07:00
Scott Lahteine 72c7de3570 Cleanup M48 2015-04-01 01:48:45 -07:00
Scott Lahteine 97a258b0b0 Clean up, document home_axis 2015-04-01 01:44:13 -07:00
Chris Roadfeldt a508d835db Changed Z_PROBE_AND_ENDSTOP to Z_PROBE_ENDSTOP. 
Updated documentation in Configuration.h.
Cleaned up and commented some code relating to Z_PROBE_ENDSTOP.
Separated Z_MIN_ENDSTOP and Z_PROBE_ENDSTOP completely.
 2015-04-01 02:14:55 -05:00
Chris Roadfeldt fdb4ddbdea Merge remote-tracking branch 'MarlinFirmware/Development' into Development 2015-04-01 00:52:08 -05:00
Scott Lahteine 1c7391717e Include sync_plan_position_delta for SCARA also 2015-03-31 19:58:03 -07:00
Scott Lahteine 0b57a2ab8b Merge pull request #1757 from bq/Translation-strings 
Added new trasnslatable labels.
 2015-03-31 18:56:25 -07:00
Scott Lahteine 18bb6be80e Fix homing and leveling 
- Include the current Z when raising the axis after and between probing
- Add `sync_plan_position_delta` for parity with `sync_plan_position`
- Clean up and clarify `M48`, `dock_sled`, and others
 2015-03-31 18:52:19 -07:00
Chris Roadfeldt c89b8368ee Merge remote-tracking branch 'MarlinFirmware/Development' into Development 
Conflicts:
	Marlin/Marlin_main.cpp
 2015-03-31 11:08:36 -05:00
Ivan Galvez Junquera d08782386b Added new trasnslatable labels. 
* Added MSG_END_HOUR and MSG_END_MINUTE labels to all language files.
* Available translations:
  EN, FR, DE, ES, IT, PT, PT-BR.
 2015-03-31 16:59:43 +02:00
Scott Lahteine 97a69d9b1c Correct XYZ after obtaining plan_bed_level_matrix 
The current position needs to be updated by using the inverse
`plan_bed_level_matrix` on X, Y, and Z. All moves in the planner are
transformed by the `plan_bed_level_matrix` from this point forward.
 2015-03-31 04:24:13 -07:00
Scott Lahteine 5f6962dd90 Merge pull request #1755 from thinkyhead/fixup_config 
Raise when not retracting
 2015-03-31 03:47:01 -07:00
Scott Lahteine ae89ccd2c7 Use Z_RAISE_BETWEEN_PROBINGS 2015-03-31 03:45:21 -07:00
Scott Lahteine 9a5a7a3f68 Raise when not retracting 
Code to raise the probe before retraction is good, but the code should
always raise the probe, not just when retracting
 2015-03-31 03:38:03 -07:00
Scott Lahteine 2a45922afe Restore extruder_offset, init more simply 2015-03-31 02:49:47 -07:00
Scott Lahteine 28792e5731 Fix typo in assignment 2015-03-31 02:10:49 -07:00
Scott Lahteine bb6174524f Fix EXTRUDER_OFFSET compiler error 
- Addressing issue #1741
 2015-03-31 02:08:57 -07:00
Chris Roadfeldt 45ece5afb1 Merge remote-tracking branch 'MarlinFirmware/Development' into Development 2015-03-31 03:07:57 -05:00
Chris Roadfeldt 17707e7479 Fixed Z_PROBE_PIN pullup bug. 
Documented some additional areas that should be addressed if Z_PROBE is
fully separated from Z_MIN or Z_MAX.
Fixed a documentation error in sanity checks. Servos start at 0 not 1.
 2015-03-31 02:56:41 -05:00
Scott Lahteine 50145266cd Merge pull request #1748 from thinkyhead/raise_before_homing 
Apply Z_RAISE_BEFORE_HOMING before homing XY
 2015-03-30 23:37:41 -07:00
Scott Lahteine a117b6bff6 Merge pull request #1747 from thinkyhead/progress_bar_tweak 
Fix up LCD_PROGRESS_BAR
 2015-03-30 23:37:28 -07:00
Chris Roadfeldt faac2af4af Merge remote-tracking branch 'origin/Development' into Development 2015-03-31 00:03:07 -05:00
Chris Roadfeldt 3be00cce6f Merge remote-tracking branch 'MarlinFirmware/Development' into Development 
Conflicts:
	Marlin/Configuration.h
 2015-03-30 23:59:01 -05:00
Chris Roadfeldt e08f8eed05 Revert 06f767d..cba5692 
This rolls back to commit 06f767d608.
 2015-03-30 23:51:36 -05:00
Chris Roadfeldt 992b07ca57 Don't disable Z_RAISE_BEFORE_HOMING when Z_PROBE_AND_ENDSTOP is enabled. 2015-03-30 22:58:10 -05:00
Chris Roadfeldt cba5692673 Merge remote-tracking branch 'MarlinFirmware/Development' into Development 
Conflicts:
	Marlin/Marlin_main.cpp
	Marlin/stepper.cpp
 2015-03-30 22:33:05 -05:00
Scott Lahteine 8500c80b33 Apply Z_RAISE_BEFORE_HOMING before homing XY 2015-03-30 20:22:21 -07:00
Scott Lahteine 5519882eea Fix up LCD_PROGRESS_BAR 
- Some messages should not expire with `PROGRESS_MSG_EXPIRE`.
- Simplify conditional for progress bar with sanity checks.
- Rename `messageTick` to `expireStatusMillis` and make it the expire
time.
 2015-03-30 18:00:54 -07:00
Scott Lahteine 8c136a5ab5 Conditionals and comments for PS = 0 2015-03-30 16:50:05 -07:00
Scott Lahteine 2faed961ce Allow POWER_SUPPLY 0 for no power switch 2015-03-30 16:39:47 -07:00
Scott Lahteine baa6787393 Merge pull request #1740 from thinkyhead/fixup_homing 
Apply leveling for DELTA
 2015-03-30 15:45:33 -07:00
AnHardt 50a732360a Replace extrudemultiply by extruder_multiply[active_extruder] 
Fix for #1460.

Seems to work with only one extruder. Can't test this myself with more.
 2015-03-30 13:35:03 +02:00
Scott Lahteine 41d258697a Pass the z for after probing to retract_z_probe 
A `z_before` value is passed to probe_pt, but the `retract_z_probe`
function assumes that Z is 0, doesn’t add `current_position[Z_AXIS]` as
other cases do. This may be superfluous, so this is a test, and will be
reverted if it has no effect.
 2015-03-30 00:45:02 -07:00
croadfeldt 06f767d608 Merge remote-tracking branch 'upstream/development' into development 2015-03-30 02:10:49 -05:00
Scott Lahteine e96db1cd6c Make G29 shared function inline 2015-03-29 23:21:39 -07:00
Scott Lahteine d73b169de3 Apply leveling for DELTA, 
- Fix `prepare_move` function not calling `adjust_delta`
- Add more shorthand for plan_buffer_line.
- Fix wrong `federate` usage, assuming they are all mm/m
- Minor `stepper.cpp` cleanup
 2015-03-29 23:16:12 -07:00
Scott Lahteine ce44bee28b Small code reduction 2015-03-29 19:45:14 -07:00
Scott Lahteine 0213f7f016 Cleanup case for M666 2015-03-29 19:39:43 -07:00
Scott Lahteine 803425e12c Fix G29 E and M48 n 
- Users prefer `G29 E` to work like `M48 E` so fixed that
- `M48 n` replaced with `M48 P` (or `p`). `n` legacy support
- Shorten some strings to save precious bytes
- Smaller code for 3-point probing
 2015-03-29 18:56:09 -07:00
Scott Lahteine e8ae51bfe3 Fix G28 homing Y with X 
- Fixed a typo causing G28 to home incorrectly
- Added documentation to G28
- Added homeXYZ bools to neaten the code
- Added a note about home_offsets being questionable
 2015-03-29 18:06:59 -07:00
Chris Roadfeldt 62834a1c43 Don't deploy probe on Z Axis homing if Z_PROBE_AND_ENDSTOP is enabled, 
unless Z_SAFE_HOMING is.
 2015-03-29 03:55:41 -05:00
Chris Roadfeldt 08a7aa16c5 Don't deploy Z Probe on Z homing if Z_PROBE_AND_ENDSTOP is defined. 2015-03-29 03:21:48 -05:00
Chris Roadfeldt 324c14943b Bug fixes for Z_PROBE_AND_ENDSTOP. 
Code cleanup for Z_PROBE_AND_ENDSTOP.
Added Z_PROBE_PIN to pins_RAMPS_13.h
 2015-03-29 02:16:09 -05:00
Scott Lahteine afff968e88 ARRAY_BY_EXTRUDERS, shorthand to sync planner 
- Add some documentation to planner and stepper headers
- Patch up RAMBO pins with undefs
- Add `sync_plan_position` inline to set current XYZE
- Swap indices in `extruder_offset` to fix initialization values
 2015-03-28 20:33:21 -07:00
Scott Lahteine 2b0c25a091 Tweak G92 to call plan_set_position only once, yes? 2015-03-28 19:18:24 -07:00
Chris Roadfeldt 8b81f20c61 Filling in more places where Z_PROBE_PIN and Z_PROBE_AND_ENDSTOP need to 
be.
Added Sanity Check for it.
Added hook so it's enabled.
 2015-03-28 05:55:42 -05:00
Chris Roadfeldt fd823449ad Added serial message for Z Probe trigger. 2015-03-28 05:42:38 -05:00
Scott Lahteine b14be7235e Merge pull request #1585 from galexander1/strtod_e_fix 
Fix `code_value` (so `G1X1E2` isn't evaluated as `G1 X100 E2`)
 2015-03-27 20:49:03 -07:00
Scott Lahteine ba871e46bf Fix compiler warnings 
- Patched up for most included configurations
 2015-03-27 20:29:05 -07:00
Scott Lahteine ffe0df4b36 Latest upstream commits 2015-03-27 18:30:56 -07:00
Scott Lahteine 578f93bc26 Fixup temp arrays and leveling equation, prepare for merge 2015-03-27 16:20:23 -07:00
Scott Lahteine 460f73056b Fix ECHOPAIR ambiguity 
- Also patch up some warnings
 2015-03-27 00:46:39 -07:00
Scott Lahteine 19d418cd6a Fix up the code to eliminate warnings 2015-03-27 00:32:58 -07:00
Scott Lahteine 267d6bef15 Eliminate most warnings 
- Fix a bug reading `code_value` for `M503 Sn`
- Hide and remove unused variables
 2015-03-26 20:07:17 -07:00
Scott Lahteine b76a352d41 Fix the planeNormal calculation 2015-03-26 17:14:07 -07:00
Scott Lahteine 0b32431551 Remove abs() from planeNormal.z 2015-03-26 16:20:23 -07:00
Scott Lahteine 06eb7f5b3c Latest upstream commits 2015-03-26 15:30:51 -07:00
Scott Lahteine 04328d7537 Add zprobe_zoffset in set_bed_level_equation_* 
- Also a small tweak to SanityCheck.h
 2015-03-26 15:29:16 -07:00
AnHardt ebe5b87c2c < like in the oher compareble loops 
to avoid:
Marlin_main.cpp:1790: warning: array subscript is above array bounds.
 2015-03-26 21:18:19 +01:00
Scott Lahteine fbf9b21e0c Merge plus fixup zprobe_zoffset 
- Make `zprobe_zoffset` conditional
- Fix ConfigurationStore for `zprobe_zoffset`
 2015-03-25 21:14:00 -07:00
Scott Lahteine 96b5da7198 Fix up bed leveling code 
- Init `zprobe_zoffset`
- Remove `current_position[Z_AXIS] = zprobe_zoffset` lines from the
`set_bed_level_equation_*` functions
- Apply standards to `mesh_bed_leveling` files
- Document `MESH_BED_LEVELING`
 2015-03-25 20:36:24 -07:00
Victor Torre d43d47da14 Clean "fromsd" array is not SDSUPPORT 
if not have SDSUPPORT the fromsd array is not necessary
 2015-03-25 22:05:18 +01:00
alexborro 55025558dc Implement Dry-Run mode in G29 
It just probe all the bed without appliying the matrix.
Useful after a first G29 to check the topology.
 2015-03-25 11:12:30 -03:00
alexborro c2ba5d0c09 Fix ZigZag and Topograph table 
ZigZag: Inverted Behavior.. If T supplied, it does not zigzag.
Topograph table: The table was rotated 90º clockwise.
 2015-03-24 15:50:31 -03:00
alexborro 0ce3576685 New Feature: Z_DUAL_ENDSTOPS 
Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z
steppers - Let's call them Z stepper and Z2 stepper.
That way the machine is capable to align the bed during home, since both
Z steppers are homed.
There is also an implementation of M666 (software endstops adjustment)
to this feature.
After Z homing, this adjustment is applied to just one of the steppers
in order to align the bed.
One just need to home the Z axis and measure the distance difference
between both Z axis and apply the math: Z adjust = Z - Z2.
If the Z stepper axis is closer to the bed, the measure Z > Z2 (yes, it
is.. think about it) and the Z adjust would be positive.
Play a little bit with small adjustments (0.5mm) and check the
behaviour.
The M119 (endstops report) will start reporting the Z2 Endstop as well.
 2015-03-24 14:06:44 -03:00
Scott Lahteine 0d81abe1c9 Merge branch 'Development' into config_testing 
Latest upstream commits
 2015-03-23 21:13:04 -07:00
Scott Lahteine b26a3ea02c Merge pull request #1662 from josla972/refactor_scara 
Refactor SCARA calibration. Save some lines of code and possibly ROM.
 2015-03-23 00:51:18 -07:00
Scott Lahteine 4fbb80567e Get upstream commits 2015-03-22 23:07:22 -07:00
Scott Lahteine 146501215f Fix mangled probe_pt calls 
- Address issue #1669
- Remove the TOPO_ORIGIN configuration setting
 2015-03-22 21:45:20 -07:00
maverikou 15345cc249 Corrected Z_PROBE_ALLEN_KEY behaviour. 2015-03-22 13:54:51 +02:00
maverikou 0f034dd97e Clean up Z_RAISE_AFTER_PROBING to work the same in all code paths except Z_PROBE_SLED. 2015-03-22 13:54:45 +02:00
maverikou 6c96f32069 Blind fix for #1507 2015-03-22 13:54:21 +02:00
Josef Larsson 379348487e Removed malplaced comment. 2015-03-22 12:21:31 +01:00
Josef Larsson 9b3462f73f Refactor SCARA calibration. Save some lines of code and possibly ROM. 2015-03-22 00:37:24 +01:00
Scott Lahteine 691e753cc3 Don't add home offsets in G29 
- Address #1262 by leaving values as set
- Rename `add_homing` to `home_offset`
 2015-03-21 16:30:02 -07:00
Scott Lahteine 15eb5d35a2 Merge branch 'Development' into config_testing 
Latest upstream commits
 2015-03-21 15:42:45 -07:00
Edward Patel 3d0a060a7a Added G29 command 2015-03-21 14:50:47 +01:00
Scott Lahteine 63d5d28085 Merge branch 'Development' into config_testing 
Latest upstream changes
 2015-03-20 04:15:18 -07:00
Edward Patel 4619d80524 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 2015-03-20 11:45:06 +01:00
Scott Lahteine 2424713a8f Merge pull request #1640 from AnHardt/warning6 
codepos not used in gcode_M28()
 2015-03-20 02:58:00 -07:00
Scott Lahteine 670006b919 Remove invariant code from Configurations 
- Add `Conditionals.h` with calculated configuration values
- Add `SanityCheck.h` with checks for configuration errors
- Remove equivalent code from all configurations
- Move error checks from some sources to `SanityCheck.h` also
- Fix initialization of count_direction in stepper.cpp
 2015-03-19 22:22:23 -07:00
Edward Patel a61f679568 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 2015-03-20 02:28:35 +01:00
Edward Patel c87faa69ed Shortened mesh_plan_buffer_line() 2015-03-20 02:18:49 +01:00
AnHardt ae01a6b5f2 Make use of codepos. 
Saves one addition.
Needs one pointer on the stack.

Don't know if this is a go trade.
 2015-03-19 09:45:16 +01:00
Scott Lahteine 80e0ee10ca Merge pull request #1631 from AnHardt/iss1593 
Decrease KILL_DELAY
 2015-03-18 19:10:38 -07:00
Scott Lahteine 76127b8a55 Merge pull request #1630 from Wurstnase/fix_g29 
optional parameters must be named when ignoring order
 2015-03-18 19:09:40 -07:00
Scott Lahteine 8664c6d465 Merge pull request #1638 from AnHardt/warning4 
delta[3] not used when DELTA not defined.
 2015-03-18 19:07:55 -07:00
Scott Lahteine 10711ccc6a Merge pull request #1639 from AnHardt/warning5 
G4 could wait for an undefined time
 2015-03-18 19:07:14 -07:00
Edward Patel 240b5cfe04 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 2015-03-18 19:19:46 +01:00
alexborro 4521f6655b Restore "S" parameter of M204 for retrocompatibility. 2015-03-18 12:19:30 -03:00
alexborro 5ddb8d94e2 Update Documentation related to M204 2015-03-18 11:09:10 -03:00
AnHardt f8c4d43886 delta[3] is used with SCARA 
Shoot in the dark.
 2015-03-18 12:14:49 +01:00
AnHardt 72a9fed4fb codepos not used in gcode_M28() 
Got:
Marlin_main.cpp:2567: warning: unused variable 'codepos'

Needs revision.
Don't now how this should look like.
 2015-03-18 11:41:14 +01:00
AnHardt b94dd33641 G4 could wait for an undefined time 
Got:
Marlin_main.cpp:1689: warning: 'codenum' may be used uninitialized in this function

And indeed codenum is undefined when no parameter is given.
 2015-03-18 11:23:41 +01:00
AnHardt e90985a4e8 delta[3] not used when DELTA not defined. 
got:
Marlin_main.cpp:387: warning: 'delta' defined but not used

Compiles cleaner when definition is removed.
 2015-03-18 11:11:49 +01:00
AnHardt d1658eebfc Decrease KILL_DELAY 
Users hat to press kill-button for unexpexted lon times.
See #1593
 2015-03-18 01:45:42 +01:00
Wurstnase 00adb2a6c1 optional parameters must be named when ignoring order 2015-03-18 01:02:29 +01:00
Edward Patel 0d43898a22 Remove of mesh_plan_buffer_line parameter reference (e) 2015-03-17 22:55:29 +01:00
Edward Patel 8067a985ce Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 
Fixed conflicts:
	Marlin/planner.h
 2015-03-17 22:48:08 +01:00
maverikou 3570447ded Fix Z_RAISE_AFTER_PROBING 2015-03-16 08:35:49 +02:00
maverikou 8a739b6fba Merge branch 'Development' into delta_auto_bed_level 
Conflicts:
	Marlin/Marlin_main.cpp
 2015-03-16 08:24:26 +02:00
Scott Lahteine a686c9878f Move TOPO_ORIGIN define to Configuration.h 
- Addressing issue #1608
 2015-03-15 15:49:36 -07:00
Edward Patel 8005d22c81 Added menu option for bed leveling. 2015-03-15 23:24:32 +01:00
Edward Patel 0e51e53813 WIP. Adding bed leveling code. 2015-03-15 23:24:32 +01:00
Scott Lahteine 7bc77dc134 Merge pull request #1583 from galexander1/m404fix 
M404 should not use 'N' address as parameter because 'N' is reserved
 2015-03-15 07:47:30 -07:00
Scott Lahteine b80ed51fcc Fix controllerFan() code 
- Add support for 4th extruder
- Fix parentheses matching
- Apply coding standards
- Address issue mentioned at #1575
 2015-03-15 06:55:31 -07:00
Scott Lahteine bb4cb1b15a Merge pull request #1606 from thinkyhead/cleanup_stepper 
Cleanup of stepper.cpp
 2015-03-15 06:05:08 -07:00
alexborro d3259d0dba Merge pull request #1581 from msutas/Development 
Filament Runout Sensor Feature
 2015-03-14 18:35:20 -03:00
Scott Lahteine c37f7d15c9 - Rename WRITE_E_STEP for consistency 
- Add BIT and TEST macros
- Add _APPLY_ macros to stepper.cpp to help with consolidation
- Consolidate code in stepper.cpp using macros
- Apply standards in stepper.cpp
- Use >= 0 instead of > -1 as a better semantic
- Replace DUAL_Y_CARRIAGE with Y_DUAL_STEPPER_DRIVERS
 2015-03-14 04:28:22 -07:00
alexborro 2f3c77b751 Fix decimal places in G29 Bed Equation Coeficients 2015-03-13 14:39:41 -03:00
Scott Lahteine e4d77a6313 Merge pull request #1554 from 2PrintBeta/Development 
Macro indirection for stepper drivers + Support for TMC26X and L6470 Stepper Drivers
 2015-03-11 15:31:57 -07:00
Mehmet Sutas b373826428 Merge pull request #2 from MarlinFirmware/Development 
update
 2015-03-12 00:07:39 +02:00
alexborro 9157cbd8f3 Add Travel Acceleration and change the M204 options 
Added option to set Travel Acceleration (non printing moves).
The M204 options was a non sense (S for printing moves and T for retract
moves).

It has been changed to:
P = Printing moves
R = Retract only (no X, Y, Z) moves
T = Travel (non
printing) moves

I will add this info o G-Code wiki in reprap.org. I also advise to put
this info in Marlin next version changelog.
 2015-03-11 13:19:02 -03:00
alexborro 888cf161bd fix travel speed option for G29 
I forgot to enclousure the variable with #ifdef
 2015-03-11 10:03:32 -03:00
alexborro af63b54562 Add travel speed option to G29 command line 2015-03-11 09:51:56 -03:00
alexborro 60ceca1bc1 Add speed configuration for home-bumping movement 2015-03-10 14:08:32 -03:00
domonoky d813090d90 Merge remote-tracking branch 'remotes/upstream/Development' into Development 
Conflicts:
	Marlin/Marlin_main.cpp
	Marlin/stepper.cpp
 2015-03-10 10:46:37 +01:00
Scott Lahteine c321c97f35 Merge pull request #1584 from galexander1/stringcleanup 
fix a handful of cases where strtod() was cast to int, instead of just using strtol()
 2015-03-10 01:48:30 -07:00
maverikou 53abc5e2f1 Merge branch 'Development' into delta_auto_bed_level 2015-03-09 22:28:57 +02:00
Mehmet Sutas 956fb2d278 Merge pull request #1 from MarlinFirmware/Development 
update
 2015-03-09 11:05:49 +02:00
Scott Lahteine 624f23f550 Merge pull request #1575 from Wurstnase/fix-controllerFan 
Fix controller fan
 2015-03-08 20:36:38 -07:00
maverikou 424c747fb3 Enable M401 and M402 for deltas with allen key z-probes. 2015-03-08 09:57:38 +02:00
maverikou 0d593ab7c1 Fix debug message 2015-03-08 09:41:31 +02:00
Greg Alexander 3e8c5678f5 fix bug where, i.e., "G1X1E1" would be interpretted as "G1 X10 E1", 
because strtod() will read the E address value as if it was a base 10
exponent.
 2015-03-07 21:14:34 -05:00
Greg Alexander ed7874b4e0 M404 should not use 'N' address as parameter because 'N' is reserved for the line number 2015-03-07 17:35:06 -05:00
Greg Alexander b9dfa5cad4 use code_value_long() instead of (int)code_value() 2015-03-07 17:33:15 -05:00
Greg Alexander 901b03d020 use strtol() instead of strtod() when an integer value is desired 2015-03-07 17:24:26 -05:00
Mehmet Sutas cfc6a3a87a Filament Runout Sensor Feature 
With this change a mechanical or optical switch may be used to check the
availability of the filament and when the filament runs out an M600
(filament change) command is issued. This is only done while printing
with an SD card.

This feature was requested several times (issue #679), but the requests
were not accepted since it was believed that this situation should be
handled at host side. However during an SD print the control is totally
on firmware and I think that during an SD print it should be handled by
the firmware.

The original code was posted at reprap forum
(http://forums.reprap.org/read.php?1,297350) by Lazymonk. I have only
corrected some bugs of the code and improved it by adding definitions to
the configuration.h in order to make it more standardized.
 2015-03-07 22:43:15 +02:00
maverikou 7c24b97958 Ported over Johann Rocholl's improvements for delta printers: 
- Nonlinear auto bed leveling code (includes G29, G30, Z_RAISE_AFTER_PROBING). Cleaned it up to be a delta-specific AUTO_BED_LEVELING_GRID code path.
- Allen key z-probe deployment and retraction code. Cleaned it up and added safety checks.
 2015-03-07 20:36:21 +02:00
Wurstnase a5342c942e Update Marlin_main.cpp 2015-03-07 16:47:53 +01:00
Scott Lahteine d085725c86 More sanity-checking for ABL 
- Moved sanity-checks to Marlin_main.cpp
- Applied to other configuration files
- Fixed formatting of ABL output
- Passing verbose level to probe_pt
- Miscellaneous cleanup
- Put CONFIG_STEPPERS_TOSHIBA into Configuration.h
 2015-03-06 22:14:34 -08:00
Scott Lahteine 254970c92a Merge pull request #1570 from C-o-r-E/escape_fix 
Fixes gCode handling of comments and escaped characters
 2015-03-06 15:09:35 -08:00
Scott Lahteine 25dc79f124 Remove M48 credits also 2015-03-06 14:54:30 -08:00
Scott Lahteine 34e51f576f Fix compile error in gcode_G29 
- A redo of #1576, which missed topo_flag
- Always set verbose_level
 2015-03-06 14:52:05 -08:00
Wurstnase 62bd734612 fix controllerFan() for inverted enable pins 
add ```^ !(n_ENABLE_ON)``` for each stepper
 2015-03-06 12:01:17 +01:00
Gina Häußge 63b62d8d4e Fixed in-line comments and escaping 
* "G1 X1 ; test" was not executing "G1 X1" due to never leaving comment mode.
  * "M117 Hello \;)" printed "Hello \" to the display due to not replacing serial_char properly.

Tested with the following commands:
    * M117 Hello ; test => displays "Hello" on display, ignores "test"
    * G1 X1 ; foo => moves 1mm in X, ignores "foo"
    * ; test => completely ignored, not even acknowledged
    * M117 Hello \;) => displays "Hello ;)" on display
    * M117 Hello \\;) => displays "Hello \" on display, ignores ")"
 2015-03-05 23:30:34 +01:00
C-o-r-E 99fb1bc3e8 Attempt to resolve #1568 and add basic escape character support 2015-03-05 15:22:37 -05:00
Scott Lahteine cdc38aa783 Move gcode handlers into inline functions 2015-03-05 04:27:24 -08:00
Scott Lahteine 6d9e9a6bef Merge branch 'Development' into enhanced_g29 
Latest upstream changes
 2015-03-05 02:49:18 -08:00
Scott Lahteine 4db2179f5c Include 4th extruder support 2015-03-05 02:37:36 -08:00
OhmEye f90a947e65 Fix autoretract 
Autoretract was broken, looks like it was overlooked when the retracted flag was updated for multi extruders.
 2015-03-04 20:28:08 -10:00
Scott Lahteine 2ef6b3d57a Fix wrong defines, broken syntax 2015-03-04 22:24:44 -08:00
Scott Lahteine 32744d41a9 Do sanity checking on LRFB values 
- Setting boundaries based on configured limits, contrasting with G28
(which forgets these limits?)
 2015-03-04 21:32:11 -08:00
domonoky 075507fb9a missed one X_ENABLE_PIN 2015-03-03 11:09:56 +01:00
Scott Lahteine dfb38874f8 Some suggested changes for #1555 2015-03-03 00:48:20 -08:00
Scott Lahteine 7f8ea7105f Arrange ProbeAction values bitwise 2015-03-02 20:14:37 -08:00
Scott Lahteine 7684721977 Enhanced G29 
- Adapted “Enhanced G29” code referred to in #1499 and posted at
[3dprintboard.com](http://3dprintboard.com/showthread.php?3105-Auto_Bed_
Leveling-Enhanced-G29-command)
- Compatible with current G29 while adding some new arguments
  - `V` sets the verbose level for serial out
  - `T` (or `V` > 2) send a Topology report to serial out
  - `E` works the same way as before
  - `P` works as before (source used `n` or `U`/`u`)
  - `L`, `R`, `B`, `F` work as before
- Still needs sanity checking for `LRBF`
 2015-03-02 20:00:17 -08:00
C-o-r-E 874d3d3fc5 Add support for solenoid articulated extruders 2015-03-02 20:07:12 -05:00
domonoky 4a7aca2736 Merge remote-tracking branch 'remotes/upstream/Development' into Development 2015-03-02 17:52:12 +01:00
Scott Lahteine e30bfedce4 Fix undefined *_PROBE_BED_POSITION error 2015-03-01 19:57:35 -08:00
alexborro 227ab8c665 Merge pull request #1503 from MarcelMo/patch-2 
Support for simple customisable AutoZProbing area
 2015-02-25 13:22:42 -03:00
Scott Lahteine c9a3eb0c1a Spacing in calculate_volumetric_multiplier(s) 2015-02-23 20:35:18 -08:00
Scott Lahteine 0cf0c20532 Optimize calculate_volumetric_multiplier 2015-02-23 18:10:35 -08:00
domonoky b55995aae8 Introduce a layer of macro indirection to all stepper pins. This allows other stepper drivers to redefine them, so they can use SPI/I2C instead of direct pin manipulation. 2015-02-23 16:12:35 +01:00
Scott Lahteine 08c236059e Merge pull request #1505 from thinkyhead/issue_1499 
Bed leveling probe behavior issue?
 2015-02-19 01:24:17 -08:00
MagoKimbra 159196d1e9 Reset Alert message when finish M600 command 2015-02-18 21:33:38 +01:00
Scott Lahteine 978d114c73 Bed leveling probe behavior issue? 
The `float` keyword should not be on these vars because they conceal
the outer vars, preventing them from obtaining known values before
being passed in `set_bed_level_equation_3pts`. Possibly related to
`Z_RAISE_BETWEEN_PROBING` not functioning.
 2015-02-15 20:51:27 -08:00
MarcelMo d28f5b9e82 Support for simple customisable AutoZProbing area 
When probing PCB´s I had the problem that i needed auto-leveling for specific areas (it´s never the same size).
Not much code, but very useful.
Now I use simply G29 L5 R55 F5 B35 P3 to probe a 4x6cm PCB before milling.
I used int for values... might be wrong...
I hope this time I got the right development tree. (tried first with https://github.com/MarlinFirmware/Marlin/pull/1130/commits)
 2015-02-15 15:58:29 +01:00
Scott Lahteine 7866fa161f Merge pull request #1476 from Natealus/Development 
Compiling errors with 4 Extruders defined and Viki 2 Implementation
 2015-02-12 16:56:55 -08:00
Jérémie FRANCOIS 9d75a56b56 Merge remote-tracking branch 'upstream/Development' into Development 
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
 2015-02-11 06:38:36 +01:00
Natealus 38a500d05c Viki 2 Implementation 
I've insert the define and pointer entries for the Viki 2 and miniViki
from Panucatt in all of the example configs and main config. With these
additions and with pins done in the old single pin.h style...I was able
to get the display working fine save for needing to turn Delta Segments
per Second down. But that's a common graphics lcd issue being looked
into right now.

I need assistance in understanding how the new divided pins files fit
together because my previous attempts at trying to get it to work
appropriately didn't seem successful. This originally came from trying
to find out how to swap the XYZ Min and Max Endstop pins in the Azteeg
X3 Pro. It only comes with one set of connectors and they're Min
Endstops. My previous experience didn't turn out well trying to tell the
firmware to home to the Min Endstops so the best solution I found was to
swap the pins in the firmware. If I'm missing a conflict with a setup
other than delta please let me know, but it makes sense in my setup.
 2015-02-08 03:14:59 -07:00
Jérémie FRANCOIS 85e5aa4011 Generalized enqueue_commands_P, and moved them to Marlin_main as they should 2015-02-07 23:24:20 +01:00
Scott Lahteine 0cb1029311 remove extra plan_buffer_line 2015-02-03 11:26:36 -08:00
Scott Lahteine b97a950f53 Apply fix for M600 filament change 
- Patch from #1453 for delta movement plan
- Fix: Set X with code X instead of adding to X
 2015-02-03 09:57:16 -08:00
Scott Lahteine 9dc5de6166 Hide code that makes veteran geeks go "aha!" 2015-02-02 05:55:55 -08:00
Scott Lahteine bd387068bb Apply loops for extruders elsewhere also 2015-02-02 05:27:27 -08:00
Scott Lahteine 4a146d584b Loop, since the pending feature can use an array 2015-02-02 05:16:17 -08:00
Scott Lahteine bca884bf72 Realized it's not a bug, but cleanup code anyway 2015-02-02 04:41:31 -08:00
Philip Schell fb7c636ecf Avoid compiling error 
Only a missing ","... now it will compile again
 2015-02-01 01:33:04 +01:00
Scott Lahteine 073c59c50a Clean up some formatting 
- Also partial cleanup of Marlin_main.cpp with a smidgen of Doxygen.
 2015-01-29 18:52:21 -08:00
Scott Lahteine 093fedfde8 Make EEPROM storage consistent 
Update ConfigurationStore to always write dummy values for disabled
options, including FWRETRACT, DELTA, and SCARA. Update the EEPROM
version to “V15.” Also fixes a buffer overrun with axis_scaling in
Config_ResetDefault.
 2015-01-28 01:08:48 -08:00
Jérémie FRANCOIS dd301be52d Added suport for multiline G-code commands in the LCD menus 2015-01-26 18:50:29 +01:00
AnHardt 59315330dd Remove definition of VERSION_STRING and replace where usend with STRING_VERSION 2015-01-26 15:52:01 +01:00
MagoKimbra 986e723eeb Add 4th extruder 2015-01-24 13:37:58 +01:00
daid 53f971095d Revert "Reduce PROGMEM warnings" 2015-01-16 16:48:22 +01:00
Bo Herrmannsen 5151db5c2f Merge pull request #1349 from msutas/patch-2 
Improvement - G29 Option for Not Retracting Servo
 2015-01-15 10:56:31 +01:00
Bo Herrmannsen ab074dac17 Merge pull request #1344 from grob6000/independent_pid 
Independent PID parameters for each extruder
 2015-01-13 12:10:37 +01:00
Bo Herrmannsen d4a665694a Merge pull request #1350 from odewdney/Development 
Reduce PROGMEM warnings
 2015-01-13 11:26:50 +01:00
msutas 3a5a6f42fb Corrected the ABL grid option 
G29 E was not retracting the probe on the last probe point when used with ABL grid. Corrected.
 2015-01-12 11:07:46 +02:00
odewdney 538859669d Removing compiler warnings for progmem 2015-01-11 18:14:21 +00:00
grob6000 bf2c923db5 Make multiple PID parameters a config option 
* Adds config parameter `PID_PARAMS_PER_EXTRUDER` - allows single PID
parameters to be used where this would be preferable (e.g. dual
identical extruders)
* When disabled, will use `float Kp, Ki, Kd, Kc;` as before.
Preprocessor macros used to switch between.
* ultralcd.cpp defines extra menus for extra parameters only where
required
* M301 reports `e:xx` only if independent pid parameters enabled
* EEPROM structure still leaves space for 3 extruders worth, when undef
will save single parameter to all extruder positions, but only read the
first
* Switching off saves approx 330 B with no LCD enabled, 2634B with LCD
(RRD) enabled: this is significant.
* LCD modifications should be tested.
 2015-01-11 13:50:17 +11:00
msutas e0beb98fd3 Improvement - G29 Option for Not Retracting Servo 
This change introduces an improvement to G29 command on Marlin.

Auto bed leveling operation's reliability is based on the repeatability of the Z-probe switch and the servo. This change introduces an option to G29 command. When the G29 command is sent with an "e" option, during auto bed levelling the servo is not retracted between probes which decreases the bias on auto bed levelling resulting from servo.

G29 command does the auto bed probing as it is.

G29 E command engages the servo on first probing point, probes all points and retracts the servo after probing the last point.

Please comment your opinions, test on your printer and check the code on a programmer's perspective. (I am not a good programmer.)
 2015-01-10 17:25:39 +02:00
grob6000 37c7e8300f Independent PID parameters for each extruder 
* Variables Kp, Ki, Kd, Kc now arrays of size EXTRUDERS
* M301 gains (optional, default=0) E parameter to define which
extruder's settings to modify. Tested, works with Repetier Host's EEPROM
config window, albeit only reads/updates settings for E0.
* All Kp, Ki, Kd, Kc parameters saved in EEPROM (version now v14), up to
3 extruders supported (same as Marlin in general)
 2015-01-10 16:35:12 +11:00
Erik van der Zalm 1aade4a8e2 Merge branch 'Development' of https://github.com/MarlinFirmware/Marlin into Development 2015-01-09 21:33:29 +01:00
Erik van der Zalm 8a2e84e3f1 Possible fix for FWRETRACT with 0 zlift. 2015-01-09 21:33:02 +01:00
Erik van der Zalm 3a30d45c2e Revert "issue 968 for dev branch" 2015-01-07 23:40:17 +01:00
Dan Royer 9472bbe51d issue 968 for dev branch 
try, try again.

If 'OK' is garbled on sending PC won't receive it.  Both machines will
wait on each other forever.  This resends OK if nothing is heard from PC
for a while to avoid this bad case.
 2015-01-04 12:17:46 -08:00
Bo Herrmannsen a18b625534 Merge pull request #1261 from wgm4321/Development 
Add Filament menu and add Filament/Retract settings to config store.
 2015-01-02 15:35:29 +01:00
bkubicek d02daec08f fixed compilation 2014-12-30 08:04:06 +01:00
Bernhard Kubicek f24c5d82e3 Update Marlin_main.cpp 
fixed minor typo
 2014-12-29 17:17:30 +01:00
Wurstnase 8a6f098cc6 Expand manage_inactivity #1264 
void manage_inactivity(bool ignore_stepper_queue=false)

standard is false so it is not necessary to change additional code. this
change should be better, hopefully nophead like this :)
 2014-12-29 17:07:22 +01:00
Wurstnase d1995aec7a Rename ignore_blocks_queued 
more speaking name
 2014-12-29 16:47:08 +01:00
Wurstnase 4122de9d17 change filament issue 
make a more general solution
 2014-12-29 16:31:00 +01:00
wgm4321 cb12161191 Add Filament menu and add Filament/Retract settings to config store. 2014-12-28 20:43:14 -05:00
fmalpartida ec33df0554 Merge branch 'SAV-MkI_merge' into Development 
Tested for SAV MKI and SAV 3D LCD on lewihe.
 2014-12-28 19:54:06 +01:00
alexborro 3afe66bb0c Fix issues #1248, #1240 
- Fixed issue when BAL area probing is shorter than it should be for
grid probing
- Warning when BAL activated with Delta Kinematics
- Fix XY_TRAVEL_SPEED when homing Z axis
 2014-12-28 13:27:39 -02:00
Lukas Obermann 9eb6df17a7 Consider negative Z Offsets when auto bed leveling is active 2014-12-28 12:46:35 +01:00
Denis Chertykov 050ca9ca13 Move initialization of errormagic[] and echomagic[] to Marlin_main.cpp 2014-12-28 09:09:42 +03:00
alexborro d74aabf259 Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation" 2014-12-21 10:06:05 -02:00
Bo Herrmannsen 60628864ca Merge pull request #1167 from thinkyhead/sd_freemem 
Use SdFatUtil::FreeRam() for freeMemory() if there
 2014-12-20 18:31:21 +01:00
Bo Herrmannsen 889d7ba218 Merge pull request #1177 from martin-pr/probing_z_speed 
Split do_blocking_move() to XY and Z sections
 2014-12-20 18:30:35 +01:00
Bo Herrmannsen 5e7bd2dc87 Merge pull request #1200 from chertykov/Marlin_v1 
Fix syntax errors in #ifdef
 2014-12-20 18:29:39 +01:00
Denis Chertykov b086394178 Fix syntax errors in #ifdef. 2014-12-20 19:33:43 +03:00
John Davis 4315c2547a Update Marlin_main.cpp 
Changed level and leveling to compensation (except with "verbose_level" and "lcd_reset_alert_level").
 2014-12-19 17:41:29 -05:00
Bo Herrmannsen 03e489aaad Merge pull request #1197 from foosel/fix/issue_1147 
Fixes commands not being acknowledged in the same order they are received in
 2014-12-19 14:39:05 +01:00
Gina Häußge acc0e75279 Fixes commands not being acknowledged in the same order they are received 
in

G0 to G3 were previously acknowledged in the get_command method, causing
them to be possibly acknowledged before commands coming after them that
were acknowledged in process_commands.

This patch fixes this, moving the acknowledgement of G0 to G3 to the
process_commands method as well. These commands are therefore no
longer acknowledged when the enter the cmd_buffer but instead only
acknowledged when the enter the plan_buffer.

Guaranteeing that commands are acknowledged in the same order in which
they were received by the firmware allows host software to be able to
track the life cycle of commands and such a better management of the
firmware's serial buffers as well as better internal command processing
and response parsing without having to depend on throwing an epic
amount of regular expressions against each line received back from the
firmware.

Fixes ErikZalm/Marlin#1147
 2014-12-19 14:20:36 +01:00
Scott Lahteine 07c6b5ab71 Using axis constants 2014-12-18 08:13:08 -08:00
Scott Lahteine 0450e83fa5 Use SdFatUtil::FreeRam() for freeMemory() if there 2014-12-17 23:26:52 -08:00
Scott Lahteine 60598b4cdd A few constants where they belong 2014-12-17 23:01:24 -08:00
Martin Prazak 2ef0669b19 Split do_blocking_move() to XY and Z sections to make sure that the Z homing feedrate is not exceeded 2014-12-07 15:31:46 +00:00
Neil Darlow 64139f5e5a Merge https://github.com/ErikZalm/Marlin into Marlin_v1 2014-12-04 21:09:03 +00:00
Scott Lahteine 7562183efc Skip over spaces first 2014-11-28 08:09:28 -08:00
Scott Lahteine 12b51d6060 Ignore S and P if no value >0 is included. 2014-11-26 21:05:11 -08:00
Scott Lahteine d12b24758a Clear LCD to welcome_msg if not printing 
The welcome message is more appropriate than “resuming print” if
nothing is printing.
 2014-11-26 21:05:11 -08:00
Scott Lahteine 92e21d3ee2 M0-M1 Enhancements 
Allow M0 and M1 to include a message string. Ignore clicks on “Wait for
user” so that the Info Screen stays up.
 2014-11-26 21:05:10 -08:00
Neil Darlow b81021f475 Merge https://github.com/ErikZalm/Marlin into Marlin_v1 2014-10-21 12:06:56 +01:00
Erik van der Zalm 058e446531 Merge pull request #1037 from filipmu/Filament-Sensor 
Support for a filament diameter sensor
 2014-10-11 22:56:01 +02:00
Erik van der Zalm b360306881 Merge pull request #1073 from WingTangWong/wing-fix-float-delta 
Wing fix float delta
 2014-10-06 13:41:01 +02:00
Scott Lahteine f989bd5435 Simple code cleanup. Rename "homeing" to homing. 2014-10-05 13:20:53 -07:00
Neil Darlow 6c5a460e65 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-10-05 12:54:54 +01:00
galexander1 cb4a6dd2dc Merge pull request #1065 from oliasmage/Marlin_v1 
Corrected retract() call for use of auto probe without sled enabled.
 2014-09-19 15:12:09 -04:00
Bracken Dawson 01e9b536cb Fix build for non-sled bed auto levelling 
This function should only be used with sled, not all bed auto
levelling.
 2014-09-19 19:42:32 +01:00
Wing Tang Wong 58eabd21fb Added ifndef 2014-09-16 14:31:58 -07:00
Wing Tang Wong 88d12a762a Added #ifndef DELTA wrapper to float delta 2014-09-16 14:29:44 -07:00
Charles Bell 3b8216bdd1 Corrected #endif and ifdef for Z_PROBE_SLED code. 2014-09-04 16:40:22 -04:00
Charles Bell 37799f70ba Corrected retract() call for use of auto probe without sled enabled. 2014-09-04 14:36:39 -04:00
Neil Darlow 1632e5e38a Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-09-04 12:21:35 +01:00
Erik van der Zalm 018b68a5c4 Merge pull request #976 from cocktailyogi/SCARA_by_Yogi 
Implemented SCARA-Maths
 2014-08-28 16:32:52 +02:00
Erik van der Zalm 9887555192 Merge pull request #998 from darconeous/pull-requests/fwretract 
FWRETRACT fixes
 2014-08-28 16:24:51 +02:00
Erik van der Zalm 68dd5e635e Merge pull request #1024 from oliasmage/Marlin_v1 
Adding Z Probe via sled mounted endstop
 2014-08-28 16:15:54 +02:00
Erik van der Zalm 25069ed4e9 Merge pull request #1031 from Roxy-3DPrintBoard/Z_PROBE_REPEATABILITY-with-correct-Defaults 
Z probe repeatability with correct defaults
 2014-08-28 16:14:10 +02:00
Filip Mulier 62db9848d3 Improvements and bug fixes in sensor delay buffer for filament sensor code 
Improvement to avoid reinitializing delay buffer with every print. Fixed
issues in buffer indexing and memory out of bounds due to floating point
imprecision.  Simplified the code by avoiding conversion to standard
diameter and 1cu mm extrusion, which caused complications in determining
mm extruded.
 2014-08-16 06:50:13 -05:00
Florian Baumann 5908fd5cec Fix reseting CHDK pin to LOW 
chdkActive was set to false regardless of (millis() - chdkHigh) being bigger than the CHDK_DELAY or not. So if (millis() - chdkHigh) wasn't bigger than the delay the first time, the CHDK would never be set back to LOW.

Also, don't return from the function, as there might be other stuff to do, after the CHDK check.
 2014-08-11 14:12:32 +02:00
Roxy-3DPrintBoard 0091865583 Z_PROBE_REPEATABILITY test 
Z_PROBE_REPEATABILITY test for Auto Bed Leveling.
Implemented as M48 with extra user specified options.
Full support at
http://3dprintboard.com/showthread.php?2802-Auto_Bed_Leveling-Z-Probe-Repeatability-code
 2014-08-09 15:37:23 -05:00
Filip Mulier 85649a4549 Real-time filament diameter measurement and control 
This feature allows the printer to read the filament diameter
automatically and adjust the printer in real time.  Added code to read
an analog voltage that represents a filament diameter measurement.  This
measurement is delayed in a ring buffer to compensate for sensors that
are a distance away from the extruder.  The measurement is used to
adjust the volumetric_multiplier for the extruder.  Some additional g
codes (M404, M405, M406, M407) are used to set parameters and turn
on/off the control. g code M221 is updated.  Pins for RAMPS1.4, RAMBO,
and Printrboard are identified for analog input.  The configuration file
is updated with relevant user parameters.
 2014-08-06 19:30:57 -05:00
Charles Bell d2fcb3ee56 CAB: Added code for Z-probe with Z endstop mounted on a sled. 2014-08-01 11:29:59 -04:00
Neil Darlow 3cd7dbcc45 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-07-30 13:01:52 +01:00
daid c13a831ea1 Merge pull request #1017 from foosel/fix/checksum_truncation_bug 
Fix for a wrong checksum truncation for certain commands
 2014-07-24 19:41:34 +02:00
Gina Häußge 2d22902d08 Fix for a wrong checksum truncation for certain commands 
Positioning of string terminator to truncate checksum from the commands
M23, M28, M30, M32, M928 and M117 was off by one, causing the last
letter of the actual command to be truncated instead of just the
checksum.

In case of the SD commands this caused checksummed commands targeting
existing files to fail since the last letter of the filename was
truncated.

In case of M117 this caused the last given letter not to be displayed.

This patch fixes the off-by-one error and sets the null terminator
on the exact position of the * starting the checksum instead of the
character before that.
 2014-07-24 12:04:02 +02:00