Skip to content

fix: end the course with a timer stop_all event at the last record #43

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

fix: end the course with a timer stop_all event at the last record #43

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
7 changes: 4 additions & 3 deletions app/src/main/java/org/surfsite/gexporter/Gpx2Fit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,6 +786,7 @@ public void writeFit(File outfile) {

}

DateTime lastRecordTime = timestamp;
for (WayPoint wpt : trkPoints) {
boolean written = false;
i += 1;
Expand Down Expand Up @@ -822,6 +823,7 @@ public void writeFit(File outfile) {
}

encode.write(r);
lastRecordTime = timestamp;
ldist = dist;
ltimestamp = l;
written = true;
Expand All @@ -841,10 +843,9 @@ public void writeFit(File outfile) {
eventMesg.setLocalNum(0);

eventMesg.setEvent(Event.TIMER);
eventMesg.setEventType(EventType.STOP_DISABLE_ALL);
eventMesg.setEventType(EventType.STOP_ALL);
eventMesg.setEventGroup((short) 0);
//timestamp.add(2);
eventMesg.setTimestamp(timestamp);
eventMesg.setTimestamp(lastRecordTime);

encode.write(eventMesg);
}
Expand Down
17 changes: 17 additions & 0 deletions app/src/test/java/org/surfsite/gexporter/TestCourseFit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

import com.garmin.fit.CoursePointMesg;
import com.garmin.fit.Decode;
import com.garmin.fit.Event;
import com.garmin.fit.EventMesg;
import com.garmin.fit.EventType;
import com.garmin.fit.MesgBroadcaster;
import com.garmin.fit.RecordMesg;

Expand All @@ -32,6 +35,7 @@ public class TestCourseFit {

private final List<RecordMesg> records = new ArrayList<>();
private final List<CoursePointMesg> coursePoints = new ArrayList<>();
private final List<EventMesg> events = new ArrayList<>();

/** A straight track north, 0.01掳 (about 1.1 km) per point. */
private File gpx(String wpts, String timeFormat) throws Exception {
Expand Down Expand Up @@ -64,6 +68,7 @@ private void convertAndDecode(File gpx) throws Exception {
MesgBroadcaster broadcaster = new MesgBroadcaster(decode);
broadcaster.addListener((com.garmin.fit.RecordMesgListener) records::add);
broadcaster.addListener((com.garmin.fit.CoursePointMesgListener) coursePoints::add);
broadcaster.addListener((com.garmin.fit.EventMesgListener) events::add);
try (InputStream in = new FileInputStream(fit)) {
assertTrue("FIT integrity", decode.checkFileIntegrity(in));
}
Expand Down Expand Up @@ -115,4 +120,16 @@ public void currentTimesAreKept() throws Exception {
long expected = (1788602400000L - 631065600000L) / 1000L;
assertEquals(expected, (long) records.get(0).getTimestamp().getTimestamp());
}

@Test
public void courseEndsWithTimerStopAllAtTheLastRecord() throws Exception {
// as Garmin's EncodeCourse example
convertAndDecode(gpx("", "2026-09-05T10:%02d:00Z"));

EventMesg stop = events.get(events.size() - 1);
assertEquals(Event.TIMER, stop.getEvent());
assertEquals(EventType.STOP_ALL, stop.getEventType());
assertEquals(records.get(records.size() - 1).getTimestamp().getTimestamp(),
stop.getTimestamp().getTimestamp());
}
}
Loading