projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Add detherm product
[fw/altos]
/
altoslib
/
AltosEepromIterable.java
diff --git
a/altoslib/AltosEepromIterable.java
b/altoslib/AltosEepromIterable.java
index 8e6a23139d4d5a5a000e0c6978f0b55054880276..f607fbd2733866ea8e64ae4936c4ef7d30c823f5 100644
(file)
--- a/
altoslib/AltosEepromIterable.java
+++ b/
altoslib/AltosEepromIterable.java
@@
-15,7
+15,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_
1
;
+package org.altusmetrum.altoslib_
9
;
import java.io.*;
import java.util.*;
import java.io.*;
import java.util.*;
@@
-38,6
+38,13
@@
class AltosEepromOrdered implements Comparable<AltosEepromOrdered> {
if (cmd_diff != 0)
return cmd_diff;
if (cmd_diff != 0)
return cmd_diff;
+ if (eeprom.has_seconds() && o.eeprom.has_seconds()) {
+ int seconds_diff = eeprom.seconds() - o.eeprom.seconds();
+
+ if (seconds_diff != 0)
+ return seconds_diff;
+ }
+
int tick_diff = tick - o.tick;
if (tick_diff != 0)
int tick_diff = tick - o.tick;
if (tick_diff != 0)
@@
-73,7
+80,9
@@
class AltosEepromOrderedIterator implements Iterator<AltosEeprom> {
tick = t;
}
olist.add(new AltosEepromOrdered(e, index++, tick));
tick = t;
}
olist.add(new AltosEepromOrdered(e, index++, tick));
+ first = false;
}
}
+
oiterator = olist.iterator();
}
oiterator = olist.iterator();
}
@@
-114,4
+123,4
@@
public class AltosEepromIterable implements Iterable<AltosEeprom> {
eeproms = new LinkedList<AltosEeprom>();
return new AltosEepromOrderedIterator(eeproms);
}
eeproms = new LinkedList<AltosEeprom>();
return new AltosEepromOrderedIterator(eeproms);
}
-}
\ No newline at end of file
+}