first cut at turnon scripts for EasyTimer v2

[fw/altos] / altoslib / AltosEepromRecordMotor.java

diff --git a/altoslib/AltosEepromRecordMotor.java b/altoslib/AltosEepromRecordMotor.java
index 656feb9b32db76a01c6e9fdd81da9800ce3ec1b8..d5068b08d3f9d10b2222ff7b4137c42f9c0e3ff2 100644 (file)
--- a/altoslib/AltosEepromRecordMotor.java
+++ b/altoslib/AltosEepromRecordMotor.java
@@ -25,6 +25,7 @@ public class AltosEepromRecordMotor extends AltosEepromRecord {
        private int ground_accel_along() { return data16(4); }
        private int ground_accel_across() { return data16(6); }
        private int ground_accel_through() { return data16(8); }
+       private int ground_motor_pressure() { return data16(10); }
 
        /* AO_LOG_STATE elements */
        private int state() { return data16(0); }
@@ -35,7 +36,7 @@ public class AltosEepromRecordMotor extends AltosEepromRecord {
        private int v_batt() { return data16(2); }
        private int accel() { return data16(4); }
        private int accel_across() { return data16(6); }
-       private int accel_along() { return data16(8); }
+       private int accel_along() { return -data16(8); }
        private int accel_through() { return data16(10); }
 
        private int imu_type() {
@@ -59,6 +60,7 @@ public class AltosEepromRecordMotor extends AltosEepromRecord {
                        listener.set_accel_ground(cal_data.accel_along(ground_accel_along()),
                                                  cal_data.accel_across(ground_accel_across()),
                                                  cal_data.accel_through(ground_accel_through()));
+                       cal_data.set_ground_motor_pressure(ground_motor_pressure());
                        break;
                case AltosLib.AO_LOG_STATE:
                        listener.set_state(state());
@@ -66,8 +68,8 @@ public class AltosEepromRecordMotor extends AltosEepromRecord {
                case AltosLib.AO_LOG_SENSOR:
                        AltosConfigData config_data = eeprom.config_data();
 
-                       listener.set_battery_voltage(AltosConvert.easy_mini_2_voltage(v_batt()));
-                       double pa = AltosConvert.easy_motor_2_motor_pressure(motor_pres());
+                       listener.set_battery_voltage(AltosConvert.easy_motor_3_voltage(v_batt()));
+                       double pa = AltosConvert.easy_motor_3_motor_pressure(motor_pres(), cal_data.ground_motor_pressure);
                        listener.set_motor_pressure(pa);
 
                        int     accel_along = accel_along();