Skip to content

Part #686, Update cFS Bundle for v7.0.1#8

Merged
dzbaker merged 43 commits into
mainfrom
dev
May 11, 2026
Merged

Part #686, Update cFS Bundle for v7.0.1#8
dzbaker merged 43 commits into
mainfrom
dev

Conversation

@dzbaker
Copy link
Copy Markdown
Contributor

@dzbaker dzbaker commented Apr 7, 2026

This PR brings together the latest patches for cFS-COSMOS-Plugin.

Zogby and others added 30 commits April 2, 2026 15:04
Part cFS/Documents#11, Merge Internal Updates
…nternal-workflows

Part cFS/workflows#122, Add Internal Workflows
…emetry-tests

Fix #110: Finish adding cFS LC cmd and telemetry tests
…acket Definition Files

Squashed commit of the following:

commit 3536acd71facd4d84c45a9c104425083c7541e04
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Fri Apr 10 14:39:53 2026 -0400

    Fix #91, Made SB tests pass so uncomment them, remove debugging output

commit 6ffb75c3b53263b5635340f1aae3008b99c62979
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Fri Apr 10 13:52:19 2026 -0400

    Fix #91, Add a guard against applications without EDS implemented, so they don't get tested

commit 5ec70b19438f821b3c6a9c3acc6b7cb8f5b91f7e
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Fri Apr 10 10:47:13 2026 -0400

    Fix #91, Comment out failing SB tests

commit dff3512953f740a6aa088f84c030dda8ead67a19
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Fri Apr 10 09:29:00 2026 -0400

    Fix #91, Remove testing artifact

commit 85b5092e82cc9357c4c5a0ddd3f31568207a5917
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Thu Apr 9 16:18:29 2026 -0400

    Fix #91, Mention the new cfs_eds_enabled variable in the plugin

commit 3f716897efe5f59ab51feaf443548c7da704e3eb
Merge: 2447b4f 0b5e564
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Thu Apr 9 16:15:12 2026 -0400

    Merge branch 'dev' of developer.nasa.gov:cFS/cfs-cosmos-plugin into fix-91-update-cmd-tlm-list-for-eds

commit 2447b4f23c23b8e20a3afc5f0349983e3a08ca06
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Thu Apr 9 14:27:22 2026 -0400

    Fix #91, Fix order of AP results

commit 3bfc1c6e749480d219d85826e2bd4b97c6baed40
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Thu Apr 9 14:26:27 2026 -0400

    Fix #91, Remove comments from commands and tlm

commit e2ec85fdbadfbdfdff434c9542058cd468c569c3
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Thu Apr 9 11:44:38 2026 -0400

    Fix #91, Use python class functions properly

commit 58c89511330315c76c84e9dc943c86fed884677a
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Thu Apr 9 11:44:26 2026 -0400

    Fix #91, Fix LC command error counter mnemonic

commit 62b58a052aff4c8962914aa1bbdc6d0e36230491
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Wed Apr 8 16:17:28 2026 -0400

    Fix #91, Adjust DS command padding

commit f87ece49ddc3bfa1d381376b345f7ccb82537e6a
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Wed Apr 8 13:44:37 2026 -0400

    Fix #91, Remove unused padding for CI_LAB hk

commit 3733af5decee0c029edafede1062a5612002433e
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Wed Apr 8 12:18:25 2026 -0400

    Fix #91, Make packet header padding permanent

commit e156a2b356f542a0f6a6c28b14472249e0c4d566
Merge: b314b98 c505ffd
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Wed Apr 8 12:08:54 2026 -0400

    Merge branch 'dev' of developer.nasa.gov:cFS/cfs-cosmos-plugin into fix-91-update-cmd-tlm-list-for-eds

commit b314b98d03b4eb6ca8cf68260295e3922a008eb1
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Wed Apr 8 12:05:18 2026 -0400

    Fix #91, Put in waits for an SC tlm packet every time the command counter is evaluated

commit 242533be5d4c0cd3e59a6a45b07f39dbc02d0a09
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Wed Apr 8 12:03:57 2026 -0400

    Fix #91, Fix telemetry point and command param names

commit 6ea1d70a176901483df691cb3dd4de92ec475dda
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Wed Apr 8 12:03:34 2026 -0400

    Fix #91, Change order of tests to successfully perform checksum of tables

commit 3271ba8f9458d2ff48cd03f8b0a6b25769f505df
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Wed Apr 8 12:00:43 2026 -0400

    Fix #91, Fix name of SBN send hk command

