OnAir Integration Issue - Make not working in example repository #794
Replies: 2 comments 7 replies
-
|
Can you post all the commands you run from |
Beta Was this translation helpful? Give feedback.
-
|
After |
Beta Was this translation helpful? Give feedback.
-
|
There's a few issues with that app. For starters, it depends on Changes to the apps/sch_lab$ git diff
diff --git a/fsw/tables/sch_lab_table.c b/fsw/tables/sch_lab_table.c
index 90920b8..d247ad9 100644
--- a/fsw/tables/sch_lab_table.c
+++ b/fsw/tables/sch_lab_table.c
@@ -30,7 +30,7 @@
#include "ci_lab_msgids.h"
#include "to_lab_msgids.h"
-#include "sample_app_msgids.h"
#if 0
#include "sc_msgids.h"
@@ -57,7 +57,7 @@ SCH_LAB_ScheduleTable_t SCH_TBL_Structure = {.Config = {
{CFE_SB_MSGID_WRAP_VALUE(CFE_TBL_SEND_HK_MID), 4, 0},
{CFE_SB_MSGID_WRAP_VALUE(CI_LAB_SEND_HK_MID), 4, 0},
{CFE_SB_MSGID_WRAP_VALUE(TO_LAB_SEND_HK_MID), 4, 0},
- {CFE_SB_MSGID_WRAP_VALUE(SAMPLE_APP_SEND_HK_MID), 4, 0},
#if 0
{CFE_SB_MSGID_WRAP_VALUE(SC_SEND_HK_MID), 4, 0},
{CFE_SB_MSGID_WRAP_VALUE(SC_1HZ_WAKEUP_MID), 1, 0}, /* Example of a 1hz packet */Changes to the TO app: apps/to_lab$ git diff
diff --git a/fsw/tables/to_lab_sub.c b/fsw/tables/to_lab_sub.c
index c1ea327..4cf0382 100644
--- a/fsw/tables/to_lab_sub.c
+++ b/fsw/tables/to_lab_sub.c
@@ -42,7 +42,7 @@
#include "to_lab_msgids.h"
#include "ci_lab_msgids.h"
-#include "sample_app_msgids.h"
#if 0
#include "hs_msgids.h"
@@ -56,7 +56,7 @@ TO_LAB_Subs_t TO_LAB_Subs = {.Subs = {/* CFS App Subscriptions */
{CFE_SB_MSGID_WRAP_VALUE(TO_LAB_HK_TLM_MID), {0, 0}, 4},
{CFE_SB_MSGID_WRAP_VALUE(TO_LAB_DATA_TYPES_MID), {0, 0}, 4},
{CFE_SB_MSGID_WRAP_VALUE(CI_LAB_HK_TLM_MID), {0, 0}, 4},
- {CFE_SB_MSGID_WRAP_VALUE(SAMPLE_APP_HK_TLM_MID), {0, 0}, 4},
#if 0
/* Add these if needed */Changes in the main tree (ignoring dirty submodules): $ git diff
diff --git a/cfs_onair_defs/cpu1_cfe_es_startup.scr b/cfs_onair_defs/cpu1_cfe_es_startup.scr
index 2c4a9ff..4fb5015 100644
--- a/cfs_onair_defs/cpu1_cfe_es_startup.scr
+++ b/cfs_onair_defs/cpu1_cfe_es_startup.scr
@@ -1,11 +1,11 @@
CFE_LIB, cfe_assert, CFE_Assert_LibInit, ASSERT_LIB, 0, 0, 0x0, 0;
-CFE_LIB, sample_lib, SAMPLE_LIB_Init, SAMPLE_LIB, 0, 0, 0x0, 0;
-CFE_APP, sample_app, SAMPLE_APP_Main, SAMPLE_APP, 50, 16384, 0x0, 0;
CFE_APP, ci_lab, CI_Lab_AppMain, CI_LAB_APP, 60, 16384, 0x0, 0;
CFE_APP, to_lab, TO_Lab_AppMain, TO_LAB_APP, 70, 16384, 0x0, 0;
CFE_APP, sch_lab, SCH_Lab_AppMain, SCH_LAB_APP, 80, 16384, 0x0, 0;
CFE_APP, sbn, SBN_AppMain, SBN, 70, 16384, 0x0, 0;
!
! Startup script fields:
! 1. Object Type -- CFE_APP for an Application, or CFE_LIB for a library.
! 2. Path/Filename -- This is a cFE Virtual filename, not a vxWorks device/pathname
diff --git a/cfs_onair_defs/targets.cmake b/cfs_onair_defs/targets.cmake
index d7452e2..7c98fc4 100644
--- a/cfs_onair_defs/targets.cmake
+++ b/cfs_onair_defs/targets.cmake
@@ -86,7 +86,7 @@ SET(SPACECRAFT_ID 0x42)
# and must be loaded explicitly via startup script or command.
# This list is effectively appended to every TGTx_APPLIST in targets.cmake.
# Example:
-list(APPEND MISSION_GLOBAL_APPLIST sample_app sample_lib sbn sbn_tcp sbn_client onair_app)
+list(APPEND MISSION_GLOBAL_APPLIST sbn sbn_tcp sbn_client onair_app)
# The "MISSION_GLOBAL_STATIC_APPLIST" is similar to MISSION_GLOBAL_APPLIST
# but the apps are statically linked. |
Beta Was this translation helpful? Give feedback.
-
This doesn't look right to me. When I update on my side, a lot of submodules get updated. I'd check the |
Beta Was this translation helpful? Give feedback.
-
|
We have started to follow the OnAir guide for linking cFS and OnAir using their repository they gave, and following the instructions on installing and running it according to that guide. We encountered another issue, after creating the docker image and attaching to the container and running
But when I go to the The cpu1 directory is nowhere to be found, and I can't start cFS. |
Beta Was this translation helpful? Give feedback.
-
|
I was able to recreate this same issue. The branch, OnAIR-integration, has its own submodules and versions. These need to be initialized and updated before creating the container. I had a difficult time reworking the repository and container after having seen this issue, so I recommend removing starting from the beginning, remove the repository and any container or image in docker. After removing everything, this is the command sequence that worked for me: Here is my submodule status: |
Beta Was this translation helpful? Give feedback.
-
|
Amazing, thank you so much. I was able to follow your steps and get cFS working. I think that the OnAIR guide should be modified to include these additional steps. |
Beta Was this translation helpful? Give feedback.
-
|
I could be wrong but I believe you can collapse the initial steps by doing: This is what I get: After that, you should just need to do: |
Beta Was this translation helpful? Give feedback.
-
When running the-other-james's OnAir integration repository we are getting the following error after doing Make:
Any advice on how to fix this issue?
Beta Was this translation helpful? Give feedback.
All reactions