*
* 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
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_11;
import java.io.*;
import java.util.*;
public int sense_m() { return data16(8); }
public int v_batt() { return data16(10); }
- double voltage(AltosState state, int sensor) {
+ private double battery_voltage(AltosState state, int sensor) {
if (state.log_format == AltosLib.AO_LOG_FORMAT_EASYMINI)
return AltosConvert.easy_mini_voltage(sensor, state.serial);
- else
- return AltosConvert.tele_mini_voltage(sensor);
+ if (state.log_format == AltosLib.AO_LOG_FORMAT_TELEMINI2)
+ return AltosConvert.tele_mini_2_voltage(sensor);
+ if (state.log_format == AltosLib.AO_LOG_FORMAT_TELEMINI3)
+ return AltosConvert.tele_mini_3_battery_voltage(sensor);
+ return -1;
+ }
+
+ private double pyro_voltage(AltosState state, int sensor) {
+ if (state.log_format == AltosLib.AO_LOG_FORMAT_EASYMINI)
+ return AltosConvert.easy_mini_voltage(sensor, state.serial);
+ if (state.log_format == AltosLib.AO_LOG_FORMAT_TELEMINI2)
+ return AltosConvert.tele_mini_2_voltage(sensor);
+ if (state.log_format == AltosLib.AO_LOG_FORMAT_TELEMINI3)
+ return AltosConvert.tele_mini_3_pyro_voltage(sensor);
+ return -1;
}
public void update_state(AltosState state) {
break;
case AltosLib.AO_LOG_SENSOR:
state.set_ms5607(pres(), temp());
- state.set_apogee_voltage(voltage(state, sense_a()));
- state.set_main_voltage(voltage(state, sense_m()));
- state.set_battery_voltage(voltage(state, v_batt()));
+ state.set_apogee_voltage(pyro_voltage(state, sense_a()));
+ state.set_main_voltage(pyro_voltage(state, sense_m()));
+ state.set_battery_voltage(battery_voltage(state, v_batt()));
break;
}
}