commit 2e43c5273854be9df3cc98a7177accee05da70fe
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Tue Apr 7 13:12:48 2026 -0400

    Fix #91, Add back missing SBN send HK command

commit 3c51f1a22e8956ff58d21a5f9131aa3cccadfcb1
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Mon Apr 6 10:55:02 2026 -0400

    Fix #91, Correct name of LC set LC state command test

commit 3b1eddd34d1d5c22a33657d2707b3399465d46dd
Merge: 92ca054 e1ddf1d
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Mon Apr 6 10:40:54 2026 -0400

    Fix #91, Update MM packet defs via dev

commit 92ca05444011edf6006bf1b53bea5cb00bc0fbd5
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Thu Apr 2 14:10:22 2026 -0400

    Fix #91, Fix table registry packet size mismatch

commit 8d66efcd5f3b48c8e82674b29f154da9057d71c6
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Wed Apr 1 12:50:54 2026 -0400

    Fix #91, Fix CS mnemonics

commit 89e3f192f0ec5bb57cadfb9167398a5b218576fb
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Tue Mar 31 12:04:29 2026 -0400

    Fix #91, Restore CFE_TBL integration test

commit b9dea11b34cf38d7531dac3344ab9740a2be423c
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Tue Mar 31 12:04:12 2026 -0400

    Fix #91, Consolidate padding into an item array

commit 3f317a44f474f9b07f813117c0cc67f701af8156
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Tue Mar 31 12:03:42 2026 -0400

    Fix #91, Rename COMMAND_ERR_COUNTER to COMMAND_ERROR_COUNTER

commit 3670b60148f53b447f238b1120360a44795b284f
Merge: ae25a7b 660a23f
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Tue Mar 31 10:23:58 2026 -0400

    Fix #91, Fix merge conflicts

commit ae25a7b0eca21868395b787cd2a97f82ceede9ad
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Tue Mar 31 10:09:25 2026 -0400

    Fix #91, Fix Send HK command names to match cfs_cmd_tlm_list.rb

commit 7a5e6ac4b1e88f13f38236a098553591794a5a6c
Merge: b966c4c 141a50e
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Mon Mar 30 15:57:43 2026 -0400

    Merge branch 'dev' of developer.nasa.gov:cFS/cfs-cosmos-plugin into fix-91-update-cmd-tlm-list-for-eds

commit b966c4ca7796c8b0eeabecaa5dabeb26187dc2a2
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Mon Mar 30 15:19:15 2026 -0400

    Fix #91, Put back Send HK command, consolidate padding, match mnemonics with source code

commit a3e9a837f81dfd115c89cb9c33f7e428f24e3d76
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Fri Mar 27 15:51:57 2026 -0400

    Fix #91, Any packet padding should be named padding

commit a572051e7ae3195d6b9c670f7559a1ff9a9f7bb3
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Fri Mar 27 15:49:47 2026 -0400

    Fix #91, SC command padding doesn't need to be sequential

commit 78331e867da1827752039b8d2c7ab52ff58b3ef7
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Fri Mar 27 15:48:14 2026 -0400

    Fix #91, Remove app_name where appropriate

commit 76e2e3b5cc4d194bf026c93a5a0d8396534acef8
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Fri Mar 27 15:38:13 2026 -0400

    Fix #91, Remove PERM_OFF variable

commit 96252654f7e6d5962113d959cbdb5adae4f347c1
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Thu Mar 26 15:10:42 2026 -0400

    Fix #91, Update FM to match source code

commit f7b89adef3df783f39877ac7cada8bde45d84149
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Tue Mar 24 17:02:36 2026 -0400

    Fix #91, Optimize placement of padding

commit 0dee9d84074139e15259c31d7af6594e1a5b2dfc
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Tue Mar 24 11:59:21 2026 -0400

    Fix #91, Line up explicit padding from message definitions

commit 9d333eff27d7ec75f045c471fbad6e677f420296
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Fri Mar 20 11:35:08 2026 -0400

    Fix #91, Modify more tlm/cmd names and do some clean up

commit 31bae7fcb8ac95999581a61aca3325960d49b79a
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Wed Mar 18 10:23:01 2026 -0400

    Fix #91, Fix pkt defs and their uses to match up with FSW

commit 032410297de3be53389302e8118832aed60aeb47
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Thu Mar 12 10:27:11 2026 -0400

    Fix #91, Fix alignment of telemetry packets

commit fd4d06e43c1bcd4f3c1d5df838b3a67758291243
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Tue Mar 3 10:46:48 2026 -0500

    Fix #91, Use STATEs and default packet def files as well as update packet member names

