projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Wake up on LPC usart ISR only once
[fw/altos]
/
micropeak
/
MicroUSB.java
diff --git
a/micropeak/MicroUSB.java
b/micropeak/MicroUSB.java
index 908ac51b6afbc1eff197f6ed5aa0149ce1aca580..3bd61470cc847c4eb0d763562014f10c73f23ab7 100644
(file)
--- a/
micropeak/MicroUSB.java
+++ b/
micropeak/MicroUSB.java
@@
-19,7
+19,7
@@
package org.altusmetrum.micropeak;
import java.util.*;
import libaltosJNI.*;
import java.util.*;
import libaltosJNI.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altosuilib
_1
.*;
public class MicroUSB extends altos_device implements AltosDevice {
public class MicroUSB extends altos_device implements AltosDevice {
@@
-50,7
+50,7
@@
public class MicroUSB extends altos_device implements AltosDevice {
String name = getName();
if (name == null)
name = "Altus Metrum";
String name = getName();
if (name == null)
name = "Altus Metrum";
- return String.format("%-2
0.20
s %s",
+ return String.format("%-2
4.24
s %s",
name, getPath());
}
name, getPath());
}
@@
-90,7
+90,7
@@
public class MicroUSB extends altos_device implements AltosDevice {
if (!load_library())
return null;
if (!load_library())
return null;
- SWIGTYPE_p_altos_list list = libaltos.altos_list_start();
+ SWIGTYPE_p_altos_list list = libaltos.altos_
ftdi_
list_start();
ArrayList<MicroUSB> device_list = new ArrayList<MicroUSB>();
if (list != null) {
ArrayList<MicroUSB> device_list = new ArrayList<MicroUSB>();
if (list != null) {