Embodiments described herein include a method for converting free-piston linear motion to rotary motion, comprising: providing a free-piston generator or motor/generator that includes one or more pistons; and, for each piston, a surface is provided defining a helical channel, wherein the piston is rotated in a single direction through the helical channel.