TiagoRG
/
it2s-itss-facilities
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix DCM trajectory check

This commit is contained in:
emanuel 2022-02-07 18:05:39 +00:00
parent 9c2809a3ff
commit 6ee35b45b5
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/dcm.c
View File

@ -61,7 +61,7 @@ int dcm_check(void* fc, DCM_t* dcm) {
it2s_tender_lock_trajectory(&facilities->epv); it2s_tender_lock_trajectory(&facilities->epv);
trajectoryA_len = facilities->epv.trajectory.len; trajectoryA_len = facilities->epv.trajectory.len;
memcpy(trajectoryA + sizeof(it2s_tender_st_s), facilities->epv.trajectory.path, trajectoryA_len * sizeof(it2s_tender_st_s)); memcpy(&trajectoryA + sizeof(it2s_tender_st_s), facilities->epv.trajectory.path, trajectoryA_len * sizeof(it2s_tender_st_s));
it2s_tender_unlock_trajectory(&facilities->epv); it2s_tender_unlock_trajectory(&facilities->epv);
trajectoryA[0].latitude = lat; trajectoryA[0].latitude = lat;
@ -74,6 +74,7 @@ int dcm_check(void* fc, DCM_t* dcm) {
asn_INTEGER2ulong(&dcm->dcm.currentPosition.timestamp, &trajectoryB[0].timestamp); asn_INTEGER2ulong(&dcm->dcm.currentPosition.timestamp, &trajectoryB[0].timestamp);
++trajectoryB_len; ++trajectoryB_len;
for (int i = 0; i < dcm->dcm.plannedTrajectory.list.count && i < TRAJECTORY_MAX_LEN; ++i) { for (int i = 0; i < dcm->dcm.plannedTrajectory.list.count && i < TRAJECTORY_MAX_LEN; ++i) {
syslog_err("I=%d", i);
trajectoryB[i+1].latitude = dcm->dcm.plannedTrajectory.list.array[i]->latitude; trajectoryB[i+1].latitude = dcm->dcm.plannedTrajectory.list.array[i]->latitude;
trajectoryB[i+1].longitude = dcm->dcm.plannedTrajectory.list.array[i]->longitude; trajectoryB[i+1].longitude = dcm->dcm.plannedTrajectory.list.array[i]->longitude;
asn_INTEGER2ulong(&dcm->dcm.plannedTrajectory.list.array[i]->timestamp, &trajectoryB[i+1].timestamp); asn_INTEGER2ulong(&dcm->dcm.plannedTrajectory.list.array[i]->timestamp, &trajectoryB[i+1].timestamp);

2
src/facilities.c
View File

@ -129,7 +129,7 @@ static int transport_indication(facilities_t *facilities, void* responder, void*
break; break;
default: default:
syslog_debug("[facilities] messsage with unhandled BTP port received, ignoring"); syslog_debug("[facilities] messsage with unhandled BTP port received (%ld), ignoring", tpi->choice.btp.destinationPort);
goto cleanup; goto cleanup;
} }