From c44235494c2797677386528dd9753516c5da7cc5 Mon Sep 17 00:00:00 2001 From: James Cotton Date: Sun, 13 Nov 2011 17:23:56 -0600 Subject: [PATCH] Update the Revolution board file a bit --- flight/PiOS/Boards/STM32F4xx_Revolution.h | 24 +++++++++---------- .../OpenPilotOSX.xcodeproj/project.pbxproj | 2 ++ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/flight/PiOS/Boards/STM32F4xx_Revolution.h b/flight/PiOS/Boards/STM32F4xx_Revolution.h index e949958db..d9f802233 100644 --- a/flight/PiOS/Boards/STM32F4xx_Revolution.h +++ b/flight/PiOS/Boards/STM32F4xx_Revolution.h @@ -92,7 +92,7 @@ TIM8 | | | | // PIOS_SPI // See also pios_board.c //------------------------ -#define PIOS_SPI_MAX_DEVS 2 +#define PIOS_SPI_MAX_DEVS 3 //------------------------ // PIOS_WDG @@ -160,32 +160,32 @@ extern uint32_t pios_com_telem_usb_id; // PIOS_RCVR // See also pios_board.c //------------------------ -#define PIOS_RCVR_MAX_DEVS 1 -#define PIOS_RCVR_MAX_CHANNELS 12 +#define PIOS_RCVR_MAX_DEVS 3 +#define PIOS_RCVR_MAX_CHANNELS 12 //------------------------- // Receiver PPM input //------------------------- -#define PIOS_PPM_MAX_DEVS 1 -#define PIOS_PPM_NUM_INPUTS 12 +#define PIOS_PPM_MAX_DEVS 1 +#define PIOS_PPM_NUM_INPUTS 12 //------------------------- // Receiver PWM input //------------------------- -#define PIOS_PWM_MAX_DEVS 1 -#define PIOS_PWM_NUM_INPUTS 8 +#define PIOS_PWM_MAX_DEVS 1 +#define PIOS_PWM_NUM_INPUTS 8 //------------------------- // Receiver SPEKTRUM input //------------------------- -#define PIOS_SPEKTRUM_MAX_DEVS 1 -#define PIOS_SPEKTRUM_NUM_INPUTS 12 +#define PIOS_SPEKTRUM_MAX_DEVS 2 +#define PIOS_SPEKTRUM_NUM_INPUTS 12 //------------------------- // Receiver S.Bus input //------------------------- -#define PIOS_SBUS_MAX_DEVS 0 -#define PIOS_SBUS_NUM_INPUTS (16+2) +#define PIOS_SBUS_MAX_DEVS 1 +#define PIOS_SBUS_NUM_INPUTS (16+2) //------------------------- // Servo outputs @@ -196,7 +196,7 @@ extern uint32_t pios_com_telem_usb_id; //-------------------------- // Timer controller settings //-------------------------- -#define PIOS_TIM_MAX_DEVS 3 +#define PIOS_TIM_MAX_DEVS 6 //------------------------- // ADC diff --git a/flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/project.pbxproj b/flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/project.pbxproj index 2c1fdfdf9..4f81ba6bc 100644 --- a/flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/project.pbxproj +++ b/flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/project.pbxproj @@ -3461,6 +3461,7 @@ 65FA9B6E147078450019A260 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = ""; }; 65FA9B6F147078450019A260 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; 65FA9B70147078450019A260 /* pios_board.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pios_board.c; sourceTree = ""; }; + 65FA9B71147087020019A260 /* STM32F4xx_Revolution.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = STM32F4xx_Revolution.h; sourceTree = ""; }; 65FAA03F133B669400F6F5CD /* GTOP_BIN.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = GTOP_BIN.c; sourceTree = ""; }; 65FBE14412E7C98100176B5A /* pios_servo_priv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pios_servo_priv.h; sourceTree = ""; }; 65FC66AA123F30F100B04F74 /* ahrs_timer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ahrs_timer.c; path = ../../AHRS/ahrs_timer.c; sourceTree = SOURCE_ROOT; }; @@ -4189,6 +4190,7 @@ 65632DF41251650300469B77 /* Boards */ = { isa = PBXGroup; children = ( + 65FA9B71147087020019A260 /* STM32F4xx_Revolution.h */, 65632DF51251650300469B77 /* pios_board.h */, 65632DF71251650300469B77 /* STM3210E_OP.h */, 65632DF61251650300469B77 /* STM32103CB_AHRS.h */,