From: Bdale Garbee <bdale@gag.com>
Date: Wed, 10 May 2017 21:18:49 +0000 (-0600)
Subject: Merge branch 'master' into bdale-ui2
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=98f9da75a7191748279e59e20229dd1326beb9f3;p=fw%2Faltos

Merge branch 'master' into bdale-ui2
---

98f9da75a7191748279e59e20229dd1326beb9f3
diff --cc altoslib/AltosEepromRecordFireTwo.java
index 00000000,dd9e34e1..8c03cd56
mode 000000,100644..100644
--- a/altoslib/AltosEepromRecordFireTwo.java
+++ b/altoslib/AltosEepromRecordFireTwo.java
@@@ -1,0 -1,106 +1,104 @@@
+ /*
+  * Copyright © 2017 Keith Packard <keithp@keithp.com>
+  *
+  * 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; 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
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License along
+  * with this program; if not, write to the Free Software Foundation, Inc.,
+  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+  */
+ 
+ package org.altusmetrum.altoslib_11;
+ 
+ import java.io.*;
+ import java.util.*;
+ import java.text.*;
+ 
+ public class AltosEepromRecordFireTwo extends AltosEepromRecord {
+ 	public static final int	record_length = 32;
+ 
+ 	/* 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); }
+ 	public int reason() { return data16(2); }
+ 
+ 	/* AO_LOG_SENSOR elements */
+ 	public int pres() { return data16(0); }
+ 	public int thrust() { return data16(2); }
+ 	public int temp(int i) { return data16(4+i*2); }
+ 
+ 	private static final double r_above = 5600.0;
+ 	private static final double r_below = 10000.0;
+ 	private static final double v_adc = 3.3;
+ 
+ 	private static double firetwo_adc(int raw) {
+ 		return raw / 4095.0;
+ 	}
+ 
+ 	public static double adc_to_pa(int adc) {
+ 
+ 		/* raw adc to processor voltage, then back through the
+ 		 * voltage divider to the sensor voltage
+ 		 */
+ 
+ 		double	v = firetwo_adc(adc) * v_adc * (r_above + r_below) / r_below;
+ 
+ 		/* Bound to ranges provided in sensor */
+ 		if (v < 0.5) v = 0.5;
+ 		if (v > 4.5) v = 4.5;
+ 
 -		double	psi = (v - 0.5) / 4.0 * 1600.0;
++		double	psi = (v - 0.5) / 4.0 * 2500.0;
+ 		return AltosConvert.psi_to_pa(psi);
+ 	}
+ 
+ 	public static double adc_to_n(int adc) {
+ 		double v = firetwo_adc(adc);
+ 
+ 		/* this is a total guess */
+ 		return AltosConvert.lb_to_n(v * 298 * 9.807);
+ 	}
+ 
+ 	public void update_state(AltosState state) {
+ 		super.update_state(state);
+ 
+ 		switch (cmd()) {
+ 		case AltosLib.AO_LOG_FLIGHT:
+ 			state.set_flight(flight());
 -			state.set_ground_pressure(adc_to_pa(idle_pres()));
++			state.set_ground_pressure(0.0);
+ 			state.set_accel_g(0, -1);
+ 			break;
+ 		case AltosLib.AO_LOG_STATE:
+ 			state.set_state(state());
+ 			break;
+ 		case AltosLib.AO_LOG_SENSOR:
+ 			state.set_pressure(adc_to_pa(pres()));
+ 			state.set_accel(adc_to_n(thrust()));
+ 			break;
+ 		}
+ 	}
+ 
+ 	public AltosEepromRecord next() {
+ 		int	s = next_start();
+ 		if (s < 0)
+ 			return null;
+ 		return new AltosEepromRecordFireTwo(eeprom, s);
+ 	}
+ 
+ 	public AltosEepromRecordFireTwo(AltosEepromNew eeprom, int start) {
+ 		super(eeprom, start, record_length);
+ 	}
+ 
+ 	public AltosEepromRecordFireTwo(AltosEepromNew eeprom) {
+ 		this(eeprom, 0);
+ 	}
+ }