Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: jlink hw version #1570

Merged
merged 2 commits into from
Jul 28, 2023
Merged

Conversation

perigoso
Copy link
Contributor

@perigoso perigoso commented Jul 28, 2023

Detailed description

This changes the hardware version debug log prefix to lower case (V1.2.3 -> v1.2.3)
Additionally adds an entry for the LPC-Link2 hardware type so that it's properly shown when parsing the version

Your checklist for this pull request

  • I've read the Code of Conduct
  • I've read the guidelines for contributing to this repository
  • It builds for hardware native (make PROBE_HOST=native)
  • It builds as BMDA (make PROBE_HOST=hosted)
  • I've tested it to the best of my ability
  • My commit messages provide a useful short description of what the commits do

Closing issues

@dragonmux dragonmux added this to the v1.10 milestone Jul 28, 2023
@dragonmux dragonmux added Bug Confirmed bug BMD App Black Magic Debug App (aka. PC hosted) (not firmware) labels Jul 28, 2023
Copy link
Member

@dragonmux dragonmux left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, there's only one change we spotted in review and with that fixed and this tested locally, we're happy to merge this.

src/platforms/hosted/jlink.c Outdated Show resolved Hide resolved
@dragonmux
Copy link
Member

We've tested this now and it works, very nice -

❯ src/blackmagic -s 000611000000 -tv 1
Black Magic Debug App v1.9.0-1058-g7096a624
 for Black Magic Probe, ST-Link v2 and v3, CMSIS-DAP, J-Link and FTDI (MPSSE)
Using 1366:0101 000611000000 J-Link (SEGGER)

Capabilities: 0xb9ff7bbf
Firmware version: J-Link LPC-Link 2 compiled May 31 2013 17:31:46
Hardware Version: LPC-Link2 v1.0.0
Available interfaces:
        0: JTAG*
        1: SWD

Copy link
Member

@dragonmux dragonmux left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, merging.

@dragonmux dragonmux merged commit ea7a2eb into blackmagic-debug:main Jul 28, 2023
6 checks passed
@perigoso perigoso deleted the fix/jlink-hw-version branch July 29, 2023 00:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
BMD App Black Magic Debug App (aka. PC hosted) (not firmware) Bug Confirmed bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants