ao-eeprom: Handle merge conflict from easymotor-v3 branch

Had two copies of the new easymotor log format parsing bits.

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

diff --git a/ao-tools/ao-eeprom/ao-eeprom.c b/ao-tools/ao-eeprom/ao-eeprom.c
index 1f367d9332265be4f4f9941afbe4b3e76ee87def..ec5f9c4da932c91785ad7d20d995993bb45efc3e 100644 (file)
--- a/ao-tools/ao-eeprom/ao-eeprom.c
+++ b/ao-tools/ao-eeprom/ao-eeprom.c
@@ -735,31 +735,6 @@ main (int argc, char **argv)
                                        break;
                                case AO_LOG_FORMAT_DETHERM:
                                        break;
-                               case AO_LOG_FORMAT_EASYMOTOR:
-                                       log_motor = (struct ao_log_motor *) &eeprom->data[pos];
-                                       switch (log_motor->type) {
-                                       case AO_LOG_FLIGHT:
-                                               printf(" serial %5u flight %5u",
-                                                      eeprom->serial_number,
-                                                      log_motor->u.flight.flight);
-                                               break;
-                                       case AO_LOG_STATE:
-                                               ao_state(log_motor->u.state.state,
-                                                        log_motor->u.state.reason);
-                                               break;
-                                       case AO_LOG_SENSOR:
-                                               ao_pressure(log_motor->u.sensor.pressure,
-                                                           max_adc, adc_ref,
-                                                           sense_r1, sense_r2,
-                                                           pressure_sensor);
-                                               ao_volts("v_batt",
-                                                        log_motor->u.sensor.v_batt,
-                                                        max_adc,
-                                                        adc_ref,
-                                                        batt_r1, batt_r2);
-                                               break;
-                                       }
-                                       break;
                                }
                        }
                        printf("\n");

diff --git a/ao-tools/lib/ao-eeprom-read.h b/ao-tools/lib/ao-eeprom-read.h
index 9e60a5af9acdd0750b30e9934a190d47f1ab071d..11e4f91d92e0fe6f9daa13b1ff9828ac55de91a9 100644 (file)
--- a/ao-tools/lib/ao-eeprom-read.h
+++ b/ao-tools/lib/ao-eeprom-read.h
@@ -466,37 +466,6 @@ struct ao_log_mini {
        } u;                                            /* 16 */
 };                                                     /* 16 */
 
-struct ao_log_motor {
-       char                    type;                   /* 0 */
-       uint8_t                 csum;                   /* 1 */
-       uint16_t                tick;                   /* 2 */
-       union {                                         /* 4 */
-               /* AO_LOG_FLIGHT */
-               struct {
-                       uint16_t        flight;                 /* 4 */
-                       int16_t         ground_accel;           /* 6 */
-                       int16_t         ground_accel_along;     /* 8 */
-                       int16_t         ground_accel_across;    /* 10 */
-                       int16_t         ground_accel_through;   /* 12 */
-                       int16_t         ground_motor_pressure;  /* 14 */
-               } flight;                                       /* 16 */
-               /* AO_LOG_STATE */
-               struct {
-                       uint16_t        state;                  /* 4 */
-                       uint16_t        reason;                 /* 6 */
-               } state;
-               /* AO_LOG_SENSOR */
-               struct {
-                       uint16_t        pressure;               /* 4 */
-                       uint16_t        v_batt;                 /* 6 */
-                       int16_t         accel;                  /* 8 */
-                       int16_t         accel_across;           /* 10 */
-                       int16_t         accel_along;            /* 12 */
-                       int16_t         accel_through;          /* 14 */
-               } sensor;                                       /* 16 */
-       } u;
-};
-
 #define ao_log_pack24(dst,value) do {          \
                (dst)[0] = (value);             \
                (dst)[1] = (value) >> 8;        \