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

changes standard version to VT version 6 #375

Closed
wants to merge 5 commits into from
Closed

changes standard version to VT version 6 #375

wants to merge 5 commits into from

Conversation

dafiliks
Copy link
Contributor

@dafiliks dafiliks commented Dec 5, 2023

should resolve issue #374 if I understood correctly.

Copy link
Member

@GwnDaan GwnDaan left a comment

Choose a reason for hiding this comment

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

Thanks for your PR, really appreciate it! I have a few comments, could you look at those?

isobus/src/isobus_virtual_terminal_client.cpp Outdated Show resolved Hide resolved
@GwnDaan
Copy link
Member

GwnDaan commented Dec 5, 2023

Also the version passed into the function is saved as a class member of the VirtualTerminalClient class, it'll be unused after these changes. So could you remove it aswell?

@dafiliks
Copy link
Contributor Author

dafiliks commented Dec 5, 2023

I'll try to do all these, thank you!

@dafiliks
Copy link
Contributor Author

dafiliks commented Dec 5, 2023

I have made another commit, check it out and let me know any feedback. Thanks.

@GwnDaan
Copy link
Member

GwnDaan commented Dec 5, 2023

The build still seems to fail because where this function is used, the parameter "version" is still passed in: https://github.com/davidfiliks/AgIsoStack-plus-plus/blob/9f5e841d470eb57f8713a1e24accf06ecd5227f2/isobus/src/isobus_virtual_terminal_client.cpp#L1381

Furthermore, I was referring to this class member being unused after we make the changes in this PR: https://github.com/davidfiliks/AgIsoStack-plus-plus/blob/9f5e841d470eb57f8713a1e24accf06ecd5227f2/isobus/include/isobus/isobus/isobus_virtual_terminal_client.hpp#L1341
Would you be able to remove it, together with all places it is accessed/modified? That should only be inside the three set_object_pool functions.

I enabled the Github Actions checks to automatically start, try to get all checks to succeed. Again thanks for taking your time to make a contribution, highly appreciated :)

@ad3154 ad3154 linked an issue Dec 5, 2023 that may be closed by this pull request
@ad3154 ad3154 added the iso: virtual terminal Related to the ISO-11783:7 standard label Dec 5, 2023
@dafiliks
Copy link
Contributor Author

dafiliks commented Dec 5, 2023

Thank you for helping like this, it is my first ever contribution on github. Check it out and give any feedback. Thanks.

@ad3154
Copy link
Member

ad3154 commented Dec 5, 2023

Thank you for helping like this, it is my first ever contribution on github. Check it out and give any feedback. Thanks.

Well, it's cool that your first contribution is here with us! Welcome!

It's looking pretty good to me, my only comment would be that it would be nice to squash or fixup all your commits into one commit with a nice tile, something like your first one "Change VT Client version to VT version 6" or something similar.

@GwnDaan
Copy link
Member

GwnDaan commented Dec 5, 2023

It's looking pretty good to me, my only comment would be that it would be nice to squash or fixup all your commits into one commit with a nice tile, something like your first one "Change VT Client version to VT version 6" or something similar.

@ad3154 FYI, that's also something GitHub can do for us :). It's the Squash and merge option, though it indeed is a nice habit to keep commit history clean

@ad3154
Copy link
Member

ad3154 commented Dec 5, 2023

That's also something GitHub can do for us

I mean, yeah, I guess, it's just not the default on this repo so I forget it exists 😀

@dafiliks
Copy link
Contributor Author

dafiliks commented Dec 5, 2023

How would I merge all these commits into one?

@ad3154
Copy link
Member

ad3154 commented Dec 5, 2023

How would I merge all these commits into one?

It depends on how you interact with Git. I use fork but for raw Git, it would be something like what is described here with a git rebase -i HEAD~5 followed by force pushing the result to your branch.

This is a very common thing in Git, and fairly critical part of most git workflows, so it's something to look into as you gain experience with it, but no worries if it's not something you want to deal with right now, we can just have GitHub auto-squash it.

@dafiliks
Copy link
Contributor Author

dafiliks commented Dec 5, 2023

fatal: It seems that there is already a rebase-merge directory, and
I wonder if you are in the middle of another rebase. If that is the
case, please try
git rebase (--continue | --abort | --skip)
If that is not the case, please
rm -fr ".git/rebase-merge"
and run me again. I am stopping in case you still have something
valuable there.

I am not sure what to do here. This is the output after git rebase -i HEAD~5

@ad3154
Copy link
Member

ad3154 commented Dec 5, 2023

I am not sure what to do here. This is the output after git rebase -i HEAD~5

This seems like the rebase exited while it was happening, like maybe it couldn't open your selected default text editor or something, or there was some conflict... Don't worry about it for now, you can cancel it with git rebase --abort. We can just squash it on here.

@dafiliks
Copy link
Contributor Author

dafiliks commented Dec 5, 2023

Alright, thanks.

@dafiliks dafiliks closed this by deleting the head repository Dec 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
iso: virtual terminal Related to the ISO-11783:7 standard
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update supported version in working set maintenance message
3 participants