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

Spinnaker 3.0.0.118 upgrade #1313

Merged
merged 14 commits into from
Jan 30, 2023
Merged

Conversation

ds58
Copy link
Contributor

@ds58 ds58 commented Jan 19, 2023

I upgraded the spinnaker preset to the latest Spinnaker SDK version 3.0.0.118

Had to change a few things in the sample code, nothing major.

I added a few skips for some enum symbols I wasn't sure how to deal with:

enum TLPayloadType
{
    ...
    SPINNAKER_TLPAYLOAD_TYPE_CUSTOM_ID = 1000, /* Starting value for GenTL Producer custom IDs*/
    SPINNAKER_TLPAYLOAD_TYPE_LOSSLESS_COMPRESSED = SPINNAKER_TLPAYLOAD_TYPE_CUSTOM_ID + 1,
    SPINNAKER_TLPAYLOAD_TYPE_LOSSY_COMPRESSED = SPINNAKER_TLPAYLOAD_TYPE_CUSTOM_ID + 2,
    SPINNAKER_TLPAYLOAD_TYPE_JPEG_LOSSLESS_COMPRESSED = SPINNAKER_TLPAYLOAD_TYPE_CUSTOM_ID + 3

In Java, it maps to

public enum spinTLPayloadType {
    ...
    SPINNAKER_TLPAYLOAD_TYPE_CUSTOM_ID(1000), /* Starting value for GenTL Producer custom IDs*/
    SPINNAKER_TLPAYLOAD_TYPE_LOSSLESS_COMPRESSED(SPINNAKER_TLPAYLOAD_TYPE_CUSTOM_ID + 1),
    SPINNAKER_TLPAYLOAD_TYPE_LOSSY_COMPRESSED(SPINNAKER_TLPAYLOAD_TYPE_CUSTOM_ID + 2),
    SPINNAKER_TLPAYLOAD_TYPE_JPEG_LOSSLESS_COMPRESSED(SPINNAKER_TLPAYLOAD_TYPE_CUSTOM_ID + 3);

I couldn't find any examples on how to deal with "self referencing enums." Any thoughts?

@saudet saudet requested a review from jpsacha January 19, 2023 22:11
@saudet
Copy link
Member

saudet commented Jan 19, 2023

I couldn't find any examples on how to deal with "self referencing enums." Any thoughts?

That should be working. It's a bug in JavaCPP, I guess, but are those enums important?

@ds58
Copy link
Contributor Author

ds58 commented Jan 19, 2023

Those enums aren't really important from what I can tell

@calvertdw
Copy link
Contributor

It looks like an outdated actions.yml was used for the build, pulling the old Spinnaker downloads. 🤔

@saudet
Copy link
Member

saudet commented Jan 20, 2023

To test that, we would need to replace temporarily bytedeco/javacpp-presets/.github/actions/deploy-[...]@actions with ihmcrobotics/javacpp-presets/.github/actions/deploy-[...]@spinnaker-upgrade in https://github.com/ihmcrobotics/javacpp-presets/blob/spinnaker-upgrade/.github/workflows/spinnaker.yml

spinnaker/README.md Outdated Show resolved Hide resolved
@saudet
Copy link
Member

saudet commented Jan 29, 2023

Could we get this tested as per #1313 (comment)?

@saudet
Copy link
Member

saudet commented Jan 30, 2023

Ok, this looks good to merge. Please revert 2f0759d and let's get this in!

@saudet saudet merged commit 1ca5630 into bytedeco:master Jan 30, 2023
@calvertdw calvertdw deleted the spinnaker-upgrade branch January 30, 2023 19:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants