From: Keith Packard <keithp@keithp.com>
Date: Tue, 6 Jun 2023 21:57:53 +0000 (-0700)
Subject: altoslib: Support Monitor Idle for EasyMini-3
X-Git-Tag: 1.9.17~1^2~12
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=444e6b28f99e7849bbc96cb040b2d73f6bc228b9

altoslib: Support Monitor Idle for EasyMini-3

Needed to explicitly support this target even though it was almost the
same as EasyMini v1.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index 88ee1ad1..ded4b365 100644
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -317,6 +317,10 @@ public class AltosConvert {
 		return easy_mini_2_adc(sensor) * supply * 127/27;
 	}
 
+	static double easy_mini_3_voltage(int sensor) {
+		return easy_mini_1_voltage(sensor, 10000);
+	}
+
 	static double motor_pressure(double voltage) {
 		double	base = 0.5;
 		double	max = 4.5;
diff --git a/altoslib/AltosIdleFetch.java b/altoslib/AltosIdleFetch.java
index 7ab8395a..90f4f53e 100644
--- a/altoslib/AltosIdleFetch.java
+++ b/altoslib/AltosIdleFetch.java
@@ -53,6 +53,7 @@ class AltosIdler {
 	static final int	idle_sensor_tmini3 = 109;
 	static final int	idle_sensor_easytimer1 = 110;
 	static final int	idle_sensor_easymotor2 = 111;
+	static final int	idle_sensor_emini3 = 112;
 
 	public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException, TimeoutException, AltosUnknownProduct {
 		for (int idler : idlers) {
@@ -111,6 +112,9 @@ class AltosIdler {
 			case idle_sensor_emini2:
 				AltosSensorEMini.provide_data(listener, link, 2);
 				break;
+			case idle_sensor_emini3:
+				AltosSensorEMini.provide_data(listener, link, 3);
+				break;
 			case idle_sensor_tmini2:
 				AltosSensorTMini2.provide_data(listener, link);
 				break;
@@ -159,6 +163,10 @@ public class AltosIdleFetch implements AltosDataProvider {
 			       AltosIdler.idle_ms5607,
 			       AltosIdler.idle_sensor_emini2),
 
+		new AltosIdler("EasyMini-v3",
+			       AltosIdler.idle_ms5607,
+			       AltosIdler.idle_sensor_emini3),
+
 		new AltosIdler("TeleMini-v1",
 			       AltosIdler.idle_sensor_tm),
 
diff --git a/altoslib/AltosSensorEMini.java b/altoslib/AltosSensorEMini.java
index 67f3c8e6..33026c07 100644
--- a/altoslib/AltosSensorEMini.java
+++ b/altoslib/AltosSensorEMini.java
@@ -44,6 +44,11 @@ public class AltosSensorEMini {
 				listener.set_apogee_voltage(AltosConvert.easy_mini_2_voltage(sensor_emini.apogee));
 				listener.set_main_voltage(AltosConvert.easy_mini_2_voltage(sensor_emini.main));
 				break;
+			case 3:
+				listener.set_battery_voltage(AltosConvert.easy_mini_3_voltage(sensor_emini.batt));
+				listener.set_apogee_voltage(AltosConvert.easy_mini_3_voltage(sensor_emini.apogee));
+				listener.set_main_voltage(AltosConvert.easy_mini_3_voltage(sensor_emini.main));
+				break;
 			}
 
 		} catch (TimeoutException te) {
diff --git a/altoslib/NewProduct b/altoslib/NewProduct
index e502fdff..deb9fc3d 100644
--- a/altoslib/NewProduct
+++ b/altoslib/NewProduct
@@ -47,6 +47,10 @@ altoslib/
 	Adjust existing telemetry decoders for new sensors
 
 
+ 9. AltosConvert.java
+
+	Add conversion functions for ADC values
+
 altosuilib/
 
  1. AltosUSBDevice.java