Skip to content

Merge msgs - #10

Merged
PastorD merged 208 commits into
mainfrom
merge-msgs
May 4, 2026
Merged

PastorD merged 208 commits into
mainfrom
merge-msgs

Conversation

@PastorD

@PastorD PastorD commented Apr 29, 2026

Copy link
Copy Markdown
Contributor

Consolidate fcat and fcat_msgs into a single repository for easier development.

  • remove issues when fcat or fcat_msgs are not syncronized
  • simplify deployment

Each package remains its own ros2 package. This structure allows to add more packages related to fcat in the future. Moving back fcat_msgs in the future if it is needed.

Keep history with

  • git mv for fcat files
  • git subtree for fcat_msgs
git remote add fcat-msgs-remote git@github.com:nasa-jpl/fcat_msgs.git
git fetch fcat-msgs-remote
git subtree add --prefix=fcat_msgs fcat-msgs-remote main

Adjust github action workflow now fcat_msgs is inside the repo. Remove local deb package of python3-cogapp

No other changes besides merging msgs

bump:minor

@JosephBowkett @kwehage @preston-rogers @dwai-wai

FAQ: what about if another project only needs fcat or fcat_msgs?
They can ignore the package they don't need by using --packages-up-to their package, or COLCON_IGNORE marker

alex-brinkman and others added 30 commits June 9, 2020 09:02
…, changed package name to fcat_msgs_ros2 in package.xml, changed file path to messages in CMakeLists.txt, and changed actual_current data type in EgdState.msg.
…e to 'msg' from 'msgs' to avoid confusion.
…3208 devices. Also adjusted the CommanderState message type to match new behavior.
…rtualFtsState messages. Also changed contents of EgdProfPosCmd message.
…use arrays, because that doesn't seem to work.
…. The latter controls which state messages get published by fcat_wrapper. Also added current state of each state message setting to ModuleState.
casah-dev and others added 22 commits June 4, 2025 23:05
Adding el2828 driver

See merge request casah/rosx/fcat_msgs!38
Adding el2828 driver

See merge request casah/rosx/fcat_msgs!38
Kwehage el3314

See merge request casah/rosx/fcat_msgs!39
Kwehage el3314

See merge request casah/rosx/fcat_msgs!39
Prestonr add el5042

See merge request casah/rosx/fcat_msgs!41
Prestonr add el5042

See merge request casah/rosx/fcat_msgs!41
Add csv and cst multi message definitions

See merge request casah/rosx/fcat_msgs!43
Add csv and cst multi message definitions

See merge request casah/rosx/fcat_msgs!43
git-subtree-dir: fcat_msgs
git-subtree-mainline: 06105af
git-subtree-split: a9e7646
@PastorD
PastorD requested review from a team and JosephBowkett April 29, 2026 18:04
Co-authored-by: Copilot <copilot@github.com>
@JosephBowkett

Copy link
Copy Markdown
Collaborator

@PastorD put bump:major or bump:minor into the PR description text so that the semantic version will update based on the changes. Might be minor, given is just a a packaging change?

Otherwise it looks good to me!

@JosephBowkett JosephBowkett left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

looks good, CI passes, good to know we can CI them side by side now

@PastorD
PastorD merged commit ecae32e into main May 4, 2026
3 of 4 checks passed
@PastorD
PastorD deleted the merge-msgs branch May 4, 2026 22:08
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.

7 participants