From: Keith Packard <keithp@keithp.com>
Date: Fri, 28 Oct 2022 02:16:39 +0000 (-0700)
Subject: Merge branch 'easymotor-v3'
X-Git-Tag: 1.9.12~1^2~17
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=611ef4497b97bcf5239d6bc2ee13eeba9efd1503

Merge branch 'easymotor-v3'
---

611ef4497b97bcf5239d6bc2ee13eeba9efd1503
diff --cc ao-tools/ao-eeprom/ao-eeprom.c
index f6367630,780badbe..1f367d93
--- a/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");