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)
Jim Morris [Fri, 28 Aug 2015 23:26:39 +0000 (16:26 -0700)]
Merge pull request #706 from wolfmanjm/upstreamedge
remove unused files
Jim Morris [Fri, 28 Aug 2015 23:22:20 +0000 (16:22 -0700)]
remove unused files
Jim Morris [Tue, 25 Aug 2015 20:50:46 +0000 (13:50 -0700)]
update firmware.bin
Jim Morris [Tue, 25 Aug 2015 20:43:35 +0000 (13:43 -0700)]
Merge pull request #702 from wolfmanjm/feature/max_temp-shutdown-if-exceeded
Added max temp check, if exceeeded hotend will be turned off and HALT…
Richard Marko [Wed, 8 Jul 2015 18:21:52 +0000 (20:21 +0200)]
zprobe: add zprobe.return_feedrate config option
Signed-off-by: Richard Marko <rmarko@fedoraproject.org>
Richard Marko [Tue, 25 Aug 2015 09:10:11 +0000 (11:10 +0200)]
zprobe: add custom feedrate support (G30 Fxyz)
Signed-off-by: Richard Marko <rmarko@fedoraproject.org>
Jim Morris [Tue, 25 Aug 2015 03:09:10 +0000 (20:09 -0700)]
Merge remote-tracking branch 'upstream/edge' into feature/max_temp-shutdown-if-exceeded
Conflicts:
src/modules/tools/temperaturecontrol/TemperatureControl.cpp
Jim Morris [Tue, 25 Aug 2015 03:07:17 +0000 (20:07 -0700)]
Merge pull request #701 from wolfmanjm/feature/M1000-comamnd-passthru
add M1000 command that will allow any following text to be executed a…
Jim Morris [Tue, 25 Aug 2015 02:59:28 +0000 (19:59 -0700)]
remove !! from Error message HALT will send it
Jim Morris [Tue, 25 Aug 2015 02:09:41 +0000 (19:09 -0700)]
Added max temp check, if exceeeded hotend will be turned off and HALT asserted
Added M143 S0 P300 which will set max temp for hotend 0 to 300 degrees C
This may be a breaking change as previously max_temp simply stopped one from entering a temp that was too high
default is 300
Jim Morris [Tue, 25 Aug 2015 01:40:30 +0000 (18:40 -0700)]
add M1000 command that will allow any following text to be executed as a console command
Jim Morris [Mon, 24 Aug 2015 00:06:50 +0000 (17:06 -0700)]
Merge pull request #700 from wolfmanjm/upstreamedge
move the predefined thermistor list to a command called thermistors (…
Jim Morris [Mon, 24 Aug 2015 00:04:35 +0000 (17:04 -0700)]
move the predefined thermistor list to a command called thermistors (or @thermistors on pronterface)
Jim Morris [Sun, 23 Aug 2015 23:52:12 +0000 (16:52 -0700)]
update firmware.bin
Arthur Wolf [Sun, 23 Aug 2015 21:44:49 +0000 (23:44 +0200)]
Merge pull request #686 from thinkl33t/edge
Changes to laser module PWM config.
Jim Morris [Sun, 23 Aug 2015 07:10:43 +0000 (00:10 -0700)]
Merge pull request #699 from wolfmanjm/fix/M504-hang
disable interrupts around the M504 seems to stop it crashing
Jim Morris [Sun, 23 Aug 2015 07:09:59 +0000 (00:09 -0700)]
Merge pull request #698 from wolfmanjm/feature/M305-set-predefined-thermistor
Feature/m305 set predefined thermistor
Jim Morris [Sun, 23 Aug 2015 07:08:14 +0000 (00:08 -0700)]
disable interrupts around the M504 seems to stop it crashing
Jim Morris [Sun, 23 Aug 2015 01:15:15 +0000 (18:15 -0700)]
safely convert float option to an int
Jim Morris [Sun, 23 Aug 2015 01:09:30 +0000 (18:09 -0700)]
Allow M305 to set a predefined thermistor by number
save that in M500
Jim Morris [Thu, 20 Aug 2015 06:19:00 +0000 (23:19 -0700)]
Merge pull request #697 from RepRapMorgan/zgrid_aug_15_b
ZGrid fine grid fix
Quentin Harley [Thu, 20 Aug 2015 06:14:24 +0000 (08:14 +0200)]
ZGrid fine grid fix
Added constant equal to half the multiplier to ensure the conditions are not foiled by floating point problems.
Jim Morris [Wed, 19 Aug 2015 20:57:45 +0000 (13:57 -0700)]
Merge pull request #696 from wolfmanjm/fix/unmarked-commands
remove the unhandled gcode hack, and all the cruft it required
Jim Morris [Wed, 19 Aug 2015 20:53:57 +0000 (13:53 -0700)]
remove the unhandled gcode hack, and all the cruft it required
Jim Morris [Wed, 19 Aug 2015 20:38:03 +0000 (13:38 -0700)]
Merge pull request #695 from wolfmanjm/feature/volumetric-limits
Add speed limiting based on maximum extrusion rate in mm^3/sec
Jim Morris [Mon, 17 Aug 2015 01:11:39 +0000 (18:11 -0700)]
try to fix M504... still hangs occasionally
Jim Morris [Mon, 17 Aug 2015 00:34:03 +0000 (17:34 -0700)]
Extend to also limit the feed rate if the extruder max speed is exceeded.
M203 E0 will turn off the extruder speed check
M203 V0 will turn off volumetric limiting if in volumetric extrusion mode
defaults are M203 E50 (set in config) and V0
For now volumetric speed limit can only be set with M203 Vxxx
Jim Morris [Sun, 16 Aug 2015 06:32:40 +0000 (23:32 -0700)]
Add speed limiting based on maximum extrusion rate in mm^3/sec
set ground work for speed limiting based on extruder max_speed in mm/sec
Jim Morris [Sat, 15 Aug 2015 20:22:58 +0000 (13:22 -0700)]
Create drill_cycles.config
Jim Morris [Sat, 15 Aug 2015 20:22:29 +0000 (13:22 -0700)]
Update config
Jim Morris [Sat, 15 Aug 2015 20:21:15 +0000 (13:21 -0700)]
Create filament-change-menu.config
Jim Morris [Sat, 15 Aug 2015 00:30:35 +0000 (17:30 -0700)]
Merge pull request #694 from wolfmanjm/upstreamedge
Allow auto pid tuning to display its output, but allow host to still get temps
Jim Morris [Fri, 14 Aug 2015 23:31:07 +0000 (16:31 -0700)]
remove the T: as pronterface is still seeing that as a temp update
Jim Morris [Fri, 14 Aug 2015 23:22:13 +0000 (16:22 -0700)]
prepend auto pid messages with // so it displays on most hosts (pronterface and octoprint), but does not update temp
The hosts polls for vcurrent temp will still be honored and should then display
Jim Morris [Fri, 14 Aug 2015 00:46:20 +0000 (17:46 -0700)]
tidy up the M220 and M221 printout
Jim Morris [Thu, 13 Aug 2015 01:24:45 +0000 (18:24 -0700)]
Update config
Jim Morris [Tue, 11 Aug 2015 04:50:44 +0000 (21:50 -0700)]
update firmware.bin
Jim Morris [Mon, 10 Aug 2015 08:16:32 +0000 (01:16 -0700)]
Merge pull request #693 from wolfmanjm/imprive/autopid
Tighten up autopid to produce better results
Jim Morris [Mon, 10 Aug 2015 08:15:22 +0000 (01:15 -0700)]
Merge pull request #692 from wolfmanjm/upstreamedge
Bug fix to temperature control, added zgrid config example, hack switch
Jim Morris [Mon, 10 Aug 2015 02:15:23 +0000 (19:15 -0700)]
Tighten up autopid to produce better results
M305 will now also show the minmax temps recorded since last M305 good for testing for noise and PID performance
Jim Morris [Sun, 9 Aug 2015 22:39:36 +0000 (15:39 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Sun, 9 Aug 2015 22:37:39 +0000 (15:37 -0700)]
Fix temperature control continually turning off the heaters every tick
clean up the checks for temperature being turned off was incoinsistent between setting target temperature to 0 or -1
now treats either as being off.
Jim Morris [Sun, 9 Aug 2015 22:16:55 +0000 (15:16 -0700)]
Merge pull request #691 from RepRapMorgan/zgrid_aug_15_a
ZGrid maintenance
Quentin Harley [Sun, 9 Aug 2015 13:15:47 +0000 (15:15 +0200)]
ZGrid maintenance
Repaired ZGrid probe offset after G32 probing
Jim Morris [Sun, 9 Aug 2015 08:24:52 +0000 (01:24 -0700)]
cleanup some brackts
Jim Morris [Thu, 6 Aug 2015 06:14:25 +0000 (23:14 -0700)]
Make M220 and M221 print out current settings when S is not specified
Jim Morris [Wed, 5 Aug 2015 02:44:41 +0000 (19:44 -0700)]
Hack to see if switch Snn is the current pwm and ignore it if it is. Slic3r likes to issue M106 S255 repeatedly
causing the smoothie to have to wait for queue empty everytime, so we ignore repeated calls with the same PWM.
Jim Morris [Wed, 29 Jul 2015 06:27:07 +0000 (23:27 -0700)]
add config snippet for zgrid ABL
Jim Morris [Sun, 26 Jul 2015 23:36:51 +0000 (16:36 -0700)]
update firmware.bin
Jim Morris [Sun, 26 Jul 2015 23:31:50 +0000 (16:31 -0700)]
Merge pull request #690 from wolfmanjm/add/ADC-DMA+Oversampling
Add adc oversampling and filtering and averaging
Jim Morris [Sun, 26 Jul 2015 22:46:22 +0000 (15:46 -0700)]
added oversampling with filtering and averaging of oversampled values
Jim Morris [Sun, 26 Jul 2015 21:34:51 +0000 (14:34 -0700)]
select percentile averaging
Jim Morris [Sun, 26 Jul 2015 09:32:03 +0000 (02:32 -0700)]
Refactor ADC sampling and averaging into Adc class from Thermistor
Thermistor just reads the current filtered/averaged reading
Jim Morris [Sun, 26 Jul 2015 00:48:12 +0000 (17:48 -0700)]
Merge pull request #689 from wolfmanjm/fix/ADC-sample-rate
Set the ADC clock div to 8 so we actually get 1000 samples/sec on the…
Jim Morris [Sat, 25 Jul 2015 23:33:15 +0000 (16:33 -0700)]
Also fix the default setting for switch type if not set for legacy config files. Defaults to pwm (sigma-delta)
Jim Morris [Fri, 24 Jul 2015 21:50:18 +0000 (14:50 -0700)]
Set the ADC clock div to 8 so we actually get 1000 samples/sec on the ADC instead of 6127 samples/sec
Bob Clough [Sun, 19 Jul 2015 22:27:22 +0000 (23:27 +0100)]
Updated Sample Configs
Updated sample config files to use new config variables.
Bob Clough [Sun, 19 Jul 2015 22:25:31 +0000 (23:25 +0100)]
Updated config variables loading code.
Changed new config variables to remove clash with older, deprecated
config variables. Made old config variables work in functionally
equivalent way to old config.
Bob Clough [Sun, 19 Jul 2015 00:43:16 +0000 (01:43 +0100)]
Changes to laser module PWM config.
This changes the config to work as described in issue #685. It makes
the laser_module_max_power work as expected / documented, introduces
a minimum power setting, and scales the output between the two.
Jim Morris [Fri, 3 Jul 2015 23:25:34 +0000 (16:25 -0700)]
Merge pull request #682 from st0ne/edge
fixed arc problem with G03 - patched from grbl project fixes #500
Philipp Aigner [Fri, 3 Jul 2015 23:02:56 +0000 (01:02 +0200)]
patched arc from grbl project - sometimes arcs did not work correctly / changed comment
Philipp Aigner [Fri, 3 Jul 2015 22:33:42 +0000 (00:33 +0200)]
patched arc from grbl project - sometimes arcs did not work correctly
Jim Morris [Fri, 3 Jul 2015 21:24:29 +0000 (14:24 -0700)]
Update ZGridStrategy.h
Jim Morris [Fri, 3 Jul 2015 21:23:28 +0000 (14:23 -0700)]
Update ZGridStrategy.cpp
Jim Morris [Fri, 3 Jul 2015 21:21:45 +0000 (14:21 -0700)]
Merge pull request #681 from RepRapMorgan/ZGridupdates_commit
ZGrid: add homing options