From fc6d544476fa0191aef736d5470f1a0eb558dff4 Mon Sep 17 00:00:00 2001 From: Mathieu Rondonneau Date: Wed, 28 Aug 2013 19:45:50 -0700 Subject: [PATCH] OP-1067 Force oplonk to report disabled if rfm22b is not initialized. --- flight/modules/OPLink/oplinkmod.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/flight/modules/OPLink/oplinkmod.c b/flight/modules/OPLink/oplinkmod.c index 8b4c7617d..3ddbd279f 100644 --- a/flight/modules/OPLink/oplinkmod.c +++ b/flight/modules/OPLink/oplinkmod.c @@ -149,6 +149,7 @@ static void systemTask(__attribute__((unused)) void *parameters) struct rfm22b_stats radio_stats; PIOS_RFM22B_GetStats(pios_rfm22b_id, &radio_stats); + if (pios_rfm22b_id) { // Update the status oplinkStatus.HeapRemaining = xPortGetFreeHeapSize(); oplinkStatus.DeviceID = PIOS_RFM22B_DeviceID(pios_rfm22b_id); @@ -179,6 +180,11 @@ static void systemTask(__attribute__((unused)) void *parameters) oplinkStatus.TXSeq = radio_stats.tx_seq; oplinkStatus.RXSeq = radio_stats.rx_seq; oplinkStatus.LinkState = radio_stats.link_state; + + } else { + oplinkStatus.LinkState = OPLINKSTATUS_LINKSTATE_DISABLED; + } + if (radio_stats.link_state == OPLINKSTATUS_LINKSTATE_CONNECTED) { LINK_LED_ON; } else {