Needed to deal with ADC difference from STM-based devices.
Signed-off-by: Keith Packard <keithp@keithp.com>
return sensor / 4095.0 * supply * (5.6 + 10.0) / 10.0;
}
+ static double tele_gps_3_voltage(int sensor) {
+ double supply = 3.3;
+
+ return sensor / 32767.0 * supply * (5.6 + 10.0) / 10.0;
+ }
+
static double tele_bt_3_battery(int raw) {
if (raw == AltosLib.MISSING)
return AltosLib.MISSING;
static final int idle_sensor_tmini2 = 105;
static final int idle_sensor_tgps1 = 106;
static final int idle_sensor_tgps2 = 107;
- static final int idle_sensor_tmini3 = 108;
- static final int idle_sensor_easytimer1 = 109;
- static final int idle_sensor_easymotor2 = 110;
+ static final int idle_sensor_tgps3 = 108;
+ static final int idle_sensor_tmini3 = 109;
+ static final int idle_sensor_easytimer1 = 110;
+ static final int idle_sensor_easymotor2 = 111;
public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException, TimeoutException, AltosUnknownProduct {
for (int idler : idlers) {
case idle_sensor_tgps2:
AltosSensorTGPS2.provide_data(listener, link);
break;
+ case idle_sensor_tgps3:
+ AltosSensorTGPS3.provide_data(listener, link);
+ break;
case idle_sensor_tmini3:
AltosSensorTMini3.provide_data(listener, link);
break;
new AltosIdler("TeleGPS-v2",
AltosIdler.idle_gps,
AltosIdler.idle_sensor_tgps2),
+ new AltosIdler("TeleGPS-v3",
+ AltosIdler.idle_gps,
+ AltosIdler.idle_sensor_tgps3),
new AltosIdler("EasyTimer-v1",
AltosIdler.idle_imu_et_v1,
AltosIdler.idle_sensor_easytimer1),
--- /dev/null
+/*
+ * Copyright © 2015 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_14;
+
+import java.util.concurrent.TimeoutException;
+
+public class AltosSensorTGPS3 {
+ public int tick;
+ public int batt;
+
+ static public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException {
+ try {
+ AltosSensorTGPS3 sensor_tgps = new AltosSensorTGPS3(link);
+
+ if (sensor_tgps == null)
+ return;
+ listener.set_battery_voltage(AltosConvert.tele_gps_3_voltage(sensor_tgps.batt));
+
+ } catch (TimeoutException te) {
+ }
+ }
+
+ public AltosSensorTGPS3(AltosLink link) throws InterruptedException, TimeoutException {
+ String[] items = link.adc();
+ for (int i = 0; i < items.length - 1;) {
+ if (items[i].equals("tick:")) {
+ tick = Integer.parseInt(items[i+1]);
+ i += 2;
+ continue;
+ }
+ if (items[i].equals("batt:")) {
+ batt = Integer.parseInt(items[i+1]);
+ i += 2;
+ continue;
+ }
+ i++;
+ }
+ }
+}
+
AltosSensorMetrum.java \
AltosSensorTGPS1.java \
AltosSensorTGPS2.java \
+ AltosSensorTGPS3.java \
AltosSensorEasyMotor2.java \
AltosState.java \
AltosStateName.java \