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

Treat UAS ID Types based on data type accordingly #139

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Treat UAS ID Types based on data type accordingly #139

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
22 changes: 14 additions & 8 deletions RemoteIDModule/RemoteIDModule.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,15 @@ static void set_data(Transport &t)
strnlen((const char *)basic_id.uas_id, 20) > 0) {
g.set_by_name_uint8("UAS_TYPE", basic_id.ua_type);
g.set_by_name_uint8("UAS_ID_TYPE", basic_id.id_type);
char uas_id[21] {};
ODID_COPY_STR(uas_id, basic_id.uas_id);
g.set_by_name_string("UAS_ID", uas_id);
if (basic_id.id_type == 1 || basic_id.id_type == 2) {
// Serial Numbers and CAA Assigned can be treated like strings
char uas_id[21] {};
ODID_COPY_STR(uas_id, basic_id.uas_id);
g.set_by_name_string("UAS_ID", uas_id); // this internally does a strncpy()
} else {
// any other ID Type should be treated as bytes
memcpy(g.uas_id, basic_id.uas_id, 20);
}
}
}

Expand All @@ -228,15 +234,15 @@ static void set_data(Transport &t)
// from parameters
UAS_data.BasicID[0].UAType = (ODID_uatype_t)g.ua_type;
UAS_data.BasicID[0].IDType = (ODID_idtype_t)g.id_type;
ODID_COPY_STR(UAS_data.BasicID[0].UASID, g.uas_id);
memcpy(UAS_data.BasicID[0].UASID, g.uas_id, 20);
UAS_data.BasicIDValid[0] = 1;

// BasicID 2
if (g.have_basic_id_2_info()) {
// from parameters
UAS_data.BasicID[1].UAType = (ODID_uatype_t)g.ua_type_2;
UAS_data.BasicID[1].IDType = (ODID_idtype_t)g.id_type_2;
ODID_COPY_STR(UAS_data.BasicID[1].UASID, g.uas_id_2);
memcpy(UAS_data.BasicID[1].UASID, g.uas_id_2, 20);
UAS_data.BasicIDValid[1] = 1;
} else if (strcmp((const char*)g.uas_id, (const char*)basic_id.uas_id) != 0) {
/*
Expand All @@ -248,7 +254,7 @@ static void set_data(Transport &t)
strnlen((const char *)basic_id.uas_id, 20) > 0) {
UAS_data.BasicID[1].UAType = (ODID_uatype_t)basic_id.ua_type;
UAS_data.BasicID[1].IDType = (ODID_idtype_t)basic_id.id_type;
ODID_COPY_STR(UAS_data.BasicID[1].UASID, basic_id.uas_id);
memcpy(UAS_data.BasicID[1].UASID, basic_id.uas_id, 20);
UAS_data.BasicIDValid[1] = 1;
}
}
Expand All @@ -261,12 +267,12 @@ static void set_data(Transport &t)
if (strcmp((const char*)UAS_data.BasicID[0].UASID, (const char*)basic_id.uas_id) != 0 && strnlen((const char *)basic_id.uas_id, 20) > 0) {
UAS_data.BasicID[1].UAType = (ODID_uatype_t)basic_id.ua_type;
UAS_data.BasicID[1].IDType = (ODID_idtype_t)basic_id.id_type;
ODID_COPY_STR(UAS_data.BasicID[1].UASID, basic_id.uas_id);
memcpy(UAS_data.BasicID[1].UASID, basic_id.uas_id, 20);
UAS_data.BasicIDValid[1] = 1;
} else {
UAS_data.BasicID[0].UAType = (ODID_uatype_t)basic_id.ua_type;
UAS_data.BasicID[0].IDType = (ODID_idtype_t)basic_id.id_type;
ODID_COPY_STR(UAS_data.BasicID[0].UASID, basic_id.uas_id);
memcpy(UAS_data.BasicID[0].UASID, basic_id.uas_id, 20);
UAS_data.BasicIDValid[0] = 1;
}
}
Expand Down