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

5277 commits

Author SHA1 Message Date
Rerouter 5f5d87cad3 Update Configuration.h 2016-10-02 07:01:40 -05:00
Scott Lahteine 761593b74b Cleanup some vars, use of min/max 2016-10-02 06:34:56 -05:00
Scott Lahteine d19cfcfc1d max_jerk array, DEFAULT_XYJERK => DEFAULT_[XY]JERK 2016-10-02 06:34:56 -05:00
Scott Lahteine e7dc174f30 More detailed debugging of G28 delta 2016-10-02 02:18:57 -05:00
Scott Lahteine 473f4a17a8 Merge pull request #4914 from Rerouter/PID-Unconstrained-Itemp 
Pid unconstrained itemp
 2016-10-01 06:58:07 -05:00
Scott Lahteine bad8899ebc Merge pull request #4900 from thinkyhead/rc_g38_changes 
Cleanup of G38.2 / G38.3
 2016-10-01 06:57:17 -05:00
Scott Lahteine 73ce3a61c7 Cleanup, comment zigzag 2016-10-01 05:21:52 -05:00
Scott Lahteine 0d538f3db6 Add to all configurations 2016-10-01 05:00:53 -05:00
Scott Lahteine 919fe3e4b8 Rename feature to G38_PROBE_TARGET 2016-10-01 05:00:53 -05:00
Scott Lahteine a2864ab7fe Patched up, cleaned up 2016-10-01 05:00:53 -05:00
Bob-the-Kuhn 2911aa7ffa code changes to implement G38 commands 
1) modified 3 code files
Marlin.h
Marlin_main.cpp
endstops.cpp

2) modified config files so I could test on my machine

Testing was done on an AzteegX3pro based machine.

The probe was hooked to the Z_MIN endstop.

My controller doesn't have a dedicated Z_PROBE input so I couldn't test
that functionality.

Verified that a large file (without any G38 commands) executed the same
before and after the changes.

Verified that the head moves as expected when G38.2 and G38.3 commands
are issued. Single & multiple axis moves were tested along with + and -
directions.

Code was added to the main ISR. In normal operation only one extra IF
statement is evaluated. I didn't notice any performance degradation
because of the added code.

The G38 commands are expected to be issued manually by the operator
during machine setup. The G38 commands wait until the machine is idle
before proceeding. That way the other commands are minimally impacted
by the extra ISR overhead when a G38 command is in the queue.

The G38 commands are very similar to the G28 commands except 1) only the
Z_PROBE is used and movement can be in the + or - direction.

See issue 4677 for a discussion on adding G38 commands to Marlin.
Feature request: add ability to use G38.2 command (CNC)
MarlinFirmware/Marlin#4677
 2016-10-01 05:00:53 -05:00
Scott Lahteine 74d048e77e Merge pull request #4927 from thinkyhead/rc_bltouch_noraise 
Don't check Z_MAX on raise when the probe pwns the pin
 2016-10-01 04:52:56 -05:00
Scott Lahteine 4afa293289 Say "BLTOUCH" in machine info report 2016-09-30 17:13:27 -05:00
Scott Lahteine ed7d2694fc Don't check Z_MAX on raise when the probe pwns the pin 2016-09-30 16:41:30 -05:00
Scott Lahteine 3bbdd48a4d Merge pull request #4918 from thinkyhead/rc_abl_patchups 
Fix up ABL - Add PROBE_Y_FIRST option. Arduino 1.6.8 required.
 2016-09-29 15:29:01 -05:00
Scott Lahteine fffc9fefa8 Apply changes to all configs 2016-09-29 02:17:33 -05:00
Scott Lahteine 587cb6c283 K8400 has 1xXY an 2xZ endstop plugs 2016-09-29 02:07:22 -05:00
Scott Lahteine d234bc160e Require Arduino 1.6.8 to compile 2016-09-29 02:00:27 -05:00
Scott Lahteine 2d2c9bdf92 Add PROBE_Y_FIRST option for probe order 2016-09-29 02:00:27 -05:00
Scott Lahteine c8c57e59fc Patch the end of G29 to sync plan position 2016-09-29 02:00:27 -05:00
Scott Lahteine 81b8c9f8ec Add XY parameters to G29 for mesh dimensions 2016-09-29 02:00:27 -05:00
Scott Lahteine 56cf674150 M420 can now enable/disable ABL 2016-09-29 02:00:26 -05:00
Scott Lahteine 06790977c4 Use updated position methods 2016-09-29 01:31:05 -05:00
Scott Lahteine e8f2604a6f Patch print_bed_level numbering 2016-09-29 01:31:05 -05:00
Scott Lahteine d066610514 Patch up bilinear_z_offset 2016-09-29 01:31:05 -05:00
Scott Lahteine 850e38d013 G30 will only disable bed leveling 2016-09-29 01:31:04 -05:00
Scott Lahteine 510ef5d14a Standard function to turn bed leveling on/off 2016-09-29 01:27:37 -05:00
Scott Lahteine ecf7cdde65 Augment planner/stepper getters/setters 2016-09-29 01:27:37 -05:00
Scott Lahteine 2febd8ec82 Double-touch debugging 2016-09-29 01:27:37 -05:00
Scott Lahteine b331077c32 Use stepper.get_axis_position_degrees 2016-09-29 01:27:37 -05:00
Scott Lahteine 0d9efb24f3 Fix up bilinear_z_offset 2016-09-29 01:26:22 -05:00
jaysonkelly 3b3d282f8e Adjusted values for Rigidboard Configuration 
Rigidboard differs a little in configuration from the PrinterBoardRevF we modeled the code after.
 2016-09-28 14:14:04 -05:00
