Merge pull request #490 from ut-issl/feature/fix_bug

テレメ生成時のAPID判定のバグ修正
ut-issl · Feb 18, 2023 · 9e04f4d · 9e04f4d
2 parents 4fd9828 + da881a0
commit 9e04f4d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/Examples/2nd_obc_user/src/src_user/Settings/TlmCmd/Ccsds/apid_define.c b/Examples/2nd_obc_user/src/src_user/Settings/TlmCmd/Ccsds/apid_define.c
@@ -31,11 +31,13 @@ int APID_is_other_obc_tlm_apid(APID apid)
 {
   switch (apid)
   {
-  case CTP_APID_FROM_ME:
-    return 0;
+  // FIXME: 2nd obc の場合は変更しなければいけないが， https://github.com/ut-issl/c2a-core/issues/489 で消えるので一旦このまま
+  case APID_AOBC_TLM:   // FALLTHROUGH
+  case APID_TOBC_TLM:
+    return 1;
 
   default:
-    return 1;
+    return 0;
   }
 }
 

diff --git a/Examples/minimum_user/src/src_user/Settings/TlmCmd/Ccsds/apid_define.c b/Examples/minimum_user/src/src_user/Settings/TlmCmd/Ccsds/apid_define.c
@@ -31,11 +31,13 @@ int APID_is_other_obc_tlm_apid(APID apid)
 {
   switch (apid)
   {
-  case CTP_APID_FROM_ME:
-    return 0;
+  // FIXME: 2nd obc の場合は変更しなければいけないが， https://github.com/ut-issl/c2a-core/issues/489 で消えるので一旦このまま
+  case APID_AOBC_TLM:   // FALLTHROUGH
+  case APID_TOBC_TLM:
+    return 1;
 
   default:
-    return 1;
+    return 0;
   }
 }