clinton/Smoothieware.git
8 years agoMerge remote-tracking branch 'upstream/edge' into ZGridupdates_commit
Quentin Harley [Fri, 3 Jul 2015 05:54:57 +0000 (07:54 +0200)]
Merge remote-tracking branch 'upstream/edge' into ZGridupdates_commit

8 years agoMerge pull request #680 from RepRapMorgan/SCARAupdates_commit
Jim Morris [Thu, 2 Jul 2015 23:01:09 +0000 (16:01 -0700)]
Merge pull request #680 from RepRapMorgan/SCARAupdates_commit

SCARA calibration updates.

8 years agofixed G28 X0 Y0 again
Quentin Harley [Thu, 2 Jul 2015 19:31:15 +0000 (21:31 +0200)]
fixed G28 X0 Y0 again
(thought I was right initially... ;-)

8 years agozgrid: add homing options
Quentin Harley [Thu, 2 Jul 2015 13:57:08 +0000 (15:57 +0200)]
zgrid: add homing options

The machine can be told to home in one of the following modes:

    leveling-strategy.ZGrid-leveling.home_before_probe  2;
    # 0: NOHOME  1: HOMEXY  2: HOMEXYZ (Default HOMEXYZ)

8 years agoZGrid Homing.
Quentin Harley [Thu, 2 Jul 2015 11:28:15 +0000 (13:28 +0200)]
ZGrid Homing.
Added homing options to ZGrid:
NOHOME
HOMEXY
HOMEXYZ (Default)

8 years agoSCARA calibration updates. Added scale functionality in M665,
Quentin Harley [Thu, 2 Jul 2015 10:35:57 +0000 (12:35 +0200)]
SCARA calibration updates.  Added scale functionality in M665,
and M366: Convert trim to real home offsets

9 years agoMerge pull request #676 from wolfmanjm/upstreamedge
Jim Morris [Tue, 23 Jun 2015 08:52:15 +0000 (01:52 -0700)]
Merge pull request #676 from wolfmanjm/upstreamedge

Revert "prevent speed from being zero : a possible fix for the S3D bu…

9 years agoRevert "prevent speed from being zero : a possible fix for the S3D bug(s), needs...
Jim Morris [Tue, 23 Jun 2015 08:50:48 +0000 (01:50 -0700)]
Revert "prevent speed from being zero : a possible fix for the S3D bug(s), needs testing"

This reverts commit 392ab1411d9087292f88463c2bfb07b17cc1b6e0.

9 years agoprevent speed from being zero : a possible fix for the S3D bug(s), needs testing
Arthur Wolf [Tue, 23 Jun 2015 08:39:06 +0000 (10:39 +0200)]
prevent speed from being zero : a possible fix for the S3D bug(s), needs testing

9 years agoupdate firmware.bin
Jim Morris [Mon, 22 Jun 2015 01:01:41 +0000 (18:01 -0700)]
update firmware.bin

9 years agoMerge branch 'edge' of github.com:Smoothieware/Smoothieware into edge
Jim Morris [Mon, 22 Jun 2015 00:59:57 +0000 (17:59 -0700)]
Merge branch 'edge' of github.com:Smoothieware/Smoothieware into edge

9 years agoupdate firmware.bin
Jim Morris [Mon, 22 Jun 2015 00:58:56 +0000 (17:58 -0700)]
update firmware.bin

9 years agoMerge pull request #675 from wolfmanjm/feature/add-hwpwm-to-switch
Jim Morris [Sun, 21 Jun 2015 23:45:56 +0000 (16:45 -0700)]
Merge pull request #675 from wolfmanjm/feature/add-hwpwm-to-switch

Feature/add hwpwm to switch

9 years agoconvert 0-100 to 0 to 1 for PWM
Jim Morris [Sun, 21 Jun 2015 23:43:49 +0000 (16:43 -0700)]
convert 0-100 to 0 to 1 for PWM

9 years agoallow floating inout to the S on M106
Jim Morris [Sun, 21 Jun 2015 22:16:42 +0000 (15:16 -0700)]
allow floating inout to the S on M106

9 years agotighten up config checks
Jim Morris [Sun, 21 Jun 2015 22:10:04 +0000 (15:10 -0700)]
tighten up config checks

