projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Don't define ao_ignite_decivolt without igniters
[fw/altos]
/
altoslib
/
AltosEepromHeader.java
diff --git
a/altoslib/AltosEepromHeader.java
b/altoslib/AltosEepromHeader.java
index a06f05ed46b97d2b85f9f52b99e6c7991dfdf3a6..fe5bf6c36b8142a6472f1f31aa24085ae8114fb7 100644
(file)
--- a/
altoslib/AltosEepromHeader.java
+++ b/
altoslib/AltosEepromHeader.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_
3
;
import java.io.*;
import java.util.*;
import java.io.*;
import java.util.*;
@@
-29,6
+29,9
@@
public class AltosEepromHeader extends AltosEeprom {
public boolean last;
public boolean valid;
public boolean last;
public boolean valid;
+ public int record_length () { return 0; }
+
+ /* XXX pull rest of config data to state */
public void update_state(AltosState state) {
switch (cmd) {
case AltosLib.AO_LOG_CONFIG_VERSION:
public void update_state(AltosState state) {
switch (cmd) {
case AltosLib.AO_LOG_CONFIG_VERSION:
@@
-40,7
+43,7
@@
public class AltosEepromHeader extends AltosEeprom {
case AltosLib.AO_LOG_RADIO_CHANNEL:
break;
case AltosLib.AO_LOG_CALLSIGN:
case AltosLib.AO_LOG_RADIO_CHANNEL:
break;
case AltosLib.AO_LOG_CALLSIGN:
- state.
callsign = data
;
+ state.
set_callsign(data)
;
break;
case AltosLib.AO_LOG_ACCEL_CAL:
state.set_accel_g(config_a, config_b);
break;
case AltosLib.AO_LOG_ACCEL_CAL:
state.set_accel_g(config_a, config_b);
@@
-90,6
+93,7
@@
public class AltosEepromHeader extends AltosEeprom {
state.baro.crc = config_a;
break;
case AltosLib.AO_LOG_SOFTWARE_VERSION:
state.baro.crc = config_a;
break;
case AltosLib.AO_LOG_SOFTWARE_VERSION:
+ state.set_firmware_version(data);
break;
}
}
break;
}
}
@@
-158,7
+162,7
@@
public class AltosEepromHeader extends AltosEeprom {
break;
}
}
break;
}
}
-
+
public AltosEepromHeader (String[] tokens) {
last = false;
valid = true;
public AltosEepromHeader (String[] tokens) {
last = false;
valid = true;
@@
-265,7
+269,7
@@
public class AltosEepromHeader extends AltosEeprom {
for (AltosEepromHeader header : headers) {
header.write(out);
}
for (AltosEepromHeader header : headers) {
header.write(out);
}
-
+
}
public AltosEepromHeader (String line) {
}
public AltosEepromHeader (String line) {