projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: use motor pressure calibration data for EasyMotor
[fw/altos]
/
altoslib
/
AltosEepromRecordFireTwo.java
diff --git
a/altoslib/AltosEepromRecordFireTwo.java
b/altoslib/AltosEepromRecordFireTwo.java
index 9b92f1115ffe2f3fa285f0b8b0cbfda593628532..7b772e9a49e6b8a98af8679b2c8b9b096ee6ae28 100644
(file)
--- a/
altoslib/AltosEepromRecordFireTwo.java
+++ b/
altoslib/AltosEepromRecordFireTwo.java
@@
-16,7
+16,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
1
;
+package org.altusmetrum.altoslib_1
4
;
import java.io.*;
import java.util.*;
import java.io.*;
import java.util.*;
@@
-27,8
+27,6
@@
public class AltosEepromRecordFireTwo extends AltosEepromRecord {
/* AO_LOG_FLIGHT elements */
public int flight() { return data16(0); }
/* AO_LOG_FLIGHT elements */
public int flight() { return data16(0); }
- public int idle_pres() { return data16(2); }
- public int idle_thrust() { return data16(4); }
/* AO_LOG_STATE elements */
public int state() { return data16(0); }
/* AO_LOG_STATE elements */
public int state() { return data16(0); }
@@
-59,7
+57,7
@@
public class AltosEepromRecordFireTwo extends AltosEepromRecord {
if (v < 0.5) v = 0.5;
if (v > 4.5) v = 4.5;
if (v < 0.5) v = 0.5;
if (v > 4.5) v = 4.5;
- double psi = (v - 0.5) / 4.0 *
16
00.0;
+ double psi = (v - 0.5) / 4.0 *
25
00.0;
return AltosConvert.psi_to_pa(psi);
}
return AltosConvert.psi_to_pa(psi);
}
@@
-70,36
+68,35
@@
public class AltosEepromRecordFireTwo extends AltosEepromRecord {
return AltosConvert.lb_to_n(v * 298 * 9.807);
}
return AltosConvert.lb_to_n(v * 298 * 9.807);
}
- public void
update_state(AltosState state
) {
- super.
update_state(state
);
+ public void
provide_data(AltosDataListener listener, AltosCalData cal_data
) {
+ super.
provide_data(listener, cal_data
);
switch (cmd()) {
case AltosLib.AO_LOG_FLIGHT:
switch (cmd()) {
case AltosLib.AO_LOG_FLIGHT:
- state.set_flight(flight());
- state.set_ground_pressure(adc_to_pa(idle_pres()));
- state.set_accel_g(0, -1);
+ cal_data.set_flight(flight());
break;
case AltosLib.AO_LOG_STATE:
break;
case AltosLib.AO_LOG_STATE:
-
state
.set_state(state());
+
listener
.set_state(state());
break;
case AltosLib.AO_LOG_SENSOR:
break;
case AltosLib.AO_LOG_SENSOR:
-
state
.set_pressure(adc_to_pa(pres()));
-
state.set_accel
(adc_to_n(thrust()));
+
listener
.set_pressure(adc_to_pa(pres()));
+
listener.set_thrust
(adc_to_n(thrust()));
break;
}
}
public AltosEepromRecord next() {
break;
}
}
public AltosEepromRecord next() {
- if (start + length + length < eeprom.data.size())
- return new AltosEepromRecordFireTwo(eeprom, start + length);
- return null;
+ int s = next_start();
+ if (s < 0)
+ return null;
+ return new AltosEepromRecordFireTwo(eeprom, s);
}
}
- public AltosEepromRecordFireTwo(AltosEeprom
New
eeprom, int start) {
+ public AltosEepromRecordFireTwo(AltosEeprom eeprom, int start) {
super(eeprom, start, record_length);
}
super(eeprom, start, record_length);
}
- public AltosEepromRecordFireTwo(AltosEeprom
New
eeprom) {
+ public AltosEepromRecordFireTwo(AltosEeprom eeprom) {
this(eeprom, 0);
}
}
this(eeprom, 0);
}
}