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: GlasgowEmbedded/glasgow
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 05b8bbd04833
Choose a base ref
...
head repository: GlasgowEmbedded/glasgow
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c35b5b02d22b
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Sep 23, 2019

  1. software: bump libfx2 version. 

    libfx2 0.7 has a bug where installing it from PyPI as a dependency
would fail.

This also updates the README to install most dependencies
system-wide.
    @whitequark
    whitequark committed Sep 23, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c35b5b0 View commit details
Showing with 9 additions and 6 deletions.
  1. +3 −2 README.md
  2. +5 −3 software/setup.py
  3. +1 −1 vendor/libfx2
5 changes: 3 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -76,9 +76,10 @@ Debugging new applets can be hard, especially if bidirectional buses are involve

### ... with Linux?

You will need Python 3.7 (or a newer version, in which case replace `3.7` with that version below) and sdcc. On a Debian or Ubuntu system these can be installed with:
You will need git, build tools, sdcc, Python 3.7 (or a newer version, in which case replace `3.7` with that version below). On a Debian or Ubuntu system these can be installed with:

apt-get install python3.7 sdcc
apt-get install --no-install-recommends git build-essential sdcc \
python3.7 python3-setuptools python3-libusb1 python3-aiohttp python3-bitarray python3-crcmod

Obtain the source code:

8 changes: 5 additions & 3 deletions software/setup.py
View file
Original file line number Diff line number Diff line change
@@ -68,11 +68,13 @@ def local_scheme(version):
description="Software for Glasgow, a digital interface multitool",
#long_description="""TODO""",
license="0-clause BSD License",
setup_requires=["setuptools_scm"],
install_requires=[
setup_requires=[
"setuptools",
"setuptools_scm"
],
install_requires=[
"nmigen",
"fx2>=0.7",
"fx2>=0.8",
"libusb1>=1.6.6",
"aiohttp",
"pyvcd",
2 changes: 1 addition & 1 deletion vendor/libfx2
Submodule libfx2 updated 1 files
+2 −2 software/setup.py