projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'buttonbox' into sitemap
[fw/altos]
/
src
/
ao_monitor.c
diff --git
a/src/ao_monitor.c
b/src/ao_monitor.c
index 628b6e6733ba480c0099a2fbbb9566cd48d6b239..f019d3b431a0481af12620280e58b8e87f845624 100644
(file)
--- a/
src/ao_monitor.c
+++ b/
src/ao_monitor.c
@@
-26,6
+26,7
@@
ao_monitor(void)
__xdata struct ao_radio_recv recv;
__xdata char callsign[AO_MAX_CALLSIGN+1];
uint8_t state;
__xdata struct ao_radio_recv recv;
__xdata char callsign[AO_MAX_CALLSIGN+1];
uint8_t state;
+ int16_t rssi;
for (;;) {
__critical while (!ao_monitoring)
for (;;) {
__critical while (!ao_monitoring)
@@
-33,6
+34,9
@@
ao_monitor(void)
if (!ao_radio_recv(&recv))
continue;
state = recv.telemetry.flight_state;
if (!ao_radio_recv(&recv))
continue;
state = recv.telemetry.flight_state;
+
+ /* Typical RSSI offset for 38.4kBaud at 433 MHz is 74 */
+ rssi = (int16_t) (recv.rssi >> 1) - 74;
memcpy(callsign, recv.telemetry.callsign, AO_MAX_CALLSIGN);
if (state > ao_flight_invalid)
state = ao_flight_invalid;
memcpy(callsign, recv.telemetry.callsign, AO_MAX_CALLSIGN);
if (state > ao_flight_invalid)
state = ao_flight_invalid;
@@
-42,7
+46,7
@@
ao_monitor(void)
callsign,
recv.telemetry.addr,
recv.telemetry.flight,
callsign,
recv.telemetry.addr,
recv.telemetry.flight,
-
(int) recv.rssi - 74
, recv.status,
+
rssi
, recv.status,
ao_state_names[state]);
printf("%5u a: %5d p: %5d t: %5d v: %5d d: %5d m: %5d "
"fa: %5d ga: %d fv: %7ld fp: %5d gp: %5d a+: %5d a-: %5d ",
ao_state_names[state]);
printf("%5u a: %5d p: %5d t: %5d v: %5d d: %5d m: %5d "
"fa: %5d ga: %d fv: %7ld fp: %5d gp: %5d a+: %5d a-: %5d ",
@@
-64,9
+68,9
@@
ao_monitor(void)
putchar(' ');
ao_gps_tracking_print(&recv.telemetry.gps_tracking);
putchar('\n');
putchar(' ');
ao_gps_tracking_print(&recv.telemetry.gps_tracking);
putchar('\n');
- ao_rssi_set(
(int) recv.rssi - 74
);
+ ao_rssi_set(
rssi
);
} else {
} else {
- printf("CRC INVALID RSSI %3d\n",
(int) recv.rssi - 74
);
+ printf("CRC INVALID RSSI %3d\n",
rssi
);
}
ao_usb_flush();
ao_led_toggle(ao_monitor_led);
}
ao_usb_flush();
ao_led_toggle(ao_monitor_led);
@@
-80,7
+84,8
@@
ao_set_monitor(uint8_t monitoring)
{
ao_monitoring = monitoring;
ao_wakeup(&ao_monitoring);
{
ao_monitoring = monitoring;
ao_wakeup(&ao_monitoring);
- ao_radio_abort();
+ if (!ao_monitoring)
+ ao_radio_abort();
}
static void
}
static void