rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

Merged in f5soh/librepilot/LP-326_16_PPM_Channels_support (pull request #256)

Browse Source 
LP-326 16 PPM channels support
This commit is contained in:
Philippe Renon 2016-06-08 21:59:08 +02:00
commit be3be734b5
10 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
flight/pios/stm32f10x/pios_ppm.c
View File

@ -7,7 +7,8 @@
* @{
*
* @file pios_ppm.c
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief PPM Input functions (STM32 dependent)
* @see The GNU Public License (GPL) Version 3
*
@ -50,7 +51,7 @@ const struct pios_rcvr_driver pios_ppm_rcvr_driver = {
#define PIOS_PPM_IN_MIN_NUM_CHANNELS 4
#define PIOS_PPM_IN_MAX_NUM_CHANNELS PIOS_PPM_NUM_INPUTS
#define PIOS_PPM_STABLE_CHANNEL_COUNT 25 // frames
#define PIOS_PPM_IN_MIN_SYNC_PULSE_US 3000 // microseconds
#define PIOS_PPM_IN_MIN_SYNC_PULSE_US 2700 // microseconds
#define PIOS_PPM_IN_MIN_CHANNEL_PULSE_US 750 // microseconds
#define PIOS_PPM_IN_MAX_CHANNEL_PULSE_US 2250 // microseconds

5
flight/pios/stm32f4xx/pios_ppm.c
View File

@ -7,7 +7,8 @@
* @{
*
* @file pios_ppm.c
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012.
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012.
* @brief PPM Input functions (STM32 dependent)
* @see The GNU Public License (GPL) Version 3
*
@ -48,7 +49,7 @@ const struct pios_rcvr_driver pios_ppm_rcvr_driver = {
#define PIOS_PPM_IN_MIN_NUM_CHANNELS 4
#define PIOS_PPM_IN_MAX_NUM_CHANNELS PIOS_PPM_NUM_INPUTS
#define PIOS_PPM_STABLE_CHANNEL_COUNT 25 // frames
#define PIOS_PPM_IN_MIN_SYNC_PULSE_US 3800 // microseconds
#define PIOS_PPM_IN_MIN_SYNC_PULSE_US 2700 // microseconds
#define PIOS_PPM_IN_MIN_CHANNEL_PULSE_US 750 // microseconds
#define PIOS_PPM_IN_MAX_CHANNEL_PULSE_US 2250 // microseconds

2
flight/targets/boards/coptercontrol/firmware/inc/pios_config.h
View File

@ -170,7 +170,7 @@
/* Task stack sizes */
#define PIOS_ACTUATOR_STACK_SIZE 700
#define PIOS_MANUAL_STACK_SIZE 735
#define PIOS_RECEIVER_STACK_SIZE 620
#define PIOS_RECEIVER_STACK_SIZE 640
#define PIOS_STABILIZATION_STACK_SIZE 400
#ifdef DIAG_TASKS

2
flight/targets/boards/coptercontrol/pios_board.h
View File

@ -231,7 +231,7 @@ extern uint32_t pios_com_msp_id;
// Receiver PPM input
// -------------------------
#define PIOS_PPM_MAX_DEVS 1
#define PIOS_PPM_NUM_INPUTS 12
#define PIOS_PPM_NUM_INPUTS 16
// -------------------------
// Receiver PWM input

2
flight/targets/boards/discoveryf4bare/pios_board.h
View File

@ -219,7 +219,7 @@ extern uint32_t pios_packet_handler;
// Receiver PPM input
// -------------------------
#define PIOS_PPM_MAX_DEVS 1
#define PIOS_PPM_NUM_INPUTS 12
#define PIOS_PPM_NUM_INPUTS 16
// -------------------------
// Receiver PWM input

2
flight/targets/boards/revolution/pios_board.h
View File

@ -240,7 +240,7 @@ extern uint32_t pios_packet_handler;
// Receiver PPM input
// -------------------------
#define PIOS_PPM_MAX_DEVS 1
#define PIOS_PPM_NUM_INPUTS 12
#define PIOS_PPM_NUM_INPUTS 16
// -------------------------
// Receiver PWM input

2
flight/targets/boards/revonano/pios_board.h
View File

@ -240,7 +240,7 @@ extern uint32_t pios_packet_handler;
// Receiver PPM input
// -------------------------
#define PIOS_PPM_MAX_DEVS 1
#define PIOS_PPM_NUM_INPUTS 12
#define PIOS_PPM_NUM_INPUTS 16
// -------------------------
// Receiver PWM input

2
flight/targets/boards/revoproto/pios_board.h
View File

@ -196,7 +196,7 @@ extern uint32_t pios_com_msp_id;
// Receiver PPM input
// -------------------------
#define PIOS_PPM_MAX_DEVS 1
#define PIOS_PPM_NUM_INPUTS 12
#define PIOS_PPM_NUM_INPUTS 16
// -------------------------
// Receiver PWM input

2
flight/targets/boards/sparky2/pios_board.h
View File

@ -243,7 +243,7 @@ extern uint32_t pios_packet_handler;
// Receiver PPM input
// -------------------------
#define PIOS_PPM_MAX_DEVS 1
#define PIOS_PPM_NUM_INPUTS 12
#define PIOS_PPM_NUM_INPUTS 16
// -------------------------
// Receiver PWM input

2
ground/gcs/src/plugins/config/inputchannelform.cpp
View File

@ -146,11 +146,11 @@ void InputChannelForm::groupUpdated()
case ManualControlSettings::CHANNELGROUPS_OPLINK:
count = 8; // Need to make this 6 for CC
break;
case ManualControlSettings::CHANNELGROUPS_PPM:
case ManualControlSettings::CHANNELGROUPS_DSMMAINPORT:
case ManualControlSettings::CHANNELGROUPS_DSMFLEXIPORT:
count = 12;
break;
case ManualControlSettings::CHANNELGROUPS_PPM:
case ManualControlSettings::CHANNELGROUPS_SRXL:
case ManualControlSettings::CHANNELGROUPS_EXBUS:
count = 16;