rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
Code Issues Releases Activity

Build fixes

Browse Source
This commit is contained in:
James Whitlock 2011-07-23 22:10:17 +01:00
parent 11c568ec50
commit 6a6ec41809
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
flight/PiOS/Boards/STM32103CB_CC_Rev1.h
View File

@ -228,6 +228,11 @@ extern uint32_t pios_com_sbus_id;
#define PIOS_RCVR_MAX_DEVS 1 #define PIOS_RCVR_MAX_DEVS 1
#define PIOS_RCVR_MAX_CHANNELS 12 #define PIOS_RCVR_MAX_CHANNELS 12
//-------------------------
// Receiver PPM input
//-------------------------
#define PIOS_PPM_NUM_INPUTS 8
//------------------------- //-------------------------
// Receiver PWM input // Receiver PWM input
//------------------------- //-------------------------

5
flight/PiOS/Boards/STM3210E_OP.h
View File

@ -201,6 +201,11 @@ extern uint32_t pios_com_sbus_id;
#define PIOS_RCVR_MAX_DEVS 1 #define PIOS_RCVR_MAX_DEVS 1
#define PIOS_RCVR_MAX_CHANNELS 12 #define PIOS_RCVR_MAX_CHANNELS 12
//-------------------------
// Receiver PPM input
//-------------------------
#define PIOS_PPM_NUM_INPUTS 8
//------------------------- //-------------------------
// Receiver PWM input // Receiver PWM input
//------------------------- //-------------------------

10
flight/PiOS/STM32F10x/pios_ppm.c
View File

@ -42,7 +42,7 @@ const struct pios_rcvr_driver pios_ppm_rcvr_driver = {
}; };
#define PIOS_PPM_IN_MIN_NUM_CHANNELS 4 #define PIOS_PPM_IN_MIN_NUM_CHANNELS 4
#define PIOS_PPM_IN_MAX_NUM_CHANNELS 8 #define PIOS_PPM_IN_MAX_NUM_CHANNELS PIOS_PPM_NUM_INPUTS
#define PIOS_PPM_STABLE_CHANNEL_COUNT 25 // frames #define PIOS_PPM_STABLE_CHANNEL_COUNT 25 // frames
#define PIOS_PPM_IN_MIN_SYNC_PULSE_US 7000 // microseconds #define PIOS_PPM_IN_MIN_SYNC_PULSE_US 7000 // microseconds
#define PIOS_PPM_IN_MIN_CHANNEL_PULSE_US 750 // microseconds #define PIOS_PPM_IN_MIN_CHANNEL_PULSE_US 750 // microseconds
@ -59,7 +59,7 @@ static uint32_t CaptureValue[PIOS_PPM_IN_MAX_NUM_CHANNELS];
static uint32_t CaptureValueNewFrame[PIOS_PPM_IN_MAX_NUM_CHANNELS]; static uint32_t CaptureValueNewFrame[PIOS_PPM_IN_MAX_NUM_CHANNELS];
static uint32_t LargeCounter; static uint32_t LargeCounter;
static int8_t NumChannels; static int8_t NumChannels;
static int8_t NumChannelsPrev; static int8_t NumChannelsPrevFrame;
static uint8_t NumChannelCounter; static uint8_t NumChannelCounter;
static uint8_t supv_timer = 0; static uint8_t supv_timer = 0;
@ -79,7 +79,7 @@ void PIOS_PPM_Init(void)
DeltaTime = 0; DeltaTime = 0;
LargeCounter = 0; LargeCounter = 0;
NumChannels = -1; NumChannels = -1;
NumChannelsPrev = -1; NumChannelsPrevFrame = -1;
NumChannelCounter = 0; NumChannelCounter = 0;
Tracking = FALSE; Tracking = FALSE;
Fresh = FALSE; Fresh = FALSE;
@ -254,7 +254,7 @@ void PIOS_PPM_irq_handler(void)
} }
for (uint32_t i = NumChannels; for (uint32_t i = NumChannels;
i < PIOS_PPM_IN_MAX_NUM_CHANNELS; i++) { i < PIOS_PPM_IN_MAX_NUM_CHANNELS; i++) {
CaptureValue[i] = 0; CaptureValue[i] = PIOS_PPM_INPUT_INVALID;
} }
} }
@ -270,7 +270,7 @@ void PIOS_PPM_irq_handler(void)
/* Valid pulse duration 0.75 to 2.5 ms*/ /* Valid pulse duration 0.75 to 2.5 ms*/
if (DeltaTime > PIOS_PPM_IN_MIN_CHANNEL_PULSE_US if (DeltaTime > PIOS_PPM_IN_MIN_CHANNEL_PULSE_US
&& DeltaTime < PIOS_PPM_IN_MAX_CHANNEL_PULSE_US && DeltaTime < PIOS_PPM_IN_MAX_CHANNEL_PULSE_US
&& PulseIndex < PIOS_PPM_IN_MAX_NUM_INPUTS) { && PulseIndex < PIOS_PPM_IN_MAX_NUM_CHANNELS) {
CaptureValueNewFrame[PulseIndex] = DeltaTime; CaptureValueNewFrame[PulseIndex] = DeltaTime;
PulseIndex++; PulseIndex++;