Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
artoa4argo
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
argoTools
artoa4argo
Commits
6dff5e3d
Commit
6dff5e3d
authored
4 years ago
by
leprob001
Browse files
Options
Downloads
Patches
Plain Diff
The predictFromGps function is now using rtc date if sat date is not available.
parent
ab6f3553
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
VERSION
+1
-1
1 addition, 1 deletion
VERSION
lib/+artoa/+toa/predictFromGps.m
+16
-5
16 additions, 5 deletions
lib/+artoa/+toa/predictFromGps.m
with
17 additions
and
6 deletions
VERSION
+
1
−
1
View file @
6dff5e3d
237
238
\ No newline at end of file
\ No newline at end of file
This diff is collapsed.
Click to expand it.
lib/+artoa/+toa/predictFromGps.m
+
16
−
5
View file @
6dff5e3d
...
@@ -66,11 +66,22 @@ launchDateToa(2) = predictToa(pRfb.FLOAT.launchpos);
...
@@ -66,11 +66,22 @@ launchDateToa(2) = predictToa(pRfb.FLOAT.launchpos);
for
o
=
1
:
gpsMeasurementCount
for
o
=
1
:
gpsMeasurementCount
currentGpsPosition
=
[
gpsData
(
o
,
pRfb
.
SAT_FORMAT
.
lat_sat
),
gpsData
(
o
,
pRfb
.
SAT_FORMAT
.
lon_sat
)];
currentGpsPosition
=
[
gpsData
(
o
,
pRfb
.
SAT_FORMAT
.
lat_sat
),
gpsData
(
o
,
pRfb
.
SAT_FORMAT
.
lon_sat
)];
gpsRafosDates
(
o
)
=
artoa
.
convert
.
dmy2rd
(
...
% check if sat date is available
gpsData
(
o
,
pRfb
.
SAT_FORMAT
.
day_sat
),
...
if
~
isnan
(
gpsData
(
o
,
pRfb
.
SAT_FORMAT
.
day_sat
))
...
gpsData
(
o
,
pRfb
.
SAT_FORMAT
.
month_sat
),
...
&
~
isnan
(
gpsData
(
o
,
pRfb
.
SAT_FORMAT
.
month_sat
))
...
gpsData
(
o
,
pRfb
.
SAT_FORMAT
.
year_sat
)
...
&
~
isnan
(
gpsData
(
o
,
pRfb
.
SAT_FORMAT
.
day_sat
))
);
gpsRafosDates
(
o
)
=
artoa
.
convert
.
dmy2rd
(
...
gpsData
(
o
,
pRfb
.
SAT_FORMAT
.
day_sat
),
...
gpsData
(
o
,
pRfb
.
SAT_FORMAT
.
month_sat
),
...
gpsData
(
o
,
pRfb
.
SAT_FORMAT
.
year_sat
)
...
);
else
% get rtc date
gpsRafosDates
(
o
)
=
artoa
.
convert
.
dmy2rd
(
...
gpsData
(
o
,
pRfb
.
SAT_FORMAT
.
day_rtc
),
...
gpsData
(
o
,
pRfb
.
SAT_FORMAT
.
month_rtc
),
...
gpsData
(
o
,
pRfb
.
SAT_FORMAT
.
year_rtc
)
...
);
end
% calculate distance between sound source and gps
% calculate distance between sound source and gps
predictedToa
(
o
)
=
predictToa
(
currentGpsPosition
);
predictedToa
(
o
)
=
predictToa
(
currentGpsPosition
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment