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/libfx2
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dd1e42c7b46f
Choose a base ref
...
head repository: whitequark/libfx2
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3adb4fc842f1
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Sep 23, 2019

  1. software: fix check for prebuilt bootloader.

    @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
    24dbb81 View commit details

  2. Bump version.

    @whitequark
    whitequark committed Sep 23, 2019
    Copy the full SHA
    3adb4fc View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 software/setup.py
4 changes: 2 additions & 2 deletions software/setup.py
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ def run(self):
"build", "boot-cypress.ihex")
self.copy_file(bootloader_ihex, "fx2")
except DistutilsExecError as e:
if os.access(path.join("fx2", "bootloader.ihex"), os.R_OK):
if os.access(path.join("fx2", "boot-cypress.ihex"), os.R_OK):
log.info("using prebuilt bootloader")
else:
raise
@@ -45,7 +45,7 @@ def run(self):

setup(
name="fx2",
version="0.7",
version="0.8",
author="whitequark",
author_email="whitequark@whitequark.org",
description="A Python package for interacting with Cypress EZ-USB FX2 series chips",