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

5 -> 6 #1339

Merged
merged 8 commits into from
Feb 15, 2022
Merged

5 -> 6 #1339

merged 8 commits into from
Feb 15, 2022

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Feb 14, 2022

➡️ Forward port

Port ign-gazebo5 to ign-gazebo6

Branch comparison: ign-gazebo6...ign-gazebo5

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

ahcorde and others added 7 commits February 4, 2022 09:36
* Add elevator system

Closes #420

Signed-off-by: Nick Lamprianidis <[email protected]>

* Limit line length for transition table

Signed-off-by: Nick Lamprianidis <[email protected]>

* Add PRIVATE_INCLUDE_DIRS argument to gz_add_system

Signed-off-by: Nick Lamprianidis <[email protected]>

* Add afsm and metapushkin libraries

Signed-off-by: Nick Lamprianidis <[email protected]>

* Add namespace to events, actions and guards

Signed-off-by: Nick Lamprianidis <[email protected]>

* Migrate to afsm

Signed-off-by: Nick Lamprianidis <[email protected]>

* Fixes

Signed-off-by: Nick Lamprianidis <[email protected]>

Co-authored-by: Nate Koenig <[email protected]>
Signed-off-by: Ian Chen <[email protected]>

Co-authored-by: Steve Peters <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
@iche033 iche033 requested a review from chapulina as a code owner February 14, 2022 22:06
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Feb 14, 2022
@codecov
Copy link

codecov bot commented Feb 15, 2022

Codecov Report

Merging #1339 (12ea34a) into ign-gazebo6 (7901903) will increase coverage by 0.71%.
The diff coverage is 88.83%.

Impacted file tree graph

@@               Coverage Diff               @@
##           ign-gazebo6    #1339      +/-   ##
===============================================
+ Coverage        62.07%   62.78%   +0.71%     
===============================================
  Files              278      299      +21     
  Lines            23378    24023     +645     
===============================================
+ Hits             14511    15083     +572     
- Misses            8867     8940      +73     
Impacted Files Coverage Δ
src/gui/plugins/shapes/Shapes.cc 52.63% <ø> (ø)
src/systems/elevator/ElevatorCommonPrivate.hh 0.00% <0.00%> (ø)
src/systems/elevator/ElevatorStateMachine.hh 0.00% <0.00%> (ø)
src/systems/elevator/utils/DoorTimer.hh 0.00% <0.00%> (ø)
src/systems/elevator/utils/JointMonitor.hh 0.00% <0.00%> (ø)
...elevator/state_machine/ElevatorStateMachineImpl.hh 73.52% <73.52%> (ø)
.../systems/elevator/vender/afsm/include/afsm/fsm.hpp 78.78% <78.78%> (ø)
src/systems/elevator/Elevator.cc 86.52% <86.52%> (ø)
...vator/vender/afsm/include/afsm/detail/observer.hpp 87.50% <87.50%> (ø)
...evator/vender/afsm/include/afsm/detail/actions.hpp 90.24% <90.24%> (ø)
... and 13 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7901903...12ea34a. Read the comment docs.

@iche033 iche033 merged commit 862c0f9 into ign-gazebo6 Feb 15, 2022
@iche033 iche033 deleted the merge_5_6_20220214 branch February 15, 2022 19:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏯 fortress Ignition Fortress
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants