From c1be57b88f8e5095c3d6afe3abceb4ba1316d832 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Tue, 13 Dec 2022 22:49:46 +0900 Subject: [PATCH] fix tlm apid judgment --- .../src/src_user/Settings/TlmCmd/Ccsds/apid_define.c | 8 ++++---- .../src/src_user/Settings/TlmCmd/Ccsds/apid_define.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 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 index 491c21ed4..450edf42e 100644 --- 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 @@ -5,6 +5,7 @@ * @note common_tlm_cmd_packet.h などから include されることを前提 */ #include "apid_define.h" +#include "../common_tlm_packet_define.h" APID APID_get_apid_from_uint16(uint16_t apid) { @@ -30,12 +31,11 @@ int APID_is_other_obc_tlm_apid(APID apid) { switch (apid) { - case APID_AOBC_TLM: // FALLTHROUGH - case APID_TOBC_TLM: - return 1; + case CTP_APID_FROM_ME: + return 0; default: - return 0; + return 1; } } 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 index 491c21ed4..450edf42e 100644 --- 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 @@ -5,6 +5,7 @@ * @note common_tlm_cmd_packet.h などから include されることを前提 */ #include "apid_define.h" +#include "../common_tlm_packet_define.h" APID APID_get_apid_from_uint16(uint16_t apid) { @@ -30,12 +31,11 @@ int APID_is_other_obc_tlm_apid(APID apid) { switch (apid) { - case APID_AOBC_TLM: // FALLTHROUGH - case APID_TOBC_TLM: - return 1; + case CTP_APID_FROM_ME: + return 0; default: - return 0; + return 1; } }