projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
src
/
kernel
/
ao_monitor.c
diff --git
a/src/kernel/ao_monitor.c
b/src/kernel/ao_monitor.c
index 3f1ff217b18d2b4336eb2baba1befc1033d216f8..3310a847a6b1ce0995aabd212160c66ec4c3c5dd 100644
(file)
--- a/
src/kernel/ao_monitor.c
+++ b/
src/kernel/ao_monitor.c
@@
-62,7
+62,7
@@
_ao_monitor_adjust(void)
ao_wakeup(&ao_monitoring);
}
ao_wakeup(&ao_monitoring);
}
-void
+
static
void
ao_monitor_get(void)
{
uint8_t size;
ao_monitor_get(void)
{
uint8_t size;
@@
-93,7
+93,7
@@
ao_monitor_get(void)
#if AO_MONITOR_LED
struct ao_task ao_monitor_blink_task;
#if AO_MONITOR_LED
struct ao_task ao_monitor_blink_task;
-void
+
static
void
ao_monitor_blink(void)
{
#ifdef AO_MONITOR_BAD
ao_monitor_blink(void)
{
#ifdef AO_MONITOR_BAD
@@
-121,7
+121,7
@@
static const char xdigit[16] = {
#define hex(c) do { putchar(xdigit[(c) >> 4]); putchar(xdigit[(c)&0xf]); } while (0)
#define hex(c) do { putchar(xdigit[(c) >> 4]); putchar(xdigit[(c)&0xf]); } while (0)
-void
+
static
void
ao_monitor_put(void)
{
#if LEGACY_MONITOR
ao_monitor_put(void)
{
#if LEGACY_MONITOR
@@
-157,7
+157,7
@@
ao_monitor_put(void)
state = recv_orig.telemetry_orig.flight_state;
rssi = (int16_t) AO_RSSI_FROM_RADIO(recv_orig.rssi);
state = recv_orig.telemetry_orig.flight_state;
rssi = (int16_t) AO_RSSI_FROM_RADIO(recv_orig.rssi);
-
ao_x
memcpy(callsign, recv_orig.telemetry_orig.callsign, AO_MAX_CALLSIGN);
+ memcpy(callsign, recv_orig.telemetry_orig.callsign, AO_MAX_CALLSIGN);
if (state > ao_flight_invalid)
state = ao_flight_invalid;
if (recv_orig.status & PKT_APPEND_STATUS_1_CRC_OK) {
if (state > ao_flight_invalid)
state = ao_flight_invalid;
if (recv_orig.status & PKT_APPEND_STATUS_1_CRC_OK) {
@@
-296,7
+296,7
@@
ao_monitor_enable(void)
static void
set_monitor(void)
{
static void
set_monitor(void)
{
- ao_external_monitoring = ao_cmd_hex();
+ ao_external_monitoring =
(uint8_t)
ao_cmd_hex();
ao_wakeup(&ao_external_monitoring);
ao_wakeup(&ao_monitor_head);
_ao_monitor_adjust();
ao_wakeup(&ao_external_monitoring);
ao_wakeup(&ao_monitor_head);
_ao_monitor_adjust();