projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Wait for i2c START condition before setting interrupt bits
[fw/altos]
/
altosui
/
AltosBTDevice.java
diff --git
a/altosui/AltosBTDevice.java
b/altosui/AltosBTDevice.java
index c2721b262c0df0b83a0a23a9a20900e961d3d80a..f6926b1066fde81b571a6e634b9afe25a0ef616a 100644
(file)
--- a/
altosui/AltosBTDevice.java
+++ b/
altosui/AltosBTDevice.java
@@
-42,6
+42,13
@@
public class AltosBTDevice extends altos_bt_device implements AltosDevice {
return getAddr();
}
return getAddr();
}
+ public String getErrorString() {
+ altos_error error = new altos_error();
+
+ libaltos.altos_get_last_error(error);
+ return String.format("%s (%d)", error.getString(), error.getCode());
+ }
+
public int getSerial() {
String name = getName();
if (name == null)
public int getSerial() {
String name = getName();
if (name == null)
@@
-58,19
+65,13
@@
public class AltosBTDevice extends altos_bt_device implements AltosDevice {
}
public String toString() {
}
public String toString() {
- String name = getName();
- if (name == null)
- name = "Altus Metrum";
return String.format("%-20.20s %4d %s",
getProductName(), getSerial(), getAddr());
}
public String toShortString() {
return String.format("%-20.20s %4d %s",
getProductName(), getSerial(), getAddr());
}
public String toShortString() {
- String name = getName();
- if (name == null)
- name = "Altus Metrum";
return String.format("%s %d %s",
return String.format("%s %d %s",
- getProduct(), getSerial(), getAddr());
+ getProduct
Name
(), getSerial(), getAddr());
}
}
@@
-115,6
+116,7
@@
public class AltosBTDevice extends altos_bt_device implements AltosDevice {
}
public AltosBTDevice(String name, String addr) {
}
public AltosBTDevice(String name, String addr) {
+ Altos.load_library();
libaltos.altos_bt_fill_in(name, addr,this);
}
libaltos.altos_bt_fill_in(name, addr,this);
}