Scott Lahteine 850259bb25 Watch bed temp also for Control menu item 2016-09-28 14:14:04 -05:00
esenapaj 92c03a44a9 Fix the PR #4899 (ABL: Enable by type. Bilinear for all.) etc. 
About Configuration.h:
・Fix the PR #4899 (ABL: Enable by type. Bilinear for all.)
Remove Duplicated contents

・Fix the PR #4305 (Custom boot screen feature improvement)
Revert from "during boot" to "during bootup" in all the example
Configuration.h

・Fix the PR #4207 (Clean up, simplify and generalize the Allen-key-probe
code.)
Resolve and relocate the duplicated definitions in Z_PROBE_ALLEN_KEY
section

・Follow-up the PR #4805 (Additional documentation of Configuration.h)
Add forgotten changes to all the example Configuration.h

Adjust spacing

About Configuration_adv.h:
Add missing description of SLOWDOWN for DELTA

Adjust spacing
 2016-09-28 14:14:04 -05:00
Rerouter 50e5ee4de4 Update Configuration.h 2016-09-28 17:38:09 +10:00
Rerouter 1a2f1d4974 Update temperature.cpp 2016-09-28 17:36:53 +10:00
Rerouter a765c98850 Removal of the constraints of the Iterm 2016-09-28 17:26:49 +10:00
Scott Lahteine 8b46eb3766 Fix bilinear interpolation 2016-09-27 03:18:49 -05:00
Scott Lahteine 5100bdac81 Improve Bilinear Grid 
- Extrapolate properly for even numbered grid points
- Extrapolate using average, not median
- Improve bilinear grid report output
- Add debug output for bilinear extrapolation
- Add option to extrapolate from edge, not center
 2016-09-27 00:03:19 -05:00
Scott Lahteine a3e91ec65e Add 'Q' option to G29 when debug leveling is on 2016-09-27 00:03:19 -05:00
Scott Lahteine 1fceda4fb0 Add leveling type and details to machine_info 2016-09-27 00:03:19 -05:00
Scott Lahteine e0e0166075 Fix auto bed leveling - turn on after successful G29 2016-09-27 00:03:19 -05:00
Scott Lahteine 18e40de39c Adjust final Z after bilinear G29 2016-09-26 00:22:22 -05:00
Scott Lahteine ea0dbee3c9 Enable ABL by type, support bilinear on cartesian 2016-09-25 23:35:37 -05:00
Scott Lahteine 9cebbabd05 Merge pull request #4893 from thinkyhead/rc_stat_led_check 
Define status LED pins without condition
 2016-09-25 18:50:47 -05:00