commit 0fbf5b2c855c8e7aa0e5935e6a8b2aec55d74aeb
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Mon Mar 2 15:51:00 2026 -0500

    Fix #91, Make tweaks so gem can build

commit b9e8ac0dae653e705c04d7a1987e2383edae2e63
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Mon Mar 2 15:33:48 2026 -0500

    Fix #91, Fix differences in EDS and non-EDS versions of packet definitions

commit b904b8bb3c482f9e331263e56ece71bf68adde86
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Mon Feb 23 16:18:03 2026 -0500

    Fix #91, Fix TBL integration test to work on EDS build

commit d718b6f063cc71eab782e0e16bb6003c27c5af49
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Mon Feb 23 16:01:30 2026 -0500

    Fix #91, Fix SB integration test to work on EDS build

commit 95a0c5860916f690f5cf706ceb806e2781d3a513
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Mon Feb 23 16:00:52 2026 -0500

    Fix #91, Use variables to represent overwriting or discarding logs

commit e7ef07dced8c7195bc85f179eb43c07439b520cc
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Mon Feb 23 15:00:49 2026 -0500

    Fix #91, Adjust LC integration test to work with EDS build

commit 93f26898a0864b6fce042670cc0cdf07a24e446c
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Mon Feb 23 14:59:31 2026 -0500

    Fix #91, Simplify hex numbers that represent event types

commit fa3452bdc3a0d8626d1fddb8b977ff0c195752c4
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Mon Feb 23 14:58:03 2026 -0500

    Fix #91, Adjust ES integration test to work with EDS build

commit 01ae6b67ee1c8afd006fcc52e0d0fc35bf61f19b
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Fri Feb 20 11:57:07 2026 -0500

    Fix #91, Update telemetry point names and expected values

commit 0c42cf51bc33b4ea2b338d9298e1d7d88f661f66
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Thu Feb 19 15:52:58 2026 -0500

    Fix #91, do not use states for event bit mask args, since more than one event type can be given

commit a66a460c12b54ffb6a71982d8eb003abccd66503
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Wed Feb 18 15:18:26 2026 -0500

    Fix #91, make stream IDs work for EDS build

commit c89a743c4ada0e3e6fe82f165815a6477bc2d0a8
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Tue Feb 17 15:42:22 2026 -0500

    Fix #91, remove EDS check for msg IDs

commit b08683ea7c47022d9db14180d00a85baad0efa75
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Tue Feb 17 09:30:36 2026 -0500

    Fix #91, Remove EDS specific stream IDs

commit 2904c2032628aae05bd70cf3e0b2b0360b1f0023
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Tue Feb 10 13:20:23 2026 -0500

    Fix #91, allow different stream ID for EDS packets

commit a1e41485ec798e2aee8a18f02979db200c37bb88
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Tue Feb 10 13:18:29 2026 -0500

    Fix #91, provide variable for EDS enabling

commit 46d1553fa8b059aedbe2a00a2f0978aa6d877a8f
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Mon Feb 9 13:29:39 2026 -0500

    Fix #91, add CFE test case packet

commit 31001d772bc80c5317a582513b0065c056717dfb
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Mon Feb 9 10:15:51 2026 -0500

    Fix #91, fix names of commands to match source code

commit d3ad2029237d49a20dd38c83b46c631fd01988d1
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Mon Feb 9 09:57:46 2026 -0500

    Fix #91, add to_lab data types telemetry packet

commit 39d8e5d7ce9f0852f59a88200c4680c129712f8d
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Mon Feb 9 09:55:52 2026 -0500

    Fix #91, update name of commands run in integration tests

commit 36293f5f3c40c75dd2bfb2a11201af2fcac9ce01
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Mon Feb 9 09:55:23 2026 -0500

    Fix #91, tbl is not fully spelled out

commit 0f1167cda4e61ad0539222336ab25731f9543be7
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Fri Feb 6 12:49:20 2026 -0500

    Fix #91, update command definition files to have commands match command handler names

commit efb91cd97d3b56ac3b73043a56bb7bace4dd786e
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Fri Feb 6 12:36:02 2026 -0500

    Fix #91, make SC command names match command handlers and add missing command

commit 9d26f93109351e83379432b9894dbd0072f64934
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Fri Feb 6 12:33:00 2026 -0500

    Fix #91, rename MM commands to match their command handler functions

commit bbfc861fab229bc11bce37c7495f9c2cbdf09313
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Fri Feb 6 12:02:19 2026 -0500

    Fix #91, rename LC command