9 years agoadded a HW Pwm switch type to Swithc module
Jim Morris [Sun, 21 Jun 2015 21:58:34 +0000 (14:58 -0700)]
added a HW Pwm switch type to Swithc module

9 years agoUpdate config
Jim Morris [Mon, 15 Jun 2015 23:46:52 +0000 (16:46 -0700)]
Update config

9 years agoMerge pull request #674 from wolfmanjm/feature/handle-M117-properly
Jim Morris [Mon, 15 Jun 2015 20:15:56 +0000 (13:15 -0700)]
Merge pull request #674 from wolfmanjm/feature/handle-M117-properly

Make M117 special to allow entire command to be sent to LCD including…

9 years agoMake M117 special to allow entire command to be sent to LCD including G and M
Jim Morris [Mon, 15 Jun 2015 20:13:54 +0000 (13:13 -0700)]
Make M117 special to allow entire command to be sent to LCD including G and M

9 years agoMerge pull request #673 from DouglasPearless/feature/rotatable-delta
Jim Morris [Thu, 11 Jun 2015 03:52:01 +0000 (20:52 -0700)]
Merge pull request #673 from DouglasPearless/feature/rotatable-delta

Added RotatableDelta robot arm solution

9 years ago modified: src/modules/robot/arm_solutions/RotatableDeltaSolution.h
Douglas Pearless [Thu, 11 Jun 2015 03:29:39 +0000 (15:29 +1200)]
modified:   src/modules/robot/arm_solutions/RotatableDeltaSolution.h

9 years ago modified: src/modules/robot/arm_solutions/RotatableDeltaSolution.cpp
Douglas Pearless [Thu, 11 Jun 2015 02:19:42 +0000 (14:19 +1200)]
modified:   src/modules/robot/arm_solutions/RotatableDeltaSolution.cpp

9 years ago modified: src/modules/robot/arm_solutions/RotatableDeltaSolution.cpp
Douglas Pearless [Thu, 11 Jun 2015 02:02:02 +0000 (14:02 +1200)]
modified:   src/modules/robot/arm_solutions/RotatableDeltaSolution.cpp

9 years ago modified: ConfigSamples/README.TXT
Douglas Pearless [Wed, 10 Jun 2015 10:58:02 +0000 (22:58 +1200)]
modified:   ConfigSamples/README.TXT
modified:   src/modules/robot/arm_solutions/RotatableDeltaSolution.h

9 years ago deleted: ConfigSamples/FirePick.delta/config.FirePickSmoothieOnABreadboard
Douglas Pearless [Wed, 10 Jun 2015 10:47:06 +0000 (22:47 +1200)]
deleted:    ConfigSamples/FirePick.delta/config.FirePickSmoothieOnABreadboard

9 years ago modified: src/modules/robot/arm_solutions/RotatableDeltaSolution.cpp
Douglas Pearless [Wed, 10 Jun 2015 10:42:45 +0000 (22:42 +1200)]
modified:   src/modules/robot/arm_solutions/RotatableDeltaSolution.cpp

9 years ago modified: ConfigSamples/FirePick.delta/config
Douglas Pearless [Wed, 10 Jun 2015 10:40:24 +0000 (22:40 +1200)]
modified:   ConfigSamples/FirePick.delta/config
modified:   src/modules/robot/arm_solutions/RotatableDeltaSolution.cpp
modified:   src/modules/robot/arm_solutions/RotatableDeltaSolution.h

9 years ago modified: src/modules/robot/arm_solutions/RotatableDeltaSolution.cpp
Douglas Pearless [Wed, 10 Jun 2015 08:57:28 +0000 (20:57 +1200)]
modified:   src/modules/robot/arm_solutions/RotatableDeltaSolution.cpp

9 years ago modified: src/modules/robot/Robot.cpp
Douglas Pearless [Wed, 10 Jun 2015 08:45:31 +0000 (20:45 +1200)]
modified:   src/modules/robot/Robot.cpp
modified:   src/modules/robot/arm_solutions/RotatableDeltaSolution.cpp

9 years ago modified: src/modules/robot/arm_solutions/RotatableDeltaSolution.h
Douglas Pearless [Wed, 10 Jun 2015 08:25:22 +0000 (20:25 +1200)]
modified:   src/modules/robot/arm_solutions/RotatableDeltaSolution.h

