applet.control.servo: new applet.

CODEOWNERS

@@ -1,7 +1,11 @@
 # Catherine owns everything that's not owned by someone else.
 *       @whitequark
+
 /software/glasgow/applet/video/hub75_output/  @attie
 /software/glasgow/applet/video/ws2812_output/ @attie
+
 /software/glasgow/arch/xilinx/xc9500xl.py @wanda-phi
 /software/glasgow/applet/program/xc9500xl/ @wanda-phi
 /software/glasgow/database/xilinx/xc9500xl.py @wanda-phi
+
+/software/glasgow/applet/servo/ @tpwrules

software/glasgow/applet/__init__.py

@@ -66,7 +66,7 @@ def add_interact_arguments(cls, parser):
         pass
 
     async def interact(self, device, args, iface):
-        pass
+        raise GlasgowAppletError("This applet can only be used in REPL mode.")
 
     @classmethod
     def add_repl_arguments(cls, parser):
@@ -216,7 +216,7 @@ def setUp(self):
 
     def assertBuilds(self, access="direct", args=[]):
         if access == "direct":
-            target = GlasgowHardwareTarget(revision="A0",
+            target = GlasgowHardwareTarget(revision=self.applet_cls.required_revision,
                                            multiplexer_cls=DirectMultiplexer)
             access_args = DirectArguments(applet_name="applet",
                                           default_port="AB", pin_count=16)

software/glasgow/applet/control/servo/__init__.py

@@ -0,0 +1,207 @@
+import logging
+from amaranth import *
+from amaranth.lib import enum, wiring
+from amaranth.lib.wiring import In, Out
+
+from ... import *
+
+
+__all__ = ["ControlServoSubtarget", "ControlServoInterface", "ControlServoApplet"]
+
+
+class ServoChannel(wiring.Component):
+    en:  In(1)
+    pos: In(range(2_000))
+    out: Out(1)
+
+    def __init__(self, period_us=20_000):
+        self.period_us  = period_us
+
+        super().__init__()
+
+    def elaborate(self, platform):
+        # Cycles per microsecond. The position is specified in integer microseconds.
+        resolution = int(platform.default_clk_frequency / 1_000_000)
+        assert resolution * 1_000_000 == platform.default_clk_frequency, "Inexact µs duration"
+
+        m = Module()
+
+        # The modulation parameters are latched at the beginning of the cycle, avoiding glitches.
+        en_r  = Signal.like(self.en)
+        pos_r = Signal.like(self.pos)
+
+        # This timer governs the overall modulation period. In a single period of operation (20 ms),
+        # the first millisecond is always high (whenever the channel is enabled), the second is
+        # an encoding of the position and the rest is always low.
+        period_timer = Signal(range(self.period_us * resolution),
+                              reset=self.period_us * resolution - 1)
+        with m.If(period_timer == period_timer.reset):
+            m.d.sync += period_timer.eq(0)
+            m.d.sync += en_r.eq(self.en)
+            m.d.sync += pos_r.eq(self.pos)
+        with m.Else():
+            m.d.sync += period_timer.eq(period_timer + 1)
+
+        # This timer is controlled by the previous timer and governs pulse width within one
+        # modulation period.
+        pulse_en    = Signal()
+        pulse_timer = Signal(range(resolution))
+        pulse_count = Signal.like(self.pos)
+
+        with m.If(period_timer == period_timer.reset):
+            m.d.sync += self.out.eq(en_r)
+            m.d.sync += pulse_en.eq(1)
+
+        with m.If(pulse_en):
+            with m.If(pulse_timer == 0):
+                m.d.sync += pulse_timer.eq(resolution - 1)
+                m.d.sync += pulse_count.eq(pulse_count + 1)
+                with m.If(pulse_count == pos_r):
+                    m.d.sync += self.out.eq(0)
+                    m.d.sync += pulse_en.eq(0)
+            with m.Else():
+                m.d.sync += pulse_timer.eq(pulse_timer - 1)
+        with m.Else():
+            m.d.sync += pulse_timer.eq(0)
+            m.d.sync += pulse_count.eq(0)
+
+        return m
+
+
+class ControlServoSubtarget(Elaboratable):
+    class Command(enum.Enum):
+        Disable  = 0x00
+        Enable   = 0x01
+        SetValue = 0x02
+
+    def __init__(self, pads, out_fifo):
+        self.pads     = pads
+        self.out_fifo = out_fifo
+
+    def elaborate(self, platform):
+        m = Module()
+        m.submodules.chan = chan = ServoChannel()
+        m.d.comb += [
+            self.pads.out_t.oe.eq(1),
+            self.pads.out_t.o.eq(chan.out),
+        ]
+
+        command = Signal(self.Command)
+        pos_low = Signal.like(self.out_fifo.r_data)
+        with m.FSM():
+            with m.State("ReadCommand"):
+                m.d.comb += self.out_fifo.r_en.eq(1)
+                with m.If(self.out_fifo.r_rdy):
+                    m.d.sync += command.eq(self.out_fifo.r_data)
+                    m.next = "HandleCommand"
+
+            with m.State("HandleCommand"):
+                with m.If(command == self.Command.Disable):
+                    m.d.sync += chan.en.eq(0)
+                    m.next = "ReadCommand"
+                with m.If(command == self.Command.Enable):
+                    m.d.sync += chan.en.eq(1)
+                    m.next = "ReadCommand"
+                with m.If(command == self.Command.SetValue):
+                    m.d.comb += self.out_fifo.r_en.eq(1)
+                    with m.If(self.out_fifo.r_rdy):
+                        m.d.sync += pos_low.eq(self.out_fifo.r_data)
+                        m.next = "ReadPositionHigh"
+
+            with m.State("ReadPositionHigh"):
+                m.d.comb += self.out_fifo.r_en.eq(1)
+                with m.If(self.out_fifo.r_rdy):
+                    m.d.sync += chan.pos.eq(Cat(pos_low, self.out_fifo.r_data))
+                    m.next = "ReadCommand"
+
+        return m
+
+
+class ControlServoInterface:
+    def __init__(self, interface, logger):
+        self.lower   = interface
+        self._logger = logger
+        self._level  = logging.DEBUG if self._logger.name == __name__ else logging.TRACE
+
+    def _log(self, message, *args):
+        self._logger.log(self._level, "servo: " + message, *args)
+
+    async def enable(self, is_enabled=True):
+        """Enable or disable the servo.
+
+        When disabled, no pulses are sent over the control line.
+        """
+        if is_enabled:
+            self._log("enable")
+            await self.lower.write([ControlServoSubtarget.Command.Enable.value])
+        else:
+            self._log("disable")
+            await self.lower.write([ControlServoSubtarget.Command.Disable.value])
+
+    async def disable(self):
+        """Disable the servo.
+
+        When disabled, no pulses are sent over the control line.
+        """
+        await self.enable(False)
+
+    async def set_value(self, value: int):
+        """Set servo control value.
+
+        ``value`` is an integer number of microseconds in the range of 1000 to 2000 inclusive.
+        Note that the interpretation of this value varies.
+        - For a servo, 1500 corresponds to the neutral position.
+        - For an unidirectional ESC, 1000 is 0 rpm and 2000 is maximum rpm.
+        - For a bidirectional ESC, 1000 is maximum rpm backwards and 2000 is maximum rpm forwards.
+
+        The servo is enabled after the value is set.
+        """
+        assert 1000 <= value <= 2000, "Position out of [1000, 2000] range"
+
+        self._log(f"value={value}")
+        await self.lower.write([
+            ControlServoSubtarget.Command.SetValue.value,
+            *value.to_bytes(2, byteorder="little")
+        ])
+
+        await self.enable()
+
+
+class ControlServoApplet(GlasgowApplet):
+    logger = logging.getLogger(__name__)
+    help = "control RC servomotors"
+    description = """
+    Control RC/hobby servomotors using the common pulse width modulation protocol where a pulse
+    of 1000 µs corresponds to a minimum position and a pulse of 2000 µs corresponds to a maximum
+    position. The frequency of the updates is not strictly constrained by the protocol, and is
+    fixed at 50 Hz in this applet.
+
+    This protocol is also used in common brushless motor ESC (electronic speed control) modules.
+    For unidirectional ESCs, a pulse of 1000 µs corresponds to 0 rpm and a pulse of 2000 µs to
+    maximum rpm. For bidirectional ESCs, a pulse of 1000 us corresponds to maximum rpm backwards,
+    and 2000 µs to maximum rpm forwards.
+    """
+    # The FPGA on revA/revB is too slow for a wide counter we are using.
+    required_revision = "C0"
+
+    @classmethod
+    def add_build_arguments(cls, parser, access):
+        super().add_build_arguments(parser, access)
+
+        access.add_pin_argument(parser, "out", default=True)
+
+    def build(self, target, args):
+        self.mux_interface = iface = target.multiplexer.claim_interface(self, args)
+        iface.add_subtarget(ControlServoSubtarget(
+            pads=iface.get_pads(args, pins=("out",)),
+            out_fifo=iface.get_out_fifo(),
+        ))
+
+    async def run(self, device, args):
+        iface = await device.demultiplexer.claim_interface(self, self.mux_interface, args)
+        return ControlServoInterface(iface, self.logger)
+
+    @classmethod
+    def tests(cls):
+        from . import test
+        return test.ControlServoAppletTestCase

software/glasgow/applet/control/servo/test.py

@@ -0,0 +1,8 @@
+from ... import *
+from . import ControlServoApplet
+
+
+class ControlServoAppletTestCase(GlasgowAppletTestCase, applet=ControlServoApplet):
+    @synthesis_test
+    def test_build(self):
+        self.assertBuilds()

software/pyproject.toml

@@ -112,6 +112,7 @@ program-stusb4500-nvm = "glasgow.applet.program.stusb4500_nvm:StUsb4500NvmApplet
 program-xc6s = "glasgow.applet.program.xc6s:ProgramXC6SApplet"
 program-xc9500xl = "glasgow.applet.program.xc9500xl:ProgramXC9500XLApplet"
 
+control-servo = "glasgow.applet.control.servo:ControlServoApplet"
 control-tps6598x = "glasgow.applet.control.tps6598x:ControlTPS6598xApplet"
 
 sensor-bmx280 = "glasgow.applet.sensor.bmx280:SensorBMx280Applet"