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

Jump to bottom

Support user defined preallocated array sizes #1

Merged
merged 9 commits into from
Feb 17, 2024
Merged

Support user defined preallocated array sizes #1

merged 9 commits into from
Feb 17, 2024

Conversation

srmainwaring
Copy link

Synchronise changes required for ArduPilot/Micro-XRCE-DDS-Gen#2

richiware and others added 9 commits November 20, 2023 10:44
@richiware
Several changes to support fastddsgen -genapi [19957] (eProsima#105)
68a62f3 
* Refs #19944. Context uses TemplateManager

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #19944. Fix setting scope

Signed-off-by: Ricardo González Moreno <[email protected]>

---------

Signed-off-by: Ricardo González Moreno <[email protected]>
@JLBuenoLopez
Fix union discriminator (eProsima#106)
2a78a92 
* Refs #19932: fix union discriminator

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19932: apply review suggestions

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

---------

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
@JLBuenoLopez
Refactor Member and ContainerTypeCode to use common applied annotatio…
6738746 
…ns API (eProsima#107)

* Refs #19968: refactor Member and ContainerTypeCode to use common applied member annotations API

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #19968: apply review suggestions

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

---------

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
@richiware
Remove calling with option -cdr (eProsima#109)
21a04f9 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Support to have configuration by STGroup (eProsima#108)
2a59bd2 
* Refs #19960. Support to have config by STGroup

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #19960. Fix conding style.

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #19960. Apply suggestions

Signed-off-by: Ricardo González Moreno <[email protected]>

---------

Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Changeable max size for unbounded containers (eProsima#111)
0b33b3d 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Support for C++ enum class (eProsima#112)
580005c 
* Refs #20063. Support C++ enum class

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #20063. Fix bitmasks

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #20063. Accessing through Context

Signed-off-by: Ricardo González Moreno <[email protected]>

---------

Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Fix missing function (eProsima#113)
8f1ce90 
Signed-off-by: Ricardo González Moreno <[email protected]>
@richiware
Improve in code (eProsima#114)
6928bd3 
Signed-off-by: Ricardo González Moreno <[email protected]>
This was referenced Feb 17, 2024
Merged
Merged
@Ryanf55
Copy link
Collaborator

Ryanf55 commented Feb 17, 2024 •
edited
Loading

Hey there, I just ran a sync in the Github UI for master branch and now see there are conflicts. I've also added the 2.0.x and 3.0.x branches. Do you know if this was re-targetted on a one of those, it would go in cleanly? It would help to understand which branch we are pulling from, or if you manually cherry-picked these commits.

Sorry, this didn't quite go as cleanly as I would have hoped with a sync.

@srmainwaring srmainwaring changed the base branch from master to 2.0.x February 17, 2024 22:28
@srmainwaring
Copy link
Author

srmainwaring commented Feb 17, 2024 •
edited
Loading

It would help to understand which branch we are pulling from, or if you manually cherry-picked these commits.

I created a branch from the submodule commit used in the PR eProsima/Micro-XRCE-DDS-Gen#74, and created the PR from that.

I've switched the target branch to 2.0.x as the sync'd version of master is ahead of that and it looks like the upstream change is based on 2.0.x rather than a later version.

@Ryanf55
Copy link
Collaborator

Ryanf55 commented Feb 17, 2024

Perfect, this is much more clear now. Thanks! I'll update downstream to use this.

@Ryanf55 Ryanf55 merged commit 79eb0f7 into ArduPilot:2.0.x Feb 17, 2024
@srmainwaring srmainwaring deleted the prs/prs-array-size branch February 18, 2024 09:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@srmainwaring @Ryanf55 @richiware @JLBuenoLopez