9 years ago modified: src/modules/robot/Robot.cpp
Douglas Pearless [Wed, 10 Jun 2015 07:22:12 +0000 (19:22 +1200)]
modified:   src/modules/robot/Robot.cpp
modified:   src/modules/robot/arm_solutions/RotatableDeltaSolution.cpp
modified:   src/modules/robot/arm_solutions/RotatableDeltaSolution.h

9 years ago modified: ConfigSamples/FirePick.delta/config
Douglas Pearless [Wed, 10 Jun 2015 05:04:53 +0000 (17:04 +1200)]
modified:   ConfigSamples/FirePick.delta/config
modified:   ConfigSamples/README.TXT

9 years ago modified: ConfigSamples/FirePick.delta/config
Douglas Pearless [Wed, 10 Jun 2015 04:45:49 +0000 (16:45 +1200)]
modified:   ConfigSamples/FirePick.delta/config

9 years ago modified: src/modules/robot/arm_solutions/RotatableDeltaSolution.cpp
Douglas Pearless [Wed, 10 Jun 2015 04:45:02 +0000 (16:45 +1200)]
modified:   src/modules/robot/arm_solutions/RotatableDeltaSolution.cpp
modified:   src/modules/robot/arm_solutions/RotatableDeltaSolution.h
modified:   ConfigSamples/FirePick.delta/config

9 years ago modified: src/modules/robot/Robot.cpp
Douglas Pearless [Wed, 10 Jun 2015 04:44:38 +0000 (16:44 +1200)]
modified:   src/modules/robot/Robot.cpp
modified:   ConfigSamples/FirePick.delta/config
modified:   src/modules/robot/arm_solutions/RotatableDeltaSolution.cpp
modified:   src/modules/robot/arm_solutions/RotatableDeltaSolution.h

9 years ago new file: ConfigSamples/FirePick.delta/config
Douglas Pearless [Wed, 10 Jun 2015 02:32:11 +0000 (14:32 +1200)]
new file:   ConfigSamples/FirePick.delta/config
new file:   ConfigSamples/FirePick.delta/config.FirePickSmoothieOnABreadboard
modified:   src/modules/robot/Robot.cpp
new file:   src/modules/robot/arm_solutions/RotatableDeltaSolution.cpp
new file:   src/modules/robot/arm_solutions/RotatableDeltaSolution.h

9 years agoupdate firmware.bin
Jim Morris [Sun, 7 Jun 2015 21:17:55 +0000 (14:17 -0700)]
update firmware.bin

9 years agoMerge pull request #671 from wolfmanjm/upstreamedge
Jim Morris [Sun, 7 Jun 2015 21:14:19 +0000 (14:14 -0700)]
Merge pull request #671 from wolfmanjm/upstreamedge

fix typos in pull request

9 years agofix typos in pull request
Jim Morris [Sun, 7 Jun 2015 21:12:39 +0000 (14:12 -0700)]
fix typos in pull request

9 years agoMerge pull request #670 from JesperKrogPoulsen/fix/InvalidIterator
Jim Morris [Sun, 7 Jun 2015 21:05:12 +0000 (14:05 -0700)]
Merge pull request #670 from JesperKrogPoulsen/fix/InvalidIterator

Fix/invalid iterator

9 years agoSwitched to deque to avoid invalid iterator
Jesper Krog Poulsen [Sun, 7 Jun 2015 20:58:16 +0000 (22:58 +0200)]
Switched to deque to avoid invalid iterator

9 years agoSwitched to deque to avoid invalid iterator
Jesper Krog Poulsen [Sun, 7 Jun 2015 20:55:27 +0000 (22:55 +0200)]
Switched to deque to avoid invalid iterator

9 years agoFixed invalid std::vector iterator
Jesper Krog Poulsen [Sun, 7 Jun 2015 19:27:26 +0000 (21:27 +0200)]
Fixed invalid std::vector iterator

9 years agoupdate firmware.bin
Jim Morris [Sat, 30 May 2015 21:20:43 +0000 (14:20 -0700)]
update firmware.bin

9 years agoUpdate config
Jim Morris [Fri, 29 May 2015 21:35:38 +0000 (14:35 -0700)]
Update config

9 years agoUpdate Extruder.cpp
Jim Morris [Fri, 29 May 2015 21:28:02 +0000 (14:28 -0700)]
Update Extruder.cpp

