Skip to content

Commit

Permalink
nmigen => amaranth rename
Browse files Browse the repository at this point in the history
  • Loading branch information
hansfbaier committed Dec 27, 2021
1 parent 1cc215f commit 3187b42
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 20 deletions.
8 changes: 4 additions & 4 deletions gateware/arrow_deca.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import os
import subprocess

from nmigen import *
from nmigen.build import *
from nmigen.vendor.intel import *
from nmigen_boards.resources import *
from amaranth import *
from amaranth.build import *
from amaranth.vendor.intel import *
from amaranth_boards.resources import *

from luna.gateware.platform.core import LUNAPlatform, NullPin

Expand Down
10 changes: 5 additions & 5 deletions gateware/deca_mandelbrot.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
# SPDX-License-Identifier: CERN-OHL-W-2.0
import os

from nmigen import *
from nmigen.lib.fifo import AsyncFIFO
from amaranth import *
from amaranth.lib.fifo import AsyncFIFO

from nmigen_library.debug.ila import StreamILA, ILACoreParameters
from nmigen_library.stream import connect_stream_to_fifo, connect_fifo_to_stream
from nmigen_library.io.max7219 import SerialLEDArray, NumberToSevenSegmentHex
from amlib.debug.ila import StreamILA, ILACoreParameters
from amlib.stream import connect_stream_to_fifo, connect_fifo_to_stream
from amlib.io.max7219 import SerialLEDArray, NumberToSevenSegmentHex

from luna import top_level_cli
from luna.usb2 import USBDevice, USBStreamInEndpoint, USBStreamOutEndpoint
Expand Down
10 changes: 5 additions & 5 deletions gateware/fractalmanager.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from nmigen import *
from nmigen.build import Platform
from nmigen.lib.coding import PriorityEncoder
from amaranth import *
from amaranth.build import Platform
from amaranth.lib.coding import PriorityEncoder

from nmigen_library.test import GatewareTestCase, sync_test_case
from nmigen_library.stream import StreamInterface
from amlib.test import GatewareTestCase, sync_test_case
from amlib.stream import StreamInterface

from mandelbrot import Mandelbrot

Expand Down
6 changes: 3 additions & 3 deletions gateware/mandelbrot.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from nmigen import *
from nmigen.build import Platform
from nmigen_library.test import GatewareTestCase, sync_test_case
from amaranth import *
from amaranth.build import Platform
from amlib.test import GatewareTestCase, sync_test_case

class Mandelbrot(Elaboratable):
def __init__(self, *, bitwidth=128, fraction_bits=120, test=False):
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pyusb
numpy
matplotlib
git+https://github.com/nmigen/nmigen.git
git+https://github.com/hansfbaier/usb2-highspeed-core.git
git+https://github.com/hansfbaier/nmigen-library.git
git+https://github.com/amaranth-lang/amaranth.git
git+https://github.com/amaranth-community-unofficial/usb2-highspeed-core.git
git+https://github.com/amaranth-community-unofficial/amlib.git

0 comments on commit 3187b42

Please sign in to comment.