Merge branch 'master' into lekcyjna/autumn-cleaning-2

constants/ecp5_platforms.py

@@ -8,7 +8,7 @@
 from constants.ecp5_pinout import ecp5_bg756_pins, ecp5_bg756_pclk
 
 from coreblocks.peripherals.wishbone import WishboneParameters
-from coreblocks.transactions.lib import AdapterBase
+from transactron.lib import AdapterBase
 
 __all__ = ["make_ecp5_platform"]
 
@@ -60,6 +60,7 @@ def named_pin(self, names: list[str]):
             if name in self.pin_bag:
                 self.pin_bag.remove(name)
                 return name
+        raise RuntimeError("Named pins %s not free" % ", ".join(names))
 
 
 ResourceBuilder: TypeAlias = Callable[[PinManager], list[Resource]]
@@ -123,9 +124,10 @@ class ECP5BG756Platform(LatticeECP5Platform):
         default_clk = "clk"
         default_rst = "rst"
 
+        clk_pin = pins.named_pin(ecp5_bg756_pclk)
         resources = [
             Resource("rst", 0, PinsN(pins.p(), dir="i"), Attrs(IO_TYPE="LVCMOS33")),
-            Resource("clk", 0, Pins(pins.named_pin(ecp5_bg756_pclk), dir="i"), Clock(12e6), Attrs(IO_TYPE="LVCMOS33")),
+            Resource("clk", 0, Pins(clk_pin, dir="i"), Clock(12e6), Attrs(IO_TYPE="LVCMOS33")),
         ] + resource_builder(pins)
 
         connectors = []

docs/api.md

@@ -1,5 +1,6 @@
 # API
 
 ```{eval-rst}
-.. include:: modules.rst
-```
+.. include:: modules-coreblocks.rst
+.. include:: modules-transactron.rst
+```

pyrightconfig.json

@@ -2,6 +2,8 @@
   "include": [
     "coreblocks",
     "test",
+    "constants",
+    "transactron",
     "scripts"
   ],
 

scripts/build_docs.sh

@@ -59,5 +59,6 @@ fi
 $ROOT_PATH/scripts/core_graph.py -p -f mermaid $DOCS_DIR/auto_graph.rst
 sed -i -e '1i\.. mermaid::\n' -e 's/^/   /' $DOCS_DIR/auto_graph.rst
 
-sphinx-apidoc -o $DOCS_DIR $ROOT_PATH/coreblocks/
+sphinx-apidoc --tocfile modules-coreblocks -o $DOCS_DIR $ROOT_PATH/coreblocks/
+sphinx-apidoc --tocfile modules-transactron -o $DOCS_DIR $ROOT_PATH/transactron/
 sphinx-build -b html -W $DOCS_DIR $BUILD_DIR