From 2f0498d8ad6517223e7dfd231e2a9e1056bf7607 Mon Sep 17 00:00:00 2001 From: Brian Webb Date: Mon, 25 Feb 2013 00:30:32 +0000 Subject: [PATCH] Was a little aggressive on the rfm22b device structure cleanup, and removed the PPM receiver elements. --- flight/PiOS/Common/pios_rfm22b.c | 2 ++ flight/PiOS/inc/pios_rfm22b_priv.h | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/flight/PiOS/Common/pios_rfm22b.c b/flight/PiOS/Common/pios_rfm22b.c index d9ce85e57..8c32da202 100644 --- a/flight/PiOS/Common/pios_rfm22b.c +++ b/flight/PiOS/Common/pios_rfm22b.c @@ -1781,8 +1781,10 @@ static enum pios_rfm22b_event rfm22_rxData(struct pios_rfm22b_dev *rfm22b_dev) break; case PACKET_TYPE_PPM: { +#if defined(PIOS_INCLUDE_RFM22B_GCSRECEIVER) || (defined(PIOS_INCLUDE_PPM_OUT) && defined(PIOS_PPM_OUTPUT)) PHPpmPacketHandle ppmp = (PHPpmPacketHandle)&(rfm22b_dev->rx_packet); bool ppm_output = false; +#endif #if defined(PIOS_INCLUDE_PPM_OUT) && defined(PIOS_PPM_OUTPUT) if (PIOS_PPM_OUTPUT) { ppm_output = true; diff --git a/flight/PiOS/inc/pios_rfm22b_priv.h b/flight/PiOS/inc/pios_rfm22b_priv.h index 782f76b65..c09745487 100644 --- a/flight/PiOS/inc/pios_rfm22b_priv.h +++ b/flight/PiOS/inc/pios_rfm22b_priv.h @@ -792,6 +792,13 @@ struct pios_rfm22b_dev { // The maximum time to wait for an ACK. uint8_t max_ack_delay; + +#ifdef PIOS_INCLUDE_RFM22B_RCVR + // The PPM channel values + uint16_t ppm_channel[PIOS_RFM22B_RCVR_MAX_CHANNELS]; + uint8_t ppm_supv_timer; + bool ppm_fresh; +#endif };