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.

Sign up for GitHub

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

Add rad1o board id to libhackrf #289

Merged
merged 1 commit into from
Oct 7, 2016
Merged

Add rad1o board id to libhackrf #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions host/libhackrf/src/hackrf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1606,6 +1606,9 @@ const char* ADDCALL hackrf_board_id_name(enum hackrf_board_id board_id)
case BOARD_ID_HACKRF_ONE:
return "HackRF One";

case BOARD_ID_RAD1O:
return "rad1o";

case BOARD_ID_INVALID:
return "Invalid Board ID";

Expand All @@ -1624,6 +1627,9 @@ extern ADDAPI const char* ADDCALL hackrf_usb_board_id_name(enum hackrf_usb_board
case USB_BOARD_ID_HACKRF_ONE:
return "HackRF One";

case USB_BOARD_ID_RAD1O:
return "rad1o";

case USB_BOARD_ID_INVALID:
return "Invalid Board ID";

Expand Down
1 change: 1 addition & 0 deletions host/libhackrf/src/hackrf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ enum hackrf_board_id {
BOARD_ID_JELLYBEAN = 0,
BOARD_ID_JAWBREAKER = 1,
BOARD_ID_HACKRF_ONE = 2,
BOARD_ID_RAD1O = 3,
Copy link
Contributor

Choose a reason for hiding this comment

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

Does the rad1o firmware report a board ID of 3? Last time I used it, I thought it was reporting 2 (HackRF One).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I checked it yesterday and using 3 as board ID made hackrf_info recognize it correctly. I thought this was already specified, because the wiki says so.

But I also got sceptical as you asked and looked in the rad1o fork of hackrf and they definitively use board ID of 3: https://github.com/rad1o/hackrf/blob/rad1o/firmware/common/hackrf_core.h#L39. They even have an issue (rad1o#9) for submitting it upstream ;)

AFAIK they even use both (you can choose the mode a.k.a. hackrf vs. hackrf-old on startup to be compatible with apps which do not yet support it but the HackRF).

Copy link
Contributor

Choose a reason for hiding this comment

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

I wrote that documentation on the wiki, I wonder why I didn't make sure it matched the code?

Anyway, I've merged this now. Thank you for your contribution.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Cool! Thank you, too :)

Copy link
Contributor

Choose a reason for hiding this comment

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

It might be that the original FW did not do that. We got our own USB PID just before camp and might have changed the board ID around that time.

BOARD_ID_INVALID = 0xFF,
};

Expand Down