commit 1ca665657e46604c8d7e87df0791056afddc53f9
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Fri Feb 6 11:03:25 2026 -0500

    Fix #91, missed some HS command renames

commit 3cbb005d9d9f26a5974c2667caf3bc35916279cd
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Fri Feb 6 10:45:35 2026 -0500

    Fix #91, update command names in HS integration test

commit f8003df0dd62dde46cd160c73d272affa4f582c9
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Thu Feb 5 17:00:06 2026 -0500

    Fix #91, update LC command definitions to match source code

commit 831e38993c91cb219cb37831799dd7717123ffbc
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Thu Feb 5 16:59:35 2026 -0500

    Fix #91, update HK command definitions to match source code

commit edfc33dc9b8568f5c027192c383be9cead334635
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Thu Feb 5 16:58:25 2026 -0500

    Fix #91, update HS command packet definition to mirror source code

commit 928694e4559c68e1c01e02ca4f3183e05550fc1c
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Thu Feb 5 16:54:10 2026 -0500

    Fix #91, make LC command in list match command function name

commit c3055d30e7211b308b6ec6fa7b5c4d2688c4cc49
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Thu Feb 5 16:44:30 2026 -0500

    Fix #91, make HS commands mirror command handler signatures

commit d937631193c960a7f95bc87ac0b10e908c39a46b
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Thu Feb 5 16:07:40 2026 -0500

    Fix #91, add the app the combined HK packet is scoped to

commit 4ec5889e08629d2e0139157e42b030b90b40c1f4
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Thu Feb 5 14:54:08 2026 -0500

    Fix #91, modify name of FM freespace monitor packet name to match EDS generated packet name

commit d514a30df9ecaac045dedde8d847cf5627d24554
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Thu Feb 5 11:46:15 2026 -0500

    Fix #91, use the names of the CS command functions for cmd headers

commit 242446904489ebec4f0227d1cedc93ea10fd31b2
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Thu Feb 5 11:38:22 2026 -0500

    Update names of CS commands
jphickey and others added 13 commits April 29, 2026 13:13
Updates the RTS status fields to match the TLM change
Squashed commit of the following:

commit bf5779f46107b73152319029d1aeb8372fa96c69
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Tue Apr 28 14:50:34 2026 -0400

    Fix #131, Refactor CF tlm packet def

commit dcf3461f915e2380088a16ac5249776c8eef4a51
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Tue Apr 28 10:05:39 2026 -0400

    Fix #131, Undo Overwrite of MM Command Arguments

    Squashed commit of the following:

    commit 83049f87f2268487e6addea5440049a462aa3b04
    Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
    Date:   Tue Apr 28 10:05:01 2026 -0400

        Fix #131, Switch padding to array

    commit b3735b44c5906a7f2865dfc5179d3d6b324fb61f
    Merge: 9b53f17 79bb349
    Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
    Date:   Tue Apr 28 10:04:40 2026 -0400

        Merge branch 'fix-131-undo-mm-cmd-def-overwrite' of developer.nasa.gov:cFS/cfs-cosmos-plugin into fix-131-undo-mm-cmd-def-overwrite

    commit 9b53f176bed6fc773fb2bcd96ebc9faaf4dace34
    Merge: 1cd731c 241bd99
    Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
    Date:   Tue Apr 28 10:03:58 2026 -0400

        Merge branch 'dev' of developer.nasa.gov:cFS/cfs-cosmos-plugin into fix-131-undo-mm-cmd-def-overwrite

    commit 79bb3490d7803e51a28809da4b1c5450f73ec74d
    Author: Molock, Dwaine S 550328410 <dwaine.s.molock@nasa.gov>
    Date:   Mon Apr 27 16:22:25 2026 -0400

        Fix #131, Update MM Command and Screen definitions

    commit 1cd731c29176dea4edc344f97baef942b36e5345
    Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
    Date:   Mon Apr 20 16:39:22 2026 -0400

        Fix #131, add correct size for MM_MemType_Enum_t
Fix cFS/cFS#686, Merge v7.0.1 Internal Updates
Fix #154, fm test cases (internally tracked issue)
@dzbaker dzbaker changed the title Part cFS/Documents#11, Merging Development Branch Part #686, Update cFS Bundle for v7.0.1 May 11, 2026
@dzbaker dzbaker requested a review from jphickey May 11, 2026 18:02
@arielswalker arielswalker self-requested a review May 11, 2026 20:11
@dzbaker dzbaker merged commit 358339d into main May 11, 2026
1 check passed
@chillfig chillfig added this to the v7.0.1 milestone May 13, 2026
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.

9 participants