From 8275ed5907d9aeb00a326e54757fe314eefd1dce Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Wed, 14 Aug 2024 08:46:07 -0700
Subject: [PATCH] altoslib: Add TeleGPS v4 bits

Need to adjust the ADC stuff for battery level conversions.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altoslib/AltosConvert.java     |  7 +++++
 altoslib/AltosIdleFetch.java   |  7 +++++
 altoslib/AltosSensorTGPS4.java | 56 ++++++++++++++++++++++++++++++++++
 altoslib/Makefile.am           |  1 +
 4 files changed, 71 insertions(+)
 create mode 100644 altoslib/AltosSensorTGPS4.java

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index 84f7e23d..e692cbf0 100644
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -276,6 +276,13 @@ public class AltosConvert {
 		return sensor / 32767.0 * supply * (5.6 + 10.0) / 10.0;
 	}
 
+	/* STM32F042 */
+	static double tele_gps_4_voltage(int sensor) {
+		double	supply = 3.3;
+
+		return sensor / 4095.0 * supply * (5.6 + 10.0) / 10.0;
+	}
+
 	static double tele_bt_3_battery(int raw) {
 		if (raw == AltosLib.MISSING)
 			return AltosLib.MISSING;
diff --git a/altoslib/AltosIdleFetch.java b/altoslib/AltosIdleFetch.java
index b64ba0a4..2f230923 100644
--- a/altoslib/AltosIdleFetch.java
+++ b/altoslib/AltosIdleFetch.java
@@ -58,6 +58,7 @@ class AltosIdler {
 	static final int	idle_sensor_emini3 = 112;
 	static final int	idle_sensor_etimer2 = 113;
 	static final int	idle_sensor_emega3 = 114;
+	static final int	idle_sensor_tgps4 = 115;
 
 	public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException, TimeoutException, AltosUnknownProduct {
 		for (int idler : idlers) {
@@ -134,6 +135,9 @@ class AltosIdler {
 			case idle_sensor_tgps3:
 				AltosSensorTGPS3.provide_data(listener, link);
 				break;
+			case idle_sensor_tgps4:
+				AltosSensorTGPS4.provide_data(listener, link);
+				break;
 			case idle_sensor_tmini3:
 				AltosSensorTMini3.provide_data(listener, link);
 				break;
@@ -274,6 +278,9 @@ public class AltosIdleFetch implements AltosDataProvider {
 		new AltosIdler("TeleGPS-v3",
 			       AltosIdler.idle_gps,
 			       AltosIdler.idle_sensor_tgps3),
+		new AltosIdler("TeleGPS-v4",
+			       AltosIdler.idle_gps,
+			       AltosIdler.idle_sensor_tgps4),
 		new AltosIdler("EasyTimer-v1",
 			       AltosIdler.idle_imu_et_v1,
 			       AltosIdler.idle_sensor_easytimer1),
diff --git a/altoslib/AltosSensorTGPS4.java b/altoslib/AltosSensorTGPS4.java
new file mode 100644
index 00000000..2e62f192
--- /dev/null
+++ b/altoslib/AltosSensorTGPS4.java
@@ -0,0 +1,56 @@
+/*
+ * 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 AltosSensorTGPS4 {
+	public int	tick;
+	public int	batt;
+
+	static public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException {
+		try {
+			AltosSensorTGPS4	sensor_tgps = new AltosSensorTGPS4(link);
+
+			if (sensor_tgps == null)
+				return;
+			listener.set_battery_voltage(AltosConvert.tele_gps_4_voltage(sensor_tgps.batt));
+
+		} catch (TimeoutException te) {
+		}
+	}
+
+	public AltosSensorTGPS4(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++;
+		}
+	}
+}
+
diff --git a/altoslib/Makefile.am b/altoslib/Makefile.am
index 7cb2ef6f..ed69e9ab 100644
--- a/altoslib/Makefile.am
+++ b/altoslib/Makefile.am
@@ -118,6 +118,7 @@ altoslib_JAVA = \
 	AltosSensorTGPS1.java \
 	AltosSensorTGPS2.java \
 	AltosSensorTGPS3.java \
+	AltosSensorTGPS4.java \
 	AltosSensorEasyMotor2.java \
 	AltosState.java \
 	AltosStateName.java \
-- 
2.47.2