projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc: Convert AltOS doc to asciidoc
[fw/altos]
/
altoslib
/
AltosEepromMini.java
diff --git
a/altoslib/AltosEepromMini.java
b/altoslib/AltosEepromMini.java
index 15ec19298a9b1294e246e97b23ea9ebdddd2448f..8d0343b80738f442565a7f04ee0eada667291606 100644
(file)
--- a/
altoslib/AltosEepromMini.java
+++ b/
altoslib/AltosEepromMini.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_
8
;
import java.io.*;
import java.util.*;
import java.io.*;
import java.util.*;
@@
-42,16
+42,15
@@
public class AltosEepromMini extends AltosEeprom {
public int v_batt() { return data16(10); }
double voltage(AltosState state, int sensor) {
public int v_batt() { return data16(10); }
double voltage(AltosState state, int sensor) {
- double supply;
-
if (state.log_format == AltosLib.AO_LOG_FORMAT_EASYMINI)
if (state.log_format == AltosLib.AO_LOG_FORMAT_EASYMINI)
-
supply = 3.0
;
+
return AltosConvert.easy_mini_voltage(sensor, state.serial)
;
else
else
- supply = 3.3;
- return sensor / 32767.0 * supply * 127/27;
+ return AltosConvert.tele_mini_voltage(sensor);
}
public void update_state(AltosState state) {
}
public void update_state(AltosState state) {
+ super.update_state(state);
+
switch (cmd) {
case AltosLib.AO_LOG_FLIGHT:
state.set_flight(flight());
switch (cmd) {
case AltosLib.AO_LOG_FLIGHT:
state.set_flight(flight());