Merge branch 'easymotor-v3'

diff --cc ao-tools/ao-eeprom/ao-eeprom.c
index f63676300ebd76817b3cb6ac462d0d22c69f1af0,780badbed3d0d4a9ee56176690aba18777751303..1f367d9332265be4f4f9941afbe4b3e76ee87def
--- 1/ao-tools/ao-eeprom/ao-eeprom.c
--- 2/ao-tools/ao-eeprom/ao-eeprom.c
+++ b/ao-tools/ao-eeprom/ao-eeprom.c
@@@ -695,33 -683,47 +694,72 @@@ main (int argc, char **argv
                                                break;
                                        }
                                        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 ground_accel %6d",
+                                                      eeprom->serial_number,
+                                                      log_motor->u.flight.flight,
+                                                      log_motor->u.flight.ground_accel);
+                                               printf(" along %6d aross %6d through %6d",
+                                                      log_motor->u.flight.ground_accel_along,
+                                                      log_motor->u.flight.ground_accel_across,
+                                                      log_motor->u.flight.ground_accel_through);
+                                               ao_volts("ground pressure",
+                                                        log_motor->u.flight.ground_motor_pressure,
+                                                        max_adc, adc_ref,
+                                                        sense_r1, sense_r2);
+                                               break;
+                                       case AO_LOG_STATE:
+                                               ao_state(log_motor->u.state.state,
+                                                        log_motor->u.state.reason);
+                                               break;
+                                       case AO_LOG_SENSOR:
+                                               ao_volts("pressure",
+                                                        log_motor->u.sensor.pressure,
+                                                        max_adc, adc_ref,
+                                                        sense_r1, sense_r2);
+                                               ao_volts("v_batt",
+                                                        log_motor->u.sensor.v_batt,
+                                                        max_adc,
+                                                        adc_ref, batt_r1, batt_r2);
+                                               printf(" accel %6d",
+                                                      log_motor->u.sensor.accel);
+                                               printf(" along %6d aross %6d through %6d",
+                                                      log_motor->u.sensor.accel_along,
+                                                      log_motor->u.sensor.accel_across,
+                                                      log_motor->u.sensor.accel_through);
+                                               break;
+                                       }
+                                       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 --cc ao-tools/lib/ao-eeprom-read.h
Simple merge

diff --cc src/Makefile
Simple merge

diff --cc src/lpc/ao_beep_lpc.c
Simple merge