Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GENERATE TLM での他 OBC からのテレメかどうか判定するための APID 判定ロジックの改善 #474

Merged
merged 1 commit into from
Dec 14, 2022
Merged

GENERATE TLM での他 OBC からのテレメかどうか判定するための APID 判定ロジックの改善 #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Examples/2nd_obc_user/src/src_user/Settings/TlmCmd/Ccsds/apid_define.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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;
}
}

Expand Down
8 changes: 4 additions & 4 deletions Examples/minimum_user/src/src_user/Settings/TlmCmd/Ccsds/apid_define.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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;
}
}

Expand Down