Fix intial SOLO extruder feedrate if a very high acceleration was specified.

9 years agoUpdate Extruder.cpp
Jim Morris [Fri, 29 May 2015 08:39:09 +0000 (01:39 -0700)]
Update Extruder.cpp

Fix default extruder feedrate config definition

9 years agoMerge pull request #666 from wolfmanjm/feature/filament-detector
Jim Morris [Sat, 23 May 2015 06:56:37 +0000 (23:56 -0700)]
Merge pull request #666 from wolfmanjm/feature/filament-detector

Feature/filament detector

9 years agoMerge remote-tracking branch 'upstream/edge' into feature/filament-detector
Jim Morris [Sat, 23 May 2015 06:52:59 +0000 (23:52 -0700)]
Merge remote-tracking branch 'upstream/edge' into feature/filament-detector

9 years agoMerge pull request #665 from wolfmanjm/add/delta-calibration-tweaks
Jim Morris [Sat, 23 May 2015 06:51:51 +0000 (23:51 -0700)]
Merge pull request #665 from wolfmanjm/add/delta-calibration-tweaks

delta calibration tweaks, resume synonym

9 years agoMerge remote-tracking branch 'upstream/edge' into add/delta-calibration-tweaks
Jim Morris [Thu, 14 May 2015 20:34:25 +0000 (13:34 -0700)]
Merge remote-tracking branch 'upstream/edge' into add/delta-calibration-tweaks

9 years agoMerge pull request #664 from flety/patch-2
Jim Morris [Sun, 10 May 2015 19:10:02 +0000 (12:10 -0700)]
Merge pull request #664 from flety/patch-2

Update Player.cpp

9 years agoUpdate Player.cpp
damfle [Sun, 10 May 2015 09:31:44 +0000 (11:31 +0200)]
Update Player.cpp

Thats not the filename but the filename + path, so file only is better.

9 years agoMerge pull request #663 from RepRapMorgan/scaracal_autocal_psi
Jim Morris [Wed, 6 May 2015 20:11:54 +0000 (13:11 -0700)]
Merge pull request #663 from RepRapMorgan/scaracal_autocal_psi

SCARA calibration: Psi calculation bug fixed.

9 years agoSCARA calibration: Psi calculation bug fixed.
Quentin Harley [Wed, 6 May 2015 19:32:43 +0000 (21:32 +0200)]
SCARA calibration: Psi calculation bug fixed.

9 years agoMerge remote-tracking branch 'upstream/edge' into add/delta-calibration-tweaks
Jim Morris [Wed, 29 Apr 2015 05:43:14 +0000 (22:43 -0700)]
Merge remote-tracking branch 'upstream/edge' into add/delta-calibration-tweaks

9 years agoupdate firmware.bin
Jim Morris [Mon, 27 Apr 2015 08:06:31 +0000 (01:06 -0700)]
update firmware.bin

9 years agoMerge pull request #658 from flety/patch-1
Jim Morris [Mon, 20 Apr 2015 19:37:22 +0000 (12:37 -0700)]
Merge pull request #658 from flety/patch-1

Add the name of the file being printed...

9 years agoUpdate Player.cpp
damfle [Mon, 20 Apr 2015 17:06:06 +0000 (19:06 +0200)]
Update Player.cpp

9 years agoAdd the name of the file being printed...
damfle [Mon, 20 Apr 2015 17:01:31 +0000 (19:01 +0200)]
Add the name of the file being printed...

...when using the command "progress"  or M27.

9 years agoMerge remote-tracking branch 'upstream/edge' into add/delta-calibration-tweaks
Jim Morris [Fri, 17 Apr 2015 21:56:59 +0000 (14:56 -0700)]
Merge remote-tracking branch 'upstream/edge' into add/delta-calibration-tweaks

9 years agoMerge pull request #657 from RepRapMorgan/zgrid_center
Jim Morris [Fri, 17 Apr 2015 21:56:27 +0000 (14:56 -0700)]
Merge pull request #657 from RepRapMorgan/zgrid_center

Added bed centred grid capability

9 years agoAdded bed centred grid capability
Quentin Harley [Fri, 17 Apr 2015 17:20:01 +0000 (19:20 +0200)]
Added bed centred grid capability

