altoslib: Make sure AltosFlightSeries is filled in before use

[fw/altos] / altoslib / AltosEepromNew.java

diff --git a/altoslib/AltosEepromNew.java b/altoslib/AltosEepromNew.java
index b76e3e1964d0876fc3ac55fe2511c0465ddbab6b..0da3df71c98740f282f785894669dc1f24786cbe 100644 (file)
--- a/altoslib/AltosEepromNew.java
+++ b/altoslib/AltosEepromNew.java
@@ -57,7 +57,8 @@ public class AltosEepromNew {
                        if (config_data == null)
                                config_data = new AltosConfigData();
 
-                       if (config_data.log_format == AltosLib.MISSING) {
+                       if (config_data.log_format == AltosLib.AO_LOG_FORMAT_UNKNOWN) {
+                               config_data.log_format = AltosLib.AO_LOG_FORMAT_FULL;
                                if (config_data.product != null) {
                                        if (config_data.product.startsWith("TeleMetrum"))
                                                config_data.log_format = AltosLib.AO_LOG_FORMAT_FULL;
@@ -69,10 +70,6 @@ public class AltosEepromNew {
                return config_data;
        }
 
-       public void reset_config_data() {
-               config_data = null;
-       }
-
        private void write_config(Writer w) throws IOException {
                config.write(w, 0, true);
                w.append('\n');
@@ -168,7 +165,8 @@ public class AltosEepromNew {
                        int start = data.size();
 
                        if (config_data().log_format != AltosLib.AO_LOG_FORMAT_TINY) {
-                               data.add((byte) tokens[0].codePointAt(0));
+                               byte cmd = (byte) tokens[0].codePointAt(0);
+                               data.add(cmd);
 
                                int time = AltosLib.fromhex(tokens[1]);