diff options
| author | Bdale Garbee <bdale@gag.com> | 2016-09-05 20:59:11 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2016-09-05 20:59:11 -0600 |
| commit | c0ad087008856cfc2233b977abfc3f1dcbaccdcc (patch) | |
| tree | adc46abc430793112858ce5d1822d3fe0a395e71 /src/kernel/ao_monitor.c | |
| parent | 148b013dd29c26920ddfb53449ed4d8cc5a4b5ee (diff) | |
| parent | 4fdf8ca9ca1cd5a84b03bd7a03c5806af64b413d (diff) | |
Merge branch 'master' into branch-1.6
Diffstat (limited to 'src/kernel/ao_monitor.c')
| -rw-r--r-- | src/kernel/ao_monitor.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/kernel/ao_monitor.c b/src/kernel/ao_monitor.c index cba0d80a..7cbee288 100644 --- a/src/kernel/ao_monitor.c +++ b/src/kernel/ao_monitor.c @@ -3,7 +3,8 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of @@ -35,6 +36,7 @@ #error Must define AO_MONITOR_LED #endif +__xdata uint8_t ao_monitoring_mutex; __data uint8_t ao_monitoring; static __data uint8_t ao_monitor_disabled; static __data uint8_t ao_internal_monitoring; @@ -240,6 +242,7 @@ ao_monitor_put(void) printf ("rx cleanup: %d\n", ao_rx_done_tick - ao_fec_decode_end); } #endif + ao_mutex_get(&ao_monitoring_mutex); printf("TELEM "); hex((uint8_t) (ao_monitoring + 2)); sum = 0x5a; @@ -250,6 +253,7 @@ ao_monitor_put(void) } hex(sum); putchar ('\n'); + ao_mutex_put(&ao_monitoring_mutex); #if HAS_RSSI if (recv_raw.packet[ao_monitoring + 1] & AO_RADIO_STATUS_CRC_OK) { rssi = AO_RSSI_FROM_RADIO(recv_raw.packet[ao_monitoring]); |