Scott Lahteine 5fff8d148b Clean up digital pots and microsteps 2016-09-25 11:16:22 -05:00
Scott Lahteine 570676d265 Include requirements in "Implemented Codes" 2016-09-25 07:50:33 -05:00
Scott Lahteine cb48292338 Use fastio for literal pins 2016-09-25 06:33:38 -05:00
Scott Lahteine 07703d2bd6 Use _PIN suffix on some pins 2016-09-25 06:33:38 -05:00
Scott Lahteine 203e519bf4 Sanity check for status LED pins 2016-09-25 06:33:38 -05:00
Scott Lahteine ba43277429 Always define status LED pins 2016-09-25 06:33:37 -05:00
Scott Lahteine ad691022d7 Fix up spacing in A4JP pins 2016-09-25 06:33:37 -05:00
Scott Lahteine fba0b67f7d Rename status led pins 2016-09-25 06:33:37 -05:00
Scott Lahteine 9d86c07702 Clean up some fastio.h spacing 2016-09-25 06:33:37 -05:00
Scott Lahteine 041d127cd3 Match bltouch test in do_homing_move with new code 2016-09-24 23:58:08 -05:00
Scott Lahteine 16461900c2 Fix for HEATERS_PARALLEL 2016-09-24 05:34:40 -05:00
Scott Lahteine 1583d37edd Comment on M851 case 2016-09-24 05:34:36 -05:00
Scott Lahteine 076f3a8284 unsigned char => uint8_t 2016-09-24 05:23:40 -05:00
Scott Lahteine 8935bed594 MIDDLE_DEAD_ZONE => MIDDLE_DEAD_ZONE_R 2016-09-24 05:18:36 -05:00
Scott Lahteine 6cf0952bf9 Merge pull request #4887 from thinkyhead/rc_autumn_fixups 
Improve MINIMUM_STEPPER_PULSE
 2016-09-24 03:23:42 -05:00
Scott Lahteine 8061f1fac9 Merge pull request #4888 from thinkyhead/fix_warnings_etc 
Suppress warnings, fix nonlinear_z_offset
 2016-09-24 03:22:49 -05:00
esenapaj 7bdc58a818 Suppress warnings, fix nonlinear_z_offset 2016-09-24 03:06:08 -05:00
Scott Lahteine eabff30e75 Improve MINIMUM_STEPPER_PULSE 2016-09-24 02:23:43 -05:00
esenapaj 3ed8f8331c Update Japanese translation 
・Add new translation
 2016-09-24 09:24:38 +09:00
Scott Lahteine da1644313d Merge pull request #4883 from esenapaj/Follow-up-the-PR-#4860 
Follow-up the PR #4860 (Fix BLTOUCH string and SERVO_DELAY)
 2016-09-23 16:39:37 -05:00
Scott Lahteine 903b8bb60c No need for auto_bed_leveling_was_enabled 2016-09-23 16:38:22 -05:00
esenapaj ee60225c07 Follow-up the PR #4860 (Fix BLTOUCH string and SERVO_DELAY) 2016-09-24 06:18:27 +09:00
Scott Lahteine 0951bffcc0 Sanity check homing bumps 2016-09-23 15:39:02 -05:00
Scott Lahteine a9a21db39f No homing bump if bump distance is 0 (or less) 2016-09-23 15:39:02 -05:00
Scott Lahteine 2b4da57ea7 Patch Z safe homing for probe Z homing 2016-09-23 15:39:02 -05:00
Scott Lahteine c6dd539c84 Print error for M42 bad pin 2016-09-23 15:39:02 -05:00
Scott Lahteine 8b399610fb Skip raw moves to current position 2016-09-23 15:39:02 -05:00
Scott Lahteine 22ece0081e Pass array pointer to unapply_leveling 2016-09-23 15:39:01 -05:00
Scott Lahteine cbc158eb62 Add a proper flag for ABL enabled 2016-09-23 15:39:01 -05:00
Scott Lahteine 666e944336 Init xProbe/yProbe for compiler 2016-09-23 15:39:01 -05:00
Scott Lahteine 2c52e6ecf4 Clean up G28 MBL code 2016-09-23 15:39:01 -05:00
Scott Lahteine 0bf1054bb2 Patch do_homing_move for SCARA 2016-09-23 15:39:00 -05:00
Scott Lahteine 6ad0da661c Report position in G92 2016-09-23 15:39:00 -05:00
Scott Lahteine 199a7b5dd5 Tweak SCARA debugging 2016-09-23 15:39:00 -05:00
Scott Lahteine 865ad25781 Fix prepare_kinematic_move_to precision 2016-09-23 15:39:00 -05:00
Scott Lahteine 85e607153b Improve kinematic optimization options 2016-09-23 03:03:15 -05:00
Scott Lahteine 2846531f0b const argument in do_homing_move 2016-09-23 03:03:15 -05:00
Scott Lahteine cc639d7d9c Less indentation in Stepper::isr 2016-09-23 03:03:14 -05:00
Scott Lahteine 7dec8071b2 Always synchronize in Stepper::set_position 2016-09-23 03:03:14 -05:00
Scott Lahteine c6142aa2a1 Minor cleanups in Marlin_main.cpp 2016-09-23 03:03:14 -05:00
Scott Lahteine 0427f3cc3b Use memcpy/memset in planner 2016-09-23 03:03:14 -05:00
Scott Lahteine 6b9bf8e8fe Add Planner::sync_from_steppers 
Use to sync the planner after an interrupted move (when not overriding
the logical position).
 2016-09-23 03:03:14 -05:00
