Skip to content
Snippets Groups Projects
Commit a80b9437 authored by terry-norbraten's avatar terry-norbraten
Browse files

[Terry N.] turns out we need to cast NPS time from long to int

parent 4cf0cb0e
No related branches found
No related tags found
No related merge requests found
...@@ -124,7 +124,6 @@ public class DisTime ...@@ -124,7 +124,6 @@ public class DisTime
* Fix to bitshift by mvormelch. * Fix to bitshift by mvormelch.
* @return DIS time units, get absolute timestamp * @return DIS time units, get absolute timestamp
*/ */
public int getDisAbsoluteTimestamp() { public int getDisAbsoluteTimestamp() {
int val = this.getDisTimeUnitsSinceTopOfHour(); int val = this.getDisTimeUnitsSinceTopOfHour();
val = (val << 1) | ABSOLUTE_TIMESTAMP_MASK; // always flip the lsb to 1 val = (val << 1) | ABSOLUTE_TIMESTAMP_MASK; // always flip the lsb to 1
...@@ -148,7 +147,7 @@ public class DisTime ...@@ -148,7 +147,7 @@ public class DisTime
* as long as you're not working on New Year's Eve. * as long as you're not working on New Year's Eve.
* @return a timestamp in hundredths of a second since the start of the year * @return a timestamp in hundredths of a second since the start of the year
*/ */
public long getNpsTimestamp() { public int getNpsTimestamp() {
// set calendar object to current time // set calendar object to current time
long currentTime = System.currentTimeMillis(); // UTC milliseconds since 1970 long currentTime = System.currentTimeMillis(); // UTC milliseconds since 1970
calendar.setTimeInMillis(currentTime); calendar.setTimeInMillis(currentTime);
...@@ -166,7 +165,7 @@ public class DisTime ...@@ -166,7 +165,7 @@ public class DisTime
long diff = currentTime - startOfYear; long diff = currentTime - startOfYear;
diff /= 10; // milliseconds to hundredths of a second diff /= 10; // milliseconds to hundredths of a second
return diff; return (int) diff;
} }
/** /**
...@@ -186,10 +185,10 @@ public class DisTime ...@@ -186,10 +185,10 @@ public class DisTime
* Consult the Wikipedia page on <a href="https://en.wikipedia.org/wiki/Unix_time">Unix time</a> for the gory details * Consult the Wikipedia page on <a href="https://en.wikipedia.org/wiki/Unix_time">Unix time</a> for the gory details
* @return seconds since 1970 * @return seconds since 1970
*/ */
public long getUnixTimestamp() { public int getUnixTimestamp() {
long t = System.currentTimeMillis(); long t = System.currentTimeMillis();
t /= 1000l; // NB: integer division, convert milliseconds to seconds t /= 1000l; // NB: integer division, convert milliseconds to seconds
return t; return (int) t;
} }
/** /**
* Convert timestamp value to string for logging and diagnostics * Convert timestamp value to string for logging and diagnostics
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment