summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ao.h2
-rw-r--r--src/ao_monitor.c4
-rw-r--r--src/ao_telemetry.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/ao.h b/src/ao.h
index 37a39a79..5721c344 100644
--- a/src/ao.h
+++ b/src/ao.h
@@ -856,7 +856,7 @@ ao_gps_report_init(void);
#define AO_TELEMETRY_VERSION 3
struct ao_telemetry {
- uint8_t addr;
+ uint16_t serial;
uint16_t flight;
uint8_t flight_state;
int16_t flight_accel;
diff --git a/src/ao_monitor.c b/src/ao_monitor.c
index 1e7f5102..4ba3da6d 100644
--- a/src/ao_monitor.c
+++ b/src/ao_monitor.c
@@ -41,10 +41,10 @@ ao_monitor(void)
if (state > ao_flight_invalid)
state = ao_flight_invalid;
if (recv.status & PKT_APPEND_STATUS_1_CRC_OK) {
- printf("VERSION %d CALL %s SERIAL %3d FLIGHT %5u RSSI %4d STATUS %02x STATE %7s ",
+ printf("VERSION %d CALL %s SERIAL %d FLIGHT %5u RSSI %4d STATUS %02x STATE %7s ",
AO_TELEMETRY_VERSION,
callsign,
- recv.telemetry.addr,
+ recv.telemetry.serial,
recv.telemetry.flight,
rssi, recv.status,
ao_state_names[state]);
diff --git a/src/ao_telemetry.c b/src/ao_telemetry.c
index 22ab1d67..7aad929f 100644
--- a/src/ao_telemetry.c
+++ b/src/ao_telemetry.c
@@ -33,7 +33,7 @@ ao_telemetry(void)
while (!ao_flight_number)
ao_sleep(&ao_flight_number);
memcpy(telemetry.callsign, ao_config.callsign, AO_MAX_CALLSIGN);
- telemetry.addr = ao_serial_number;
+ telemetry.serial = ao_serial_number;
telemetry.flight = ao_log_full() ? 0 : ao_flight_number;
telemetry.accel_plus_g = ao_config.accel_plus_g;
telemetry.accel_minus_g = ao_config.accel_minus_g;