9 years agoMerge remote-tracking branch 'upstream/edge' into add/delta-calibration-tweaks
Jim Morris [Mon, 13 Apr 2015 02:11:26 +0000 (19:11 -0700)]
Merge remote-tracking branch 'upstream/edge' into add/delta-calibration-tweaks

9 years agoMerge pull request #654 from wolfmanjm/upstreamedge
Jim Morris [Mon, 13 Apr 2015 02:10:54 +0000 (19:10 -0700)]
Merge pull request #654 from wolfmanjm/upstreamedge

Allow Tn as first command on a line, followed by any M or G command

9 years agoadd comments
Jim Morris [Mon, 13 Apr 2015 02:06:18 +0000 (19:06 -0700)]
add comments

9 years agoAllow T1 M200 on same line with Tn as first command
Jim Morris [Mon, 13 Apr 2015 00:18:32 +0000 (17:18 -0700)]
Allow T1 M200 on same line with Tn as first command

9 years agoadd comments
Jim Morris [Mon, 13 Apr 2015 02:06:18 +0000 (19:06 -0700)]
add comments

9 years agoAllow T1 M200 on same line with Tn as first command
Jim Morris [Mon, 13 Apr 2015 00:18:32 +0000 (17:18 -0700)]
Allow T1 M200 on same line with Tn as first command

9 years agoMerge pull request #653 from RepRapMorgan/scara_transtrim
Jim Morris [Tue, 7 Apr 2015 20:44:57 +0000 (13:44 -0700)]
Merge pull request #653 from RepRapMorgan/scara_transtrim

Rebased SCARA Cal updates

9 years agoMerge pull request #652 from RepRapMorgan/zgrid_april
Jim Morris [Tue, 7 Apr 2015 20:44:27 +0000 (13:44 -0700)]
Merge pull request #652 from RepRapMorgan/zgrid_april

Zgrid repairs according to #649

9 years agoRebased SCARA Cal updates
Quentin Harley [Tue, 7 Apr 2015 08:36:25 +0000 (10:36 +0200)]
Rebased SCARA Cal updates

9 years agoAdded note about ZGrid "slow" feedrate. It is positioning speed only.
Quentin Harley [Tue, 7 Apr 2015 08:27:55 +0000 (10:27 +0200)]
Added note about ZGrid "slow" feedrate.  It is positioning speed only.
Probing slow and fast rates are configured in the ZProbe module config.

Fast speeds can be inserted if required.

9 years agoInitial repairs to ZGrid code - according to issue #649
Quentin Harley [Tue, 7 Apr 2015 08:19:55 +0000 (10:19 +0200)]
Initial repairs to ZGrid code - according to issue #649
- Added ON_IDLE
- Initial/concluding positioning optional

9 years agoMerge pull request #650 from JesperKrogPoulsen/remove-hidden-files
Jim Morris [Mon, 6 Apr 2015 19:18:36 +0000 (12:18 -0700)]
Merge pull request #650 from JesperKrogPoulsen/remove-hidden-files

Not showing hidden files

9 years agoNot showing hidden files
Jesper Krog Poulsen [Mon, 6 Apr 2015 14:34:15 +0000 (16:34 +0200)]
Not showing hidden files

9 years agoMerge remote-tracking branch 'upstream/edge' into feature/filament-detector
Jim Morris [Sat, 4 Apr 2015 05:17:00 +0000 (22:17 -0700)]
Merge remote-tracking branch 'upstream/edge' into feature/filament-detector

9 years agoadd delta calibration probe command
Jim Morris [Sat, 4 Apr 2015 05:16:18 +0000 (22:16 -0700)]
add delta calibration probe command

9 years agoMerge pull request #647 from wolfmanjm/upstreamedge
Jim Morris [Tue, 24 Mar 2015 21:17:33 +0000 (14:17 -0700)]
Merge pull request #647 from wolfmanjm/upstreamedge

Fix #646

9 years agoFix #646
Jim Morris [Tue, 24 Mar 2015 21:15:10 +0000 (14:15 -0700)]
Fix #646
If M109 or heat and wait and thermistor reading is unreliable then the system is put into a HALT state.
Compliant hosts will comply with this and abort the current print.

9 years agoMerge pull request #644 from wolfmanjm/fix/switch-execution
Jim Morris [Fri, 20 Mar 2015 19:48:48 +0000 (12:48 -0700)]
Merge pull request #644 from wolfmanjm/fix/switch-execution

