Jim Morris [Wed, 23 Sep 2015 09:02:24 +0000 (02:02 -0700)]
Merge pull request #738 from RTimothyEdwards/fix/zgrid-cartesian
Improved ZGridStrategy:
Tim Edwards [Mon, 21 Sep 2015 13:22:40 +0000 (09:22 -0400)]
Removed comments
Tim Edwards [Mon, 21 Sep 2015 12:52:09 +0000 (08:52 -0400)]
Improved ZGridStrategy:
(1) Removed a redundant and incorrect move in the Z-probe. If
cal_offset and/or probe_offset non-zero, then the calibration
loop first moves the extruder to the grid position, then makes
the correct move. The first (incorrect) move has been removed.
(2) Corrected the getZOffset() routine, which would incorrectly
compute xIndex and yIndex if cal_offset_x or cal_offset_y is
negative ((int) is not the floor of a negative number).
(3) Improved getZOffset() by extrapolating points outside the
grid using the nearest grid square, such that for purposes of
correction, the plane of each outermost grid square effectively
extends to infinity. The previous code returned zero for all
areas outside the grid, creating a discontinuity at the grid
boundary.
These changes were made especially for using the ZGridStrategy
with a cartesian printer and the recently popular inductive
proximity sensor. The proximity sensor must have a metal surface
underneath at all times, so the probe calibration must be set to
a smaller area than the bed plate. The cal_offset_x and
cal_offset_y plus the bed_x and bed_y serve to create an interior
area for the probe grid. The new getZOffset() will extrapolate
values to first order from the probe grid out to the edge of the
bed plate.
Changes should not interfere with any existing use of
ZGridStrategy.
Jim Morris [Mon, 21 Sep 2015 04:35:24 +0000 (21:35 -0700)]
update firmware.bin
Jim Morris [Mon, 21 Sep 2015 04:30:55 +0000 (21:30 -0700)]
Merge pull request #737 from wolfmanjm/fix/extruder_solo_detection
Fix/extruder solo detection
Jim Morris [Mon, 21 Sep 2015 04:29:56 +0000 (21:29 -0700)]
Add check for an E parameter on solo move detection
Jim Morris [Mon, 14 Sep 2015 06:48:38 +0000 (23:48 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Mon, 14 Sep 2015 06:48:14 +0000 (23:48 -0700)]
Merge pull request #736 from Smoothieware/development/test-framework
Development/test framework
Jim Morris [Mon, 14 Sep 2015 05:14:37 +0000 (22:14 -0700)]
Merge remote-tracking branch 'upstream/edge' into development/test-framework
Jim Morris [Mon, 14 Sep 2015 05:14:16 +0000 (22:14 -0700)]
min -> std::min
Jim Morris [Mon, 14 Sep 2015 05:01:19 +0000 (22:01 -0700)]
Merge pull request #735 from wolfmanjm/refactor/endstop-limits
Refactor/endstop limits
Jim Morris [Mon, 14 Sep 2015 04:58:05 +0000 (21:58 -0700)]
refactor endstop bounce back after home for limits
Jim Morris [Mon, 14 Sep 2015 03:50:05 +0000 (20:50 -0700)]
update utils append_parameters
Jim Morris [Mon, 14 Sep 2015 03:22:37 +0000 (20:22 -0700)]
remove map, use vector pair.
remove sstream as it used 100K more memory.
Jim Morris [Mon, 14 Sep 2015 00:44:25 +0000 (17:44 -0700)]
refactor how endstop limits back off moves are generated
Jim Morris [Mon, 14 Sep 2015 00:07:37 +0000 (17:07 -0700)]
add append_parameters to utils and unit test
Jim Morris [Sun, 13 Sep 2015 23:29:43 +0000 (16:29 -0700)]
Merge remote-tracking branch 'upstream/edge' into development/test-framework
Jim Morris [Sun, 13 Sep 2015 23:22:15 +0000 (16:22 -0700)]
Merge pull request #734 from Smoothieware/OskarLinde-feature/soft_soft_endstop-fixed_limits
Oskar linde feature/soft soft endstop fixed limits
Jim Morris [Sun, 13 Sep 2015 23:18:10 +0000 (16:18 -0700)]
Merge branch 'OskarLinde-feature/soft_soft_endstops' into OskarLinde-feature/soft_soft_endstop-fixed_limits
Jim Morris [Sun, 13 Sep 2015 23:16:21 +0000 (16:16 -0700)]
Fixed Endstops::back_off_home() so it works for deltas
In config also force certain delta config entries to all be the same, avoids some common config errors
Jim Morris [Sun, 13 Sep 2015 21:40:51 +0000 (14:40 -0700)]
Merge branch 'feature/soft_soft_endstops' of https://github.com/OskarLinde/Smoothieware into OskarLinde-feature/soft_soft_endstops
Jim Morris [Sun, 13 Sep 2015 21:14:53 +0000 (14:14 -0700)]
Merge remote-tracking branch 'upstream/edge' into development/test-framework
Jim Morris [Sun, 13 Sep 2015 21:12:51 +0000 (14:12 -0700)]
add switch test
Jim Morris [Sun, 13 Sep 2015 21:12:18 +0000 (14:12 -0700)]
remove obsolete PDA events
Jim Morris [Sun, 13 Sep 2015 09:42:21 +0000 (02:42 -0700)]
fix tests after upstream changes to PAD
Jim Morris [Sun, 13 Sep 2015 09:30:08 +0000 (02:30 -0700)]
Merge remote-tracking branch 'upstream/edge' into development/test-framework
Jim Morris [Sun, 13 Sep 2015 09:28:25 +0000 (02:28 -0700)]
Merge pull request #732 from wolfmanjm/refactor/get-public-data-more
refactor get public data, to be slightly easier to use on callee side
Jim Morris [Sun, 13 Sep 2015 09:21:48 +0000 (02:21 -0700)]
refactor get public data, to be slightly easier to use on callee side
now allows the caller to provide the data storage (a pointer to the data for the callee to store the result in)
refactor out Robot public data requests as they are not necessary as all modules have access to THEKERNEL->robot->...
Jim Morris [Sun, 13 Sep 2015 06:14:18 +0000 (23:14 -0700)]
Merge remote-tracking branch 'upstream/edge' into development/test-framework
Jim Morris [Sun, 13 Sep 2015 06:14:02 +0000 (23:14 -0700)]
Merge pull request #731 from wolfmanjm/refactor/switch-get-public-data
Refactor/switch get public data
Jim Morris [Sun, 13 Sep 2015 06:09:37 +0000 (23:09 -0700)]
fix pdr stuff
Jim Morris [Sun, 13 Sep 2015 06:07:12 +0000 (23:07 -0700)]
Merge remote-tracking branch 'upstream/development/test-framework' into development/test-framework
Conflicts:
Rakefile
src/testframework/Test_kernel.cpp
Jim Morris [Sun, 13 Sep 2015 06:02:26 +0000 (23:02 -0700)]
Added a test case for the switch module
Jim Morris [Sat, 12 Sep 2015 23:28:21 +0000 (16:28 -0700)]
Allow test modules to be specifed in the rakefile.defaults file
Update Readme
Jim Morris [Sat, 12 Sep 2015 22:40:31 +0000 (15:40 -0700)]
Update readme
add more comments to the temperature switch unit test
Jim Morris [Sat, 12 Sep 2015 21:54:41 +0000 (14:54 -0700)]
add Readme for test framework
Jim Morris [Sat, 12 Sep 2015 21:29:29 +0000 (14:29 -0700)]
Add test framework using easyunit
add unit test for TemperatureSwitch
add unit test for some utils functions as examples
added unregister_for_event() to Kernel so modules can be tested
Hack FirmConfigSource to allow configs to be specified in memory for testing
allow config to be deleted
Modified Rakefile to allow buildong of test framework with rake testing=1
modify makefiles to ignore the src/testframework for builds
Jim Morris [Sun, 13 Sep 2015 03:30:58 +0000 (20:30 -0700)]
have caller supply data location for returned state, saves a static variable per switch.
Jim Morris [Sun, 13 Sep 2015 00:05:12 +0000 (17:05 -0700)]
Merge pull request #727 from wolfmanjm/modify/temperature-switch-edge-detection
Clean up and refactor new edge detection actions for TemperatureSwitch.
Jim Morris [Sun, 13 Sep 2015 00:01:20 +0000 (17:01 -0700)]
Merge pull request #730 from wolfmanjm/fix/suspend-resume
Fix/suspend resume
Jim Morris [Sat, 12 Sep 2015 23:28:21 +0000 (16:28 -0700)]
Allow test modules to be specifed in the rakefile.defaults file
Update Readme
Jim Morris [Sat, 12 Sep 2015 22:40:31 +0000 (15:40 -0700)]
Update readme
add more comments to the temperature switch unit test
Jim Morris [Sat, 12 Sep 2015 21:54:41 +0000 (14:54 -0700)]
add Readme for test framework
Jim Morris [Sat, 12 Sep 2015 21:29:29 +0000 (14:29 -0700)]
Add test framework using easyunit
add unit test for TemperatureSwitch
add unit test for some utils functions as examples
added unregister_for_event() to Kernel so modules can be tested
Hack FirmConfigSource to allow configs to be specified in memory for testing
allow config to be deleted
Modified Rakefile to allow buildong of test framework with rake testing=1
modify makefiles to ignore the src/testframework for builds
Jim Morris [Sat, 12 Sep 2015 20:46:21 +0000 (13:46 -0700)]
Merge branch 'modify/temperature-switch-edge-detection' into development/test-framework
Jim Morris [Sat, 12 Sep 2015 08:25:55 +0000 (01:25 -0700)]
Fix bug in publicdata
Jim Morris [Sat, 12 Sep 2015 06:22:16 +0000 (23:22 -0700)]
Merge pull request #728 from Smoothieware/fix/temperature-pool-access
Fix/temperature pool access
Jim Morris [Sat, 12 Sep 2015 05:46:35 +0000 (22:46 -0700)]
Fix the order of parameters for temperature request
fix panel queries of temperature controls
Jim Morris [Sat, 12 Sep 2015 04:13:25 +0000 (21:13 -0700)]
change the temperature public data access to pass in the pad_temp for the result, this saves every temperature control from having a pad_temp struct.
Allo publicdata get_value to pass in the recipient for the data, rather than the callee having to store that data, currently used for polling temperature controls.
Jim Morris [Sat, 12 Sep 2015 02:20:56 +0000 (19:20 -0700)]
interating temperature controllers was done wrong. refactoring that error.
Instead of keeping a list of temperature_controllers in kernel (wher eit does not belong)
we now do a public data request for all tempoerature controllers to return their current data.
this is the way all modules need to poll other optional modules.
Jim Morris [Thu, 10 Sep 2015 06:44:21 +0000 (23:44 -0700)]
Claan up and refactor new edge detection actions for TemperatureSwitch.
Oskar Linde [Mon, 7 Sep 2015 23:58:14 +0000 (16:58 -0700)]
Make soft endstops truly soft
Jim Morris [Wed, 9 Sep 2015 20:48:46 +0000 (13:48 -0700)]
Merge pull request #724 from wolfmanjm/upstreamedge
Allow fractional ms to be specified for HW PWM
Jim Morris [Wed, 9 Sep 2015 20:45:40 +0000 (13:45 -0700)]
Allow fractional ms to be specified for HWPWM period
Jim Morris [Wed, 9 Sep 2015 20:44:12 +0000 (13:44 -0700)]
Revert "Allow fractional ms to be specified for HW PWM in switch period setting. still defaults to 20ms, and the setting is still ms but 0.1 would set the period to 10000Hz."
This reverts commit
03f126a0dc62eeede863cb509223ba0150b811ef.
Jim Morris [Wed, 9 Sep 2015 20:39:40 +0000 (13:39 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Wed, 9 Sep 2015 20:38:31 +0000 (13:38 -0700)]
Allow fractional ms to be specified for HW PWM in switch period setting. still defaults to 20ms, and the setting is still ms but 0.1 would set the period to 10000Hz.
Jim Morris [Wed, 9 Sep 2015 07:34:36 +0000 (00:34 -0700)]
Update psu_off_when_cooled_down.config
Jim Morris [Wed, 9 Sep 2015 01:02:44 +0000 (18:02 -0700)]
Merge pull request #721 from wolfmanjm/feature/add-temperature-switch-levels
Added triggers for temperature switch allow trigger on LEVEL or RISIN…
Jim Morris [Wed, 9 Sep 2015 01:01:55 +0000 (18:01 -0700)]
print feedback on arming/disarming temoerature switch
Jim Morris [Tue, 8 Sep 2015 10:31:52 +0000 (03:31 -0700)]
implement the arm/disarm
Jim Morris [Tue, 8 Sep 2015 10:21:46 +0000 (03:21 -0700)]
add optional mcode to arm or disarm the temperature switch.
when armed it will switch on the specified trigger otherwise it'll just change state but not actuate the switch
once armed it will do a one_shot on the trigger and disarm itself, and will need to be armed again before it will switch again
temperature_switch.psoff_when_cool.arm_mcode 1100
M1100 S1 will arm
M1100 or M1100 S0 will disarm
Jim Morris [Tue, 8 Sep 2015 10:01:28 +0000 (03:01 -0700)]
Added triggers for temperature switch allow trigger on LEVEL or RISING or FALLING
Allow inverting of switch so can turn switch on or off when triggered
Jim Morris [Tue, 8 Sep 2015 06:10:18 +0000 (23:10 -0700)]
Merge pull request #720 from wolfmanjm/feature/on_halt_actions_to_switch
added failsafe_set_to and ignore_on_halt to switch module config
Jim Morris [Tue, 8 Sep 2015 05:01:37 +0000 (22:01 -0700)]
added failsafe_set_to and ignore_on_halt to switch module config
failsafe_set_to 0 means on MRI crash or ON_HALT the pin is set low (default)
failsafe_set_to 1 means on MRI crash or ON_HALT the pin is set high
ignore_on_halt false means it will set the pin to the failsafe value on ON_HALT (default)
ignore_on_halt true means it will not set the pin on ON_HALT, it will be left in whatever state it was in
Jim Morris [Mon, 7 Sep 2015 19:18:27 +0000 (12:18 -0700)]
Update config
Jim Morris [Sun, 6 Sep 2015 22:50:30 +0000 (15:50 -0700)]
Merge pull request #719 from wolfmanjm/upstreamedge
add force_all to get_options() so all options can be queried
Jim Morris [Sun, 6 Sep 2015 22:48:17 +0000 (15:48 -0700)]
add force_all to get_options() so all options cab be queried
Jim Morris [Sun, 6 Sep 2015 20:25:19 +0000 (13:25 -0700)]
Merge pull request #718 from OskarLinde/vector3
Vector3 refacfor
Oskar Linde [Sun, 6 Sep 2015 17:03:36 +0000 (10:03 -0700)]
Vector3 add data() member to access raw elements (identical to std::vector::data)
Oskar Linde [Sun, 6 Sep 2015 16:52:09 +0000 (09:52 -0700)]
Vector3: get rid of the static private nan member
Oskar Linde [Sun, 6 Sep 2015 16:49:34 +0000 (09:49 -0700)]
Vector3: Remove elementwise multiplication (inconsistent with vector arithmetic)
Oskar Linde [Sun, 6 Sep 2015 16:41:12 +0000 (09:41 -0700)]
Vector3: simplify interface by removing set() in favor of assignment
Oskar Linde [Sun, 6 Sep 2015 16:25:58 +0000 (09:25 -0700)]
Vector3: Inline constructors
Jim Morris [Sun, 6 Sep 2015 05:22:15 +0000 (22:22 -0700)]
Merge pull request #717 from wolfmanjm/fix/F-parameter-usage-in-M665
deprecate usage of M665 Fxxx in favor of M665 Hxxx
Jim Morris [Sun, 6 Sep 2015 05:21:01 +0000 (22:21 -0700)]
deprecate usage of M665 Fxxx in favor of M665 Hxxx
Jim Morris [Sun, 6 Sep 2015 05:11:13 +0000 (22:11 -0700)]
Merge pull request #715 from OskarLinde/zhomeofs_precision
Increase Z Home Ofs menu setting precision to 0.01 mm
Jim Morris [Sun, 6 Sep 2015 05:01:06 +0000 (22:01 -0700)]
Merge pull request #716 from OskarLinde/typo
Typo Axis -> Axes
Jim Morris [Sun, 6 Sep 2015 04:57:50 +0000 (21:57 -0700)]
Merge pull request #714 from OskarLinde/const
add const qualifier to input argument to cartesian_to_actuator
Oskar Linde [Fri, 4 Sep 2015 02:27:36 +0000 (19:27 -0700)]
Typo Axis -> Axes
Oskar Linde [Fri, 4 Sep 2015 02:26:15 +0000 (19:26 -0700)]
Increase Z Home Ofs menu setting precision to 0.01 mm
Oskar Linde [Wed, 2 Sep 2015 05:49:12 +0000 (22:49 -0700)]
add const qualifier to input argument to cartesian_to_actuator and actuator_to_cartesian conversion functions
Jim Morris [Thu, 3 Sep 2015 19:35:34 +0000 (12:35 -0700)]
Merge pull request #705 from sorki/probe_config
zprobe: add configuration via M670
Jim Morris [Thu, 3 Sep 2015 07:59:53 +0000 (00:59 -0700)]
Merge pull request #712 from wolfmanjm/upstreamedge
fix resume feedrate
Jim Morris [Thu, 3 Sep 2015 07:59:11 +0000 (00:59 -0700)]
fix resume feedrate
Richard Marko [Wed, 8 Jul 2015 21:05:24 +0000 (23:05 +0200)]
zprobe: add configuration via M670
Also adds support for storing probe configuration
to config-override via M500
;Probe feedrates slow/fast/return (mm/sec):
M670 S0.50 F2.00 R2.50
;Probe max_z (mm):
M670 Z200.00
;Probe height (mm):
M670 H2.00
Signed-off-by: Richard Marko <rmarko@fedoraproject.org>
Jim Morris [Tue, 1 Sep 2015 05:35:04 +0000 (22:35 -0700)]
update firmware.bin
Jim Morris [Tue, 1 Sep 2015 05:33:22 +0000 (22:33 -0700)]
Merge pull request #710 from wolfmanjm/upstreamedge
detect SOLO mode more consistently
Jim Morris [Tue, 1 Sep 2015 05:32:21 +0000 (22:32 -0700)]
fabs -> fabsf
Jim Morris [Tue, 1 Sep 2015 05:30:14 +0000 (22:30 -0700)]
tweak how SOLO mode is determined, may fix some obscure bugs (or not, but at least it is now consistent)
Jim Morris [Mon, 31 Aug 2015 21:08:51 +0000 (14:08 -0700)]
update firmware.bin
Jim Morris [Mon, 31 Aug 2015 21:07:30 +0000 (14:07 -0700)]
Merge pull request #709 from wolfmanjm/fix/extruder-max-speed-for-deltas
move the extruder speed check to before segmentation, so deltas shoul…
Jim Morris [Mon, 31 Aug 2015 21:00:23 +0000 (14:00 -0700)]
move the extruder speed check to before segmentation, so deltas should work
NOTE G2/G3 arcs will not be able to use that max E (which is probably ok as E is not used with CNC)
Jim Morris [Mon, 31 Aug 2015 07:44:24 +0000 (00:44 -0700)]
update firmware.bin
Jim Morris [Mon, 31 Aug 2015 07:42:08 +0000 (00:42 -0700)]
Merge pull request #708 from wolfmanjm/upstreamedge
fix max actuator speeds
Jim Morris [Mon, 31 Aug 2015 07:41:02 +0000 (00:41 -0700)]
fix max actuator speeds
Jim Morris [Sun, 30 Aug 2015 06:32:23 +0000 (23:32 -0700)]
Merge pull request #707 from wolfmanjm/feature/md5sum-command
add md5sum command for checking file intergrity and sdcard reads
Jim Morris [Sun, 30 Aug 2015 06:30:38 +0000 (23:30 -0700)]
add md5sum command for checking file intergrity and sdcard reads
Jim Morris [Sun, 30 Aug 2015 06:01:30 +0000 (23:01 -0700)]
Merge pull request #704 from sorki/probe_add_return_feedrate_option
zprobe: add zprobe.return_feedrate config option
Jim Morris [Sun, 30 Aug 2015 06:00:15 +0000 (23:00 -0700)]
Merge pull request #703 from sorki/probe_custom_feedrate
zprobe: add custom feedrate support (G30 Fxyz)