From 344f8bd12ac59ed89fe292846076434ff593c390 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Sat, 18 Jan 2020 09:42:58 +0800
Subject: [PATCH] wrpll: collector patch from Weida

---
 artiq/gateware/drtio/wrpll/ddmtd.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/artiq/gateware/drtio/wrpll/ddmtd.py b/artiq/gateware/drtio/wrpll/ddmtd.py
index 978706961..06bc33902 100644
--- a/artiq/gateware/drtio/wrpll/ddmtd.py
+++ b/artiq/gateware/drtio/wrpll/ddmtd.py
@@ -113,19 +113,19 @@ class Collector(Module):
         self.tag_main = Signal(N)
         self.tag_main_update = Signal()
 
-        self.output = Signal(N)
+        self.output = Signal((N, True))
         self.output_update = Signal(N)
 
         # # #
 
-        fsm = FSM()
+        fsm = FSM(reset_state="IDLE")
         self.submodules += fsm
 
         tag_collector = Signal(N)
         fsm.act("IDLE",
             If(self.tag_main_update & self.tag_helper_update,
                 NextValue(tag_collector, 0),
-                NextState("IDLE")
+                NextState("UPDATE")
             ).Elif(self.tag_main_update,
                 NextValue(tag_collector, self.tag_main),
                 NextState("WAITHELPER")
@@ -137,19 +137,22 @@ class Collector(Module):
         fsm.act("WAITHELPER",
             If(self.tag_helper_update,
                 NextValue(tag_collector, tag_collector - self.tag_helper),
-                NextState("IDLE")
+                NextState("UPDATE")
             )
         )
         fsm.act("WAITMAIN",
             If(self.tag_main_update,
                 NextValue(tag_collector, tag_collector + self.tag_main),
-                NextState("IDLE")
+                NextState("UPDATE")
             )
         )
+        fsm.act("UPDATE",
+            NextValue(self.output, tag_collector),
+            NextState("IDLE")
+        )
         self.sync += [
             self.output_update.eq(0),
             If(self.tag_helper_update,
-                self.output_update.eq(1),
-                self.output.eq(tag_collector)
+                self.output_update.eq(1)
             )
         ]