projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Support accel-only IMU configurations
[fw/altos]
/
altoslib
/
AltosSensorEasyTimer1.java
diff --git
a/altoslib/AltosSensorEasyTimer1.java
b/altoslib/AltosSensorEasyTimer1.java
index 6af0cc14c232ef673cff2f4875c03ef5c5ae31ad..dcf76928696088e861c814440c3d939ff246598b 100644
(file)
--- a/
altoslib/AltosSensorEasyTimer1.java
+++ b/
altoslib/AltosSensorEasyTimer1.java
@@
-63,11
+63,11
@@
class AltosSensorEasyTimer1 {
try {
AltosSensorEasyTimer1 sensor_easytimer1 = new AltosSensorEasyTimer1(link);
try {
AltosSensorEasyTimer1 sensor_easytimer1 = new AltosSensorEasyTimer1(link);
- listener.set_battery_voltage(AltosConvert.
mega_battery
_voltage(sensor_easytimer1.v_batt));
+ listener.set_battery_voltage(AltosConvert.
easy_timer
_voltage(sensor_easytimer1.v_batt));
double[] igniter_voltage = new double[2];
for (int i = 0; i < 2; i++)
double[] igniter_voltage = new double[2];
for (int i = 0; i < 2; i++)
- igniter_voltage[i] = AltosConvert.
mega_pyro
_voltage(sensor_easytimer1.sense[i]);
+ igniter_voltage[i] = AltosConvert.
easy_timer
_voltage(sensor_easytimer1.sense[i]);
listener.set_igniter_voltage(igniter_voltage);
} catch (TimeoutException te) {
listener.set_igniter_voltage(igniter_voltage);
} catch (TimeoutException te) {