Scott Lahteine be11a8a938 Fix debug in Planner::buffer_line 2016-09-23 03:03:13 -05:00
Scott Lahteine b211df818e Make movement functions more available 2016-09-23 03:03:13 -05:00
Scott Lahteine 6335acbf5c Patch bug in linear unapply_leveling 2016-09-23 03:03:13 -05:00
Scott Lahteine e8d5073a90 Use probe clearance for bump when homing Z with probe 2016-09-22 15:41:28 -05:00
Scott Lahteine dbe41245f1 Merge pull request #4821 from thinkyhead/rc_revert_to_raises 
Z Raise/Clearance rather than Height
 2016-09-22 15:30:07 -05:00
Scott Lahteine 747a2257dd Only deploy/stow BLTOUCH on downward move 2016-09-22 15:26:19 -05:00
Scott Lahteine e242946ac3 Patch G29 for linear leveling, reachable with probe 2016-09-22 15:26:19 -05:00
Scott Lahteine b800eb0fed Add probe option to position_is_reachable 2016-09-22 15:26:19 -05:00
Scott Lahteine fafafcf9d1 Use unapply_leveling in set_current_from_steppers_for_axis 2016-09-22 15:26:18 -05:00
Scott Lahteine e69d1e2879 Homing/probing feedrate, comments 2016-09-22 15:26:18 -05:00
Scott Lahteine 7d72ed688c Revert motor_current_setting to constexpr 
We should use `constexpr` wherever it makes sense, for its added benefits. See http://stackoverflow.com/questions/13346879/const-vs-constexpr-on-variables
 2016-09-22 15:26:18 -05:00
Scott Lahteine 145d9005d1 Fix BLTOUCH string and SERVO_DELAY 2016-09-21 01:45:23 -05:00
Scott Lahteine 2b7cc27c37 Merge pull request #4840 from thinkyhead/rc_G2_G3_arc_r_method 
Add support for G2/G3 with R parameter
 2016-09-21 01:30:37 -05:00
Scott Lahteine e0e10e0e45 Merge pull request #4859 from thinkyhead/rc_kinematic_and_scara 
Kinematic and SCARA patches
 2016-09-21 01:21:49 -05:00
Scott Lahteine 31f03c838a Only deploy/stow BLTouch for Z axis 2016-09-21 00:54:54 -05:00
Scott Lahteine 3913e04ac7 Add Delta kinematic optimization options 2016-09-20 18:48:06 -05:00
Scott Lahteine 8e31640229 Optimize prepare_kinematic_move_to 2016-09-20 18:48:06 -05:00
Scott Lahteine fd9b8ae4d4 Use position_is_reachable in G29, M48 2016-09-20 18:48:06 -05:00
Scott Lahteine 7194e4434f SCARA support in position_is_reachable 2016-09-20 18:48:06 -05:00
Scott Lahteine 1c5f9821c4 SCARA support in homeaxis 2016-09-20 18:48:05 -05:00
Scott Lahteine 92b4459f6c Simpler G92 for SCARA 2016-09-20 18:48:05 -05:00
Scott Lahteine 46cc2e3f6a Fix get_cartesian_from_steppers 2016-09-20 18:31:36 -05:00
Scott Lahteine 435c3ed404 Patch SCARA_move_to_cal for coordinate space 2016-09-20 18:31:36 -05:00
Scott Lahteine 5efb12e889 Simpler report_current_position for SCARA 2016-09-20 18:31:36 -05:00
Scott Lahteine 83fc5e1540 No line_to_* functions with IS_KINEMATIC 2016-09-20 18:31:36 -05:00
Scott Lahteine 59d39d7655 G0 direct move for SCARA 2016-09-20 18:31:36 -05:00
Scott Lahteine ad9d6870ed SCARA support in do_blocking_move_to 2016-09-20 18:31:36 -05:00
Scott Lahteine 8542ebcecd prepare_move_to_destination_raw => prepare_uninterpolated_move_to_destination 2016-09-20 18:31:36 -05:00
Scott Lahteine f900f97611 Update sw endstops in set_axis_is_at_home 2016-09-20 18:31:36 -05:00
Scott Lahteine 0d43cef1de M206 for MORGAN_SCARA 2016-09-20 18:31:36 -05:00
Scott Lahteine e94cb7a380 MORGAN_SCARA kinematics 2016-09-20 18:31:36 -05:00
Scott Lahteine 890bade2fa Additions, mods to SCARA config 2016-09-20 18:31:36 -05:00
Scott Lahteine 01f1028510 Try on "CLEARANCE" for size 2016-09-20 18:29:49 -05:00
Scott Lahteine 0e7d638a7a Revert to Probe Raise rather than Probe Height 2016-09-20 18:29:49 -05:00
Scott Lahteine 51e42a2d77 Adjust BLTouch probe behavior 
Addressing #4855
- Have the pin deploy only immediately before probing
- Have the pin retract immediately after every probe
 2016-09-20 16:20:36 -05:00
