rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-04-10 02:02:21 +02:00
Code Issues Releases Activity

Get PIOS_GCSRCVR working on revo

Browse Source
This commit is contained in:
James Cotton 2012-06-04 09:46:23 -05:00
parent dc7fe1bdd8
commit 9f93c9cbec
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flight/PiOS/Boards/STM32F4xx_Revolution.h
View File

@ -189,6 +189,7 @@ extern uint32_t pios_com_vcp_id;
//------------------------ //------------------------
#define PIOS_RCVR_MAX_DEVS 3 #define PIOS_RCVR_MAX_DEVS 3
#define PIOS_RCVR_MAX_CHANNELS 12 #define PIOS_RCVR_MAX_CHANNELS 12
#define PIOS_GCSRCVR_TIMEOUT_MS 100
//------------------------- //-------------------------
// Receiver PPM input // Receiver PPM input

8
flight/PiOS/Common/pios_gcsrcvr.c
View File

@ -73,7 +73,7 @@ static struct pios_gcsrcvr_dev *PIOS_gcsrcvr_alloc(void)
if (!gcsrcvr_dev) return(NULL); if (!gcsrcvr_dev) return(NULL);
gcsrcvr_dev->magic = PIOS_GCSRCVR_DEV_MAGIC; gcsrcvr_dev->magic = PIOS_GCSRCVR_DEV_MAGIC;
gcsrcvr_dev->Fresh = FALSE; gcsrcvr_dev->Fresh = false;
gcsrcvr_dev->supv_timer = 0; gcsrcvr_dev->supv_timer = 0;
/* The update callback cannot receive the device pointer, so set it in a global */ /* The update callback cannot receive the device pointer, so set it in a global */
@ -94,7 +94,7 @@ static struct pios_gcsrcvr_dev *PIOS_gcsrcvr_alloc(void)
gcsrcvr_dev = &pios_gcsrcvr_devs[pios_gcsrcvr_num_devs++]; gcsrcvr_dev = &pios_gcsrcvr_devs[pios_gcsrcvr_num_devs++];
gcsrcvr_dev->magic = PIOS_GCSRCVR_DEV_MAGIC; gcsrcvr_dev->magic = PIOS_GCSRCVR_DEV_MAGIC;
gcsrcvr_dev->Fresh = FALSE; gcsrcvr_dev->Fresh = false;
gcsrcvr_dev->supv_timer = 0; gcsrcvr_dev->supv_timer = 0;
global_gcsrcvr_dev = gcsrcvr_dev; global_gcsrcvr_dev = gcsrcvr_dev;
@ -108,7 +108,7 @@ static void gcsreceiver_updated(UAVObjEvent * ev)
struct pios_gcsrcvr_dev *gcsrcvr_dev = global_gcsrcvr_dev; struct pios_gcsrcvr_dev *gcsrcvr_dev = global_gcsrcvr_dev;
if (ev->obj == GCSReceiverHandle()) { if (ev->obj == GCSReceiverHandle()) {
GCSReceiverGet(&gcsreceiverdata); GCSReceiverGet(&gcsreceiverdata);
gcsrcvr_dev->Fresh = TRUE; gcsrcvr_dev->Fresh = true;
} }
} }
@ -163,7 +163,7 @@ static void PIOS_gcsrcvr_Supervisor(uint32_t gcsrcvr_id) {
for (int32_t i = 0; i < GCSRECEIVER_CHANNEL_NUMELEM; i++) for (int32_t i = 0; i < GCSRECEIVER_CHANNEL_NUMELEM; i++)
gcsreceiverdata.Channel[i] = PIOS_RCVR_TIMEOUT; gcsreceiverdata.Channel[i] = PIOS_RCVR_TIMEOUT;
gcsrcvr_dev->Fresh = FALSE; gcsrcvr_dev->Fresh = false;
} }
#endif /* PIOS_INCLUDE_GCSRCVR */ #endif /* PIOS_INCLUDE_GCSRCVR */

1
flight/Revolution/Makefile
View File

@ -149,6 +149,7 @@ include $(PIOS)/STM32F4xx/library.mk
SRC += $(PIOSCOMMON)/pios_mpu6000.c SRC += $(PIOSCOMMON)/pios_mpu6000.c
SRC += $(PIOSCOMMON)/pios_bma180.c SRC += $(PIOSCOMMON)/pios_bma180.c
SRC += $(PIOSCOMMON)/pios_etasv3.c SRC += $(PIOSCOMMON)/pios_etasv3.c
SRC += $(PIOSCOMMON)/pios_gcsrcvr.c
SRC += $(PIOSCOMMON)/pios_l3gd20.c SRC += $(PIOSCOMMON)/pios_l3gd20.c
SRC += $(PIOSCOMMON)/pios_hmc5883.c SRC += $(PIOSCOMMON)/pios_hmc5883.c
SRC += $(PIOSCOMMON)/pios_ms5611.c SRC += $(PIOSCOMMON)/pios_ms5611.c

2
flight/Revolution/System/inc/pios_config.h
View File

@ -82,7 +82,7 @@
//#define PIOS_INCLUDE_SBUS //#define PIOS_INCLUDE_SBUS
#define PIOS_INCLUDE_PPM #define PIOS_INCLUDE_PPM
#define PIOS_INCLUDE_PWM #define PIOS_INCLUDE_PWM
//#define PIOS_INCLUDE_GCSRCVR #define PIOS_INCLUDE_GCSRCVR
#define PIOS_INCLUDE_SETTINGS #define PIOS_INCLUDE_SETTINGS
#define PIOS_INCLUDE_FLASH #define PIOS_INCLUDE_FLASH