Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: whitequark/glasgow
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: af45db5708db
Choose a base ref
...
head repository: whitequark/glasgow
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4190b20fc603
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Nov 20, 2018

  1. setup: fix typo.

    whitequark committed Nov 20, 2018
    Copy the full SHA
    1c06aa2 View commit details
  2. Copy the full SHA
    5e4d193 View commit details
  3. Copy the full SHA
    4190b20 View commit details
Showing with 4 additions and 1 deletion.
  1. +1 −0 software/glasgow/applet/spi/flash_25c.py
  2. +1 −0 software/glasgow/applet/spi/master.py
  3. +1 −0 software/glasgow/support/endpoint.py
  4. +1 −1 software/setup.py
1 change: 1 addition & 0 deletions software/glasgow/applet/spi/flash_25c.py
Original file line number Diff line number Diff line change
@@ -426,6 +426,7 @@ async def interact(self, device, args, flash_iface):
# -------------------------------------------------------------------------------------------------

class SPIFlash25CAppletTestCase(GlasgowAppletTestCase, applet=SPIFlash25CApplet):
@synthesis_test
def test_build(self):
self.assertBuilds(args=["--pin-sck", "0", "--pin-ss", "1",
"--pin-mosi", "2", "--pin-miso", "3"])
1 change: 1 addition & 0 deletions software/glasgow/applet/spi/master.py
Original file line number Diff line number Diff line change
@@ -284,6 +284,7 @@ async def interact(self, device, args, spi_iface):
# -------------------------------------------------------------------------------------------------

class SPIMasterAppletTestCase(GlasgowAppletTestCase, applet=SPIMasterApplet):
@synthesis_test
def test_build(self):
self.assertBuilds(args=["--pin-sck", "0", "--pin-ss", "1",
"--pin-mosi", "2", "--pin-miso", "3"])
1 change: 1 addition & 0 deletions software/glasgow/support/endpoint.py
Original file line number Diff line number Diff line change
@@ -117,6 +117,7 @@ async def _refill(self):
self._buffer = b""
self._log(logging.TRACE, "recv end-of-stream")
self._recv_epoch += 1
raise asyncio.CancelledError

async def recv(self, length=0):
data = bytearray()
2 changes: 1 addition & 1 deletion software/setup.py
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ def run(self):
#long_description="""TODO""",
license="0-clause BSD License",
install_requires=["migen", "fx2>=0.6", "pyvcd", "bitarray", "crcmod"],
depndency_links=[
dependency_links=[
"git+https://github.com/m-labs/migen.git#egg=migen",
],
packages=find_packages(),