X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosConvert.java;h=3e1796b2c194bfbeb212a9adbe675a0917642201;hb=2fdf4e798bd67b0d7e96f2b8fff49915b71b089e;hp=e51e4f3059f942893a1fc30d331fbdcf16ab5dba;hpb=41538b1b600eef242d1ede9fe9039d1079f6891a;p=fw%2Faltos

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index e51e4f30..3e1796b2 100644
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -280,11 +280,11 @@ public class AltosConvert {
 		return 3.3 * mega_adc(sensor) * (100.0 + 27.0) / 27.0;
 	}
 
-	static double easy_mini_2_adc(int raw) {
+	static double easy_mini_2_adc(double raw) {
 		return raw / 4095.0;
 	}
 
-	static double easy_mini_1_adc(int raw) {
+	static double easy_mini_1_adc(double raw) {
 		return raw / 32767.0;
 	}
 
@@ -323,11 +323,30 @@ public class AltosConvert {
 		return (voltage - base) / (max - base) * full_scale_pressure;
 	}
 
-	static double easy_motor_2_motor_pressure(int sensor) {
+	static double easy_motor_3_adc(double raw) {
+		return raw / 32767.0;
+	}
+
+	static double easy_motor_3_voltage(int sensor) {
 		double	supply = 3.3;
+
+		return easy_motor_3_adc(sensor) * supply * 15.6 / 10.0;
+	}
+
+	static double easy_motor_2_motor_pressure(int sensor, double ground_sensor) {
+		double	supply = 3.3;
+		double	ground_voltage = easy_mini_2_adc(ground_sensor) * supply * 15.6 / 10.0;
 		double	voltage = easy_mini_2_adc(sensor) * supply * 15.6 / 10.0;
 
-		return motor_pressure(voltage);
+		return motor_pressure(voltage) - motor_pressure(ground_voltage);
+	}
+
+	static double easy_motor_3_motor_pressure(int sensor, double ground_sensor) {
+		double	supply = 3.3;
+		double	ground_voltage = easy_motor_3_adc(ground_sensor) * supply * 15.6 / 10.0;
+		double	voltage = easy_motor_3_adc(sensor) * supply * 15.6 / 10.0;
+
+		return motor_pressure(voltage) - motor_pressure(ground_voltage);
 	}
 
 	public static double radio_to_frequency(int freq, int setting, int cal, int channel) {