diff --git a/flight/modules/OPLink/oplinkmod.c b/flight/modules/OPLink/oplinkmod.c index be746756c..cc076053a 100644 --- a/flight/modules/OPLink/oplinkmod.c +++ b/flight/modules/OPLink/oplinkmod.c @@ -158,7 +158,6 @@ static void systemTask(__attribute__((unused)) void *parameters) oplinkStatus.RxMissed = radio_stats.rx_missed; oplinkStatus.RxFailure = radio_stats.rx_failure; oplinkStatus.TxDropped = radio_stats.tx_dropped; - oplinkStatus.TxResent = radio_stats.tx_resent; oplinkStatus.TxFailure = radio_stats.tx_failure; oplinkStatus.Resets = radio_stats.resets; oplinkStatus.Timeouts = radio_stats.timeouts; diff --git a/flight/modules/System/systemmod.c b/flight/modules/System/systemmod.c index affcf580d..33567d827 100644 --- a/flight/modules/System/systemmod.c +++ b/flight/modules/System/systemmod.c @@ -267,7 +267,6 @@ static void systemTask(__attribute__((unused)) void *parameters) oplinkStatus.RxMissed = radio_stats.rx_missed; oplinkStatus.RxFailure = radio_stats.rx_failure; oplinkStatus.TxDropped = radio_stats.tx_dropped; - oplinkStatus.TxResent = radio_stats.tx_resent; oplinkStatus.TxFailure = radio_stats.tx_failure; oplinkStatus.Resets = radio_stats.resets; oplinkStatus.Timeouts = radio_stats.timeouts; diff --git a/flight/pios/common/pios_rfm22b.c b/flight/pios/common/pios_rfm22b.c index ea43eca9d..f1b1525ff 100644 --- a/flight/pios/common/pios_rfm22b.c +++ b/flight/pios/common/pios_rfm22b.c @@ -422,7 +422,6 @@ int32_t PIOS_RFM22B_Init(uint32_t *rfm22b_id, uint32_t spi_id, uint32_t slave_nu rfm22b_dev->stats.rx_error = 0; rfm22b_dev->stats.rx_missed = 0; rfm22b_dev->stats.tx_dropped = 0; - rfm22b_dev->stats.tx_resent = 0; rfm22b_dev->stats.resets = 0; rfm22b_dev->stats.timeouts = 0; rfm22b_dev->stats.link_quality = 0; @@ -1737,7 +1736,7 @@ static bool pios_rfm22_readStatus(struct pios_rfm22b_dev *rfm22b_dev) */ static void rfm22_rxFailure(struct pios_rfm22b_dev *rfm22b_dev) { - rfm22b_dev->stats.rx_failure++; + rfm22b_add_rx_status(rfm22b_dev, RADIO_FAILURE_RX_PACKET); rfm22b_dev->rx_buffer_wr = 0; rfm22b_dev->packet_start_ticks = 0; rfm22b_dev->rfm22b_state = RFM22B_STATE_TRANSITION; @@ -2099,7 +2098,7 @@ static void rfm22_calculateLinkQuality(struct pios_rfm22b_dev *rfm22b_dev) rfm22b_dev->stats.rx_good = 0; rfm22b_dev->stats.rx_corrected = 0; rfm22b_dev->stats.rx_error = 0; - rfm22b_dev->stats.tx_resent = 0; + rfm22b_dev->stats.rx_failure = 0; for (uint8_t i = 0; i < RFM22B_RX_PACKET_STATS_LEN; ++i) { uint32_t val = rfm22b_dev->rx_packet_stats[i]; for (uint8_t j = 0; j < 16; ++j) { @@ -2113,8 +2112,8 @@ static void rfm22_calculateLinkQuality(struct pios_rfm22b_dev *rfm22b_dev) case RADIO_ERROR_RX_PACKET: rfm22b_dev->stats.rx_error++; break; - case RADIO_RESENT_TX_PACKET: - rfm22b_dev->stats.tx_resent++; + case RADIO_FAILURE_RX_PACKET: + rfm22b_dev->stats.rx_failure++; break; } } @@ -2124,7 +2123,7 @@ static void rfm22_calculateLinkQuality(struct pios_rfm22b_dev *rfm22b_dev) // Note: This assumes that the number of packets sampled for the stats is 64. // Using this equation, error and resent packets are counted as -2, and corrected packets are counted as -1. // The range is 0 (all error or resent packets) to 128 (all good packets). - rfm22b_dev->stats.link_quality = 64 + rfm22b_dev->stats.rx_good - rfm22b_dev->stats.rx_error - rfm22b_dev->stats.tx_resent; + rfm22b_dev->stats.link_quality = 64 + rfm22b_dev->stats.rx_good - rfm22b_dev->stats.rx_error - rfm22b_dev->stats.rx_failure; } /** diff --git a/flight/pios/inc/pios_rfm22b.h b/flight/pios/inc/pios_rfm22b.h index b6001ba38..7581300d8 100644 --- a/flight/pios/inc/pios_rfm22b.h +++ b/flight/pios/inc/pios_rfm22b.h @@ -90,7 +90,6 @@ struct rfm22b_stats { uint8_t rx_missed; uint8_t rx_failure; uint8_t tx_dropped; - uint8_t tx_resent; uint8_t tx_failure; uint8_t resets; uint8_t timeouts; diff --git a/flight/pios/inc/pios_rfm22b_priv.h b/flight/pios/inc/pios_rfm22b_priv.h index 7efdd449e..360f52ecb 100644 --- a/flight/pios/inc/pios_rfm22b_priv.h +++ b/flight/pios/inc/pios_rfm22b_priv.h @@ -578,7 +578,7 @@ enum pios_rfm22b_rx_packet_status { RADIO_GOOD_RX_PACKET = 0x00, RADIO_CORRECTED_RX_PACKET = 0x01, RADIO_ERROR_RX_PACKET = 0x2, - RADIO_RESENT_TX_PACKET = 0x3 + RADIO_FAILURE_RX_PACKET = 0x3 }; typedef struct { diff --git a/shared/uavobjectdefinition/oplinkstatus.xml b/shared/uavobjectdefinition/oplinkstatus.xml index 07fda4375..5a225ff28 100644 --- a/shared/uavobjectdefinition/oplinkstatus.xml +++ b/shared/uavobjectdefinition/oplinkstatus.xml @@ -13,7 +13,6 @@ -