rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-18 08:54:15 +01:00
Code Issues Releases Activity

Was a little aggressive on the rfm22b device structure cleanup, and removed the PPM receiver elements.

Browse Source
This commit is contained in:
Brian Webb 2013-02-25 00:30:32 +00:00
parent fff6e81e0b
commit 2f0498d8ad
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flight/PiOS/Common/pios_rfm22b.c
View File

@ -1781,8 +1781,10 @@ static enum pios_rfm22b_event rfm22_rxData(struct pios_rfm22b_dev *rfm22b_dev)
break; break;
case PACKET_TYPE_PPM: 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); PHPpmPacketHandle ppmp = (PHPpmPacketHandle)&(rfm22b_dev->rx_packet);
bool ppm_output = false; bool ppm_output = false;
#endif
#if defined(PIOS_INCLUDE_PPM_OUT) && defined(PIOS_PPM_OUTPUT) #if defined(PIOS_INCLUDE_PPM_OUT) && defined(PIOS_PPM_OUTPUT)
if (PIOS_PPM_OUTPUT) { if (PIOS_PPM_OUTPUT) {
ppm_output = true; ppm_output = true;

7
flight/PiOS/inc/pios_rfm22b_priv.h
View File

@ -792,6 +792,13 @@ struct pios_rfm22b_dev {
// The maximum time to wait for an ACK. // The maximum time to wait for an ACK.
uint8_t max_ack_delay; 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
}; };