Scott Lahteine 13523cbf29 Fix and extend BLTouch support 2016-09-20 16:20:36 -05:00
Scott Lahteine 5cbed13f41 'constexpr' => 'const' for PWM_MOTOR_CURRENT 2016-09-20 15:57:48 -05:00
Scott Lahteine 7ae351c92f Merge pull request #4842 from thinkyhead/rc_DISABLE_Z_MIN_PROBE_ENDSTOP_whassup 
Drop DISABLE_Z_MIN_PROBE_ENDSTOP, clean up probe config
 2016-09-20 12:16:51 -05:00
Scott Lahteine ba94c89e21 Merge pull request #4852 from esenapaj/Fix-for-advance-extrusion-algorithms 
Fix for advance extrusion algorithms
 2016-09-20 11:33:14 -05:00
esenapaj 954563d603 Adjust spacing 2016-09-20 19:35:44 +09:00
esenapaj 7e9576dc5b Extend the e_steps[] from int to long for allowing more than 32,767 E steps 
Probably needed for long straight lines when using high microstepping
 2016-09-20 19:35:44 +09:00
esenapaj b04ed8f9c3 Fix inverted stepper signal of ADVANCED and LIN_ADVANCED 2016-09-20 19:35:44 +09:00
esenapaj 8692748ecd Fix broken direction signal of ADVANCED and LIN_ADVANCED 
Remove a setting proccess of E direction in advance_isr()
 2016-09-20 19:35:44 +09:00
Scott Lahteine e9ce42353e Patch G29 for 3-point leveling 2016-09-20 04:46:41 -05:00
Scott Lahteine c2744d8a8b Add support for G2/G3 with R parameter 2016-09-19 00:35:09 -05:00
Scott Lahteine e05af606a8 Clean up probe config options 2016-09-19 00:26:16 -05:00
Scott Lahteine 153e240cdd Probe conditionals to Conditionals_LCD.h 2016-09-19 00:25:53 -05:00
Scott Lahteine ff38a3c3b1 Use SD Detect Pin 53 for 3DRAG, K8200, and K8400 
See #4316
 2016-09-18 23:46:09 -05:00
Scott Lahteine f38a33a5d8 Add handling of BLTouch error state 2016-09-18 22:00:32 -05:00
Scott Lahteine c4dcfa254e Allow override of Z_ENDSTOP_SERVO_NR with BLTOUCH 2016-09-18 22:00:32 -05:00
Scott Lahteine 7d9ebda478 Remove redundant servo probe sanity check 2016-09-18 21:46:18 -05:00
Scott Lahteine f0beae7641 Fix stupid, stupid, stupid oversight in G29 update 
Mea culpa!
 2016-09-18 16:24:47 -05:00
Scott Lahteine 77639672d7 Move NONLINEAR bed leveling to planner 
This is in advance of moving non-linear bed leveling to the planner
class.
 2016-09-18 13:50:38 -05:00
Scott Lahteine 9429c7db89 Use ABC indices in delta[] 2016-09-18 13:50:38 -05:00
Scott Lahteine 5f2f991192 Use 'logical' rather than 'target' or 'cartesian' 2016-09-18 13:50:38 -05:00
Scott Lahteine 40d3e854f6 Remove redundant extern delta[] 2016-09-18 13:39:47 -05:00
Scott Lahteine 2ebfbc4c8d Merge pull request #4836 from thinkyhead/rc_some_comments 
Some comments, const args, debug output tweaks
 2016-09-18 13:38:07 -05:00
Scott Lahteine e5505e3b33 Allow non-square leveling grid 2016-09-18 13:11:20 -05:00
Scott Lahteine 2fc9ad6657 Use const ref args in probe_pt 2016-09-18 12:58:43 -05:00
Scott Lahteine 2c2688d7ad Adjust comments, spacing 2016-09-18 12:58:42 -05:00
Scott Lahteine b9d19b0008 Tweak extrapolate_one_point 2016-09-18 12:58:42 -05:00
Scott Lahteine 3c0b591935 Fix nozzle position description 2016-09-18 12:58:42 -05:00
Scott Lahteine 18d8dd4c0f set_current_from_steppers_for_axis const arg 2016-09-18 12:58:42 -05:00