X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosEepromHeader.java;h=37b666b4bf085af84e1e0772f904fdf1765a897c;hb=c296acd643698d0128e2f58f91a9cfeea63f580a;hp=ea6f5e28bb31db1894b43295855565b826a837f4;hpb=4a5ef9eaa8b809c56813625133120e7e91fc8e65;p=fw%2Faltos

diff --git a/altoslib/AltosEepromHeader.java b/altoslib/AltosEepromHeader.java
index ea6f5e28..37b666b4 100644
--- a/altoslib/AltosEepromHeader.java
+++ b/altoslib/AltosEepromHeader.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_4;
+package org.altusmetrum.altoslib_11;
 
 import java.io.*;
 import java.util.*;
@@ -25,7 +26,7 @@ public class AltosEepromHeader extends AltosEeprom {
 
 	public int	cmd;
 	public String	data;
-	public int	config_a, config_b;
+	public int	config_a, config_b, config_c;
 	public boolean	last;
 	public boolean	valid;
 
@@ -56,7 +57,7 @@ public class AltosEepromHeader extends AltosEeprom {
 			state.product = data;
 			break;
 		case AltosLib.AO_LOG_LOG_FORMAT:
-			state.log_format = config_a;
+			state.set_log_format(config_a);
 			break;
 		case AltosLib.AO_LOG_SERIAL_NUMBER:
 			state.set_serial(config_a);
@@ -93,9 +94,31 @@ public class AltosEepromHeader extends AltosEeprom {
 			state.make_baro();
 			state.baro.crc = config_a;
 			break;
+		case AltosLib.AO_LOG_IMU_CAL:
+			state.set_accel_zero(config_a, config_b, config_c);
+			break;
 		case AltosLib.AO_LOG_SOFTWARE_VERSION:
 			state.set_firmware_version(data);
 			break;
+		case AltosLib.AO_LOG_FREQUENCY:
+		case AltosLib.AO_LOG_APOGEE_LOCKOUT:
+		case AltosLib.AO_LOG_RADIO_RATE:
+		case AltosLib.AO_LOG_IGNITE_MODE:
+			break;
+		case AltosLib.AO_LOG_PAD_ORIENTATION:
+			state.set_pad_orientation(config_a);
+			break;
+		case AltosLib.AO_LOG_RADIO_ENABLE:
+		case AltosLib.AO_LOG_AES_KEY:
+		case AltosLib.AO_LOG_APRS:
+		case AltosLib.AO_LOG_BEEP_SETTING:
+		case AltosLib.AO_LOG_TRACKER_SETTING:
+		case AltosLib.AO_LOG_PYRO_TIME:
+		case AltosLib.AO_LOG_APRS_ID:
+			break;
+		case AltosLib.AO_LOG_ALTITUDE_32:
+			state.set_altitude_32(config_a);
+			break;
 		}
 	}
 
@@ -161,6 +184,28 @@ public class AltosEepromHeader extends AltosEeprom {
 		case AltosLib.AO_LOG_BARO_CRC:
 			out.printf ("# Baro crc: %d\n", config_a);
 			break;
+		case AltosLib.AO_LOG_IMU_CAL:
+			out.printf ("# IMU cal: %d %d %d\n", config_a, config_b, config_c);
+			break;
+		case AltosLib.AO_LOG_FREQUENCY:
+		case AltosLib.AO_LOG_APOGEE_LOCKOUT:
+		case AltosLib.AO_LOG_RADIO_RATE:
+		case AltosLib.AO_LOG_IGNITE_MODE:
+			break;
+		case AltosLib.AO_LOG_PAD_ORIENTATION:
+			out.printf("# Pad orientation: %d\n", config_a);
+			break;
+		case AltosLib.AO_LOG_RADIO_ENABLE:
+		case AltosLib.AO_LOG_AES_KEY:
+		case AltosLib.AO_LOG_APRS:
+		case AltosLib.AO_LOG_BEEP_SETTING:
+		case AltosLib.AO_LOG_TRACKER_SETTING:
+		case AltosLib.AO_LOG_PYRO_TIME:
+		case AltosLib.AO_LOG_APRS_ID:
+			break;
+		case AltosLib.AO_LOG_ALTITUDE_32:
+			out.printf("# Altitude-32: %d\n", config_a);
+			break;
 		}
 	}
 
@@ -205,6 +250,9 @@ public class AltosEepromHeader extends AltosEeprom {
 			} else if (tokens[0].equals("log-format")) {
 				cmd = AltosLib.AO_LOG_LOG_FORMAT;
 				config_a = Integer.parseInt(tokens[1]);
+			} else if (tokens[0].equals("altitude-32")) {
+				cmd = AltosLib.AO_LOG_ALTITUDE_32;
+				config_a = Integer.parseInt(tokens[1]);
 			} else if (tokens[0].equals("software-version")) {
 				cmd = AltosLib.AO_LOG_SOFTWARE_VERSION;
 				data = tokens[1];
@@ -238,6 +286,14 @@ public class AltosEepromHeader extends AltosEeprom {
 					cmd = AltosLib.AO_LOG_INVALID;
 					data = tokens[2];
 				}
+			} else if (tokens[0].equals("IMU") && tokens[1].equals("cal")) {
+				cmd = AltosLib.AO_LOG_IMU_CAL;
+				config_a = Integer.parseInt(tokens[3]);
+				config_b = Integer.parseInt(tokens[5]);
+				config_c = Integer.parseInt(tokens[7]);
+			} else if (tokens[0].equals("Pad") && tokens[1].equals("orientation:")) {
+				cmd = AltosLib.AO_LOG_PAD_ORIENTATION;
+				config_a = Integer.parseInt(tokens[2]);
 			} else
 				valid = false;
 		} catch (Exception e) {