Make switch wait for queue rather than use on_gcode_execute so it works ...

9 years agoMake switch wait for queue rather than use on_gcode_execute so it works correctly...
Jim Morris [Thu, 19 Mar 2015 20:58:49 +0000 (13:58 -0700)]
Make switch wait for queue rather than use on_gcode_execute so it works correctly with G4
correct a comment in configs

9 years agostop repeating messages when bulge detected
Jim Morris [Mon, 9 Mar 2015 21:08:58 +0000 (14:08 -0700)]
stop repeating messages when bulge detected
distinguish between bulge detected and filament out

9 years agoadd sample config
Jim Morris [Mon, 2 Mar 2015 22:26:05 +0000 (14:26 -0800)]
add sample config

9 years agoupdate firmware.bin
Jim Morris [Mon, 2 Mar 2015 00:02:48 +0000 (16:02 -0800)]
update firmware.bin

9 years agoadd settings for filament detector
Jim Morris [Sun, 1 Mar 2015 23:41:37 +0000 (15:41 -0800)]
add settings for filament detector

9 years agoadded Mxxx commands to control filament detector
Jim Morris [Sun, 1 Mar 2015 22:52:35 +0000 (14:52 -0800)]
added Mxxx commands to control filament detector

9 years agomodify makefile so excluded modules can be included on the command line
Jim Morris [Sat, 28 Feb 2015 10:30:04 +0000 (02:30 -0800)]
modify makefile so excluded modules can be included on the command line

9 years agoadd bulge pin
Jim Morris [Sat, 28 Feb 2015 06:46:19 +0000 (22:46 -0800)]
add bulge pin

9 years agoFist hack at filament detector module
Jim Morris [Sat, 28 Feb 2015 06:25:28 +0000 (22:25 -0800)]
Fist hack at filament detector module

9 years agoMerge pull request #631 from RepRapMorgan/scaralimits
Jim Morris [Fri, 27 Feb 2015 04:55:14 +0000 (20:55 -0800)]
Merge pull request #631 from RepRapMorgan/scaralimits

Add configurable SCARA limits to MorganSCARASolution

9 years agoAdded config parameters to define regions close to the SCARA tower
Quentin Harley [Fri, 27 Feb 2015 04:22:27 +0000 (06:22 +0200)]
Added config parameters to define regions close to the SCARA tower
and the maximum reach in order to prevent arms colliding.
The arms will limit the movemt and move around the obstacle if sent to a
destination on the other side of such a region.

9 years agoMerge pull request #586 from RepRapMorgan/mintemp
Jim Morris [Thu, 26 Feb 2015 21:42:17 +0000 (13:42 -0800)]
Merge pull request #586 from RepRapMorgan/mintemp

Thermistor safety (minimum temperatures)

9 years agoUpdate ZGridStrategy.cpp
Jim Morris [Thu, 26 Feb 2015 21:16:48 +0000 (13:16 -0800)]
Update ZGridStrategy.cpp

9 years agoMerge pull request #629 from RepRapMorgan/repairzgrid
Jim Morris [Thu, 26 Feb 2015 21:02:46 +0000 (13:02 -0800)]
Merge pull request #629 from RepRapMorgan/repairzgrid

changed the gridname sizeof to match the usual protocol

9 years agoMerge pull request #628 from sorki/zgrid
Jim Morris [Thu, 26 Feb 2015 21:02:33 +0000 (13:02 -0800)]
Merge pull request #628 from sorki/zgrid

Zgrid probing fixes

9 years agochanged the gridname sizeof to match the usual protocol
Quentin Harley [Thu, 26 Feb 2015 20:42:42 +0000 (22:42 +0200)]
changed the gridname sizeof to match the usual protocol

9 years agozgrid: fix doProbing indentation
Richard Marko [Thu, 26 Feb 2015 19:12:29 +0000 (20:12 +0100)]
zgrid: fix doProbing indentation

Signed-off-by: Richard Marko <rmarko@fedoraproject.org>
9 years agozgrid: handle public data request failure
Richard Marko [Thu, 26 Feb 2015 19:10:59 +0000 (20:10 +0100)]
zgrid: handle public data request failure

When endstops module is disabled.

Signed-off-by: Richard Marko <rmarko@fedoraproject.org>