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

Changed all references to PipXtreme on flight side to OPLink.

Browse Source
This commit is contained in:
Brian Webb 2013-04-12 14:37:06 +01:00 committed by Oleg Semyonov
parent b4a4ada1b0
commit ba7b712cf1
34 changed files with 342 additions and 342 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -198,12 +198,12 @@ export OPUAVSYNTHDIR := $(BUILD_DIR)/uavobject-synthetics/flight
export OPGCSSYNTHDIR := $(BUILD_DIR)/openpilotgcs-synthetics
# Define supported board lists
ALL_BOARDS := coptercontrol pipxtreme revolution revomini osd simposix
ALL_BOARDS_BU := coptercontrol pipxtreme simposix
ALL_BOARDS := coptercontrol oplink revolution revomini osd simposix
ALL_BOARDS_BU := coptercontrol oplink simposix
# Friendly names of each board (used to find source tree)
coptercontrol_friendly := CopterControl
pipxtreme_friendly := PipXtreme
oplink_friendly := OPLink
revolution_friendly := Revolution
revomini_friendly := RevoMini
osd_friendly := OSD
@ -211,7 +211,7 @@ simposix_friendly := SimPosix
# Short names of each board (used to display board name in parallel builds)
coptercontrol_short := 'cc '
pipxtreme_short := 'pipx'
oplink_short := 'opl'
revolution_short := 'revo'
revomini_short := 'rm '
osd_short := 'osd '

14
flight/Modules/PipXtreme/inc/pipxtrememod.h → flight/Modules/OPLink/inc/oplinkmod.h
View File

@ -2,12 +2,12 @@
******************************************************************************
* @addtogroup OpenPilotModules OpenPilot Modules
* @{
* @addtogroup PipXtremeModule PipXtreme Module
* @addtogroup OPLinkModule OPLink Module
* @{
*
* @file pipxtrememod.h
* @file oplinkmod.h
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012.
* @brief The PipXtreme system module
* @brief The OPLink system module
*
* @see The GNU Public License (GPL) Version 3
*
@ -27,9 +27,9 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef PIPXTREMEMOD_H
#define PIPXTREMEMOD_H
#ifndef OPLINKMOD_H
#define OPLINKMOD_H
int32_t PipXtremeModInitialize(void);
int32_t OPLinkModInitialize(void);
#endif // PIPXTREMEMOD_H
#endif // OPLINKMOD_H

22
flight/Modules/PipXtreme/pipxtrememod.c → flight/Modules/OPLink/oplinkmod.c
View File

@ -2,20 +2,20 @@
******************************************************************************
* @addtogroup OpenPilotModules OpenPilot Modules
* @brief The OpenPilot Modules do the majority of the control in OpenPilot. The
* @ref PipXtremeModule The PipXtreme Module is the equivalanet of the System
* Module for the PipXtreme modem. it starts all the other modules.
* @ref OPLinkModule The OPLink Module is the equivalanet of the System
* Module for the OPLink modem. it starts all the other modules.
# This is done through the @ref PIOS "PIOS Hardware abstraction layer",
# which then contains hardware specific implementations
* (currently only STM32 supported)
*
* @{
* @addtogroup PipXtremeModule PipXtreme Module
* @addtogroup OPLinkModule OPLink Module
* @brief Initializes PIOS and other modules runs monitoring
* After initializing all the modules runs basic monitoring and
* alarms.
* @{
*
* @file pipxtrememod.c
* @file oplinkmod.c
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012.
* @brief System module
*
@ -72,13 +72,13 @@ static void systemTask(void *parameters);
* Create the module task.
* \returns 0 on success or -1 if initialization failed
*/
int32_t PipXtremeModStart(void)
int32_t OPLinkModStart(void)
{
// Initialize vars
stackOverflow = false;
mallocFailed = false;
// Create pipxtreme system task
xTaskCreate(systemTask, (signed char *)"PipXtreme", STACK_SIZE_BYTES/4, NULL, TASK_PRIORITY, &systemTaskHandle);
// Create oplink system task
xTaskCreate(systemTask, (signed char *)"OPLink", STACK_SIZE_BYTES/4, NULL, TASK_PRIORITY, &systemTaskHandle);
// Register task
TaskMonitorAdd(TASKINFO_RUNNING_SYSTEM, systemTaskHandle);
@ -89,7 +89,7 @@ int32_t PipXtremeModStart(void)
* Initialize the module, called on startup.
* \returns 0 on success or -1 if initialization failed
*/
int32_t PipXtremeModInitialize(void)
int32_t OPLinkModInitialize(void)
{
// Must registers objects here for system thread because ObjectManager started in OpenPilotInit
@ -111,12 +111,12 @@ int32_t PipXtremeModInitialize(void)
OPLinkStatusSet(&oplinkStatus);
// Call the module start function.
PipXtremeModStart();
OPLinkModStart();
return 0;
}
MODULE_INITCALL(PipXtremeModInitialize, 0)
MODULE_INITCALL(OPLinkModInitialize, 0)
/**
* System task, periodically executes every SYSTEM_UPDATE_PERIOD_MS
@ -152,7 +152,7 @@ static void systemTask(void *parameters)
PIOS_LED_Toggle(PIOS_LED_HEARTBEAT);
#endif /* PIOS_LED_HEARTBEAT */
// Update the PipXstatus UAVO
// Update the OPLinkStatus UAVO
OPLinkStatusData oplinkStatus;
OPLinkStatusGet(&oplinkStatus);

6
flight/PiOS/Boards/STM32103CB_PIPXTREME_Rev1.h → flight/PiOS/Boards/STM32103CB_OPLink_Rev1.h
View File

@ -23,8 +23,8 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef STM32103CB_PIPXTREME_H_
#define STM32103CB_PIPXTREME_H_
#ifndef STM32103CB_OPLINK_H_
#define STM32103CB_OPLINK_H_
#define ADD_ONE_ADC
@ -312,4 +312,4 @@ extern uint32_t pios_packet_handler;
#define PIOS_FLASH_EEPROM_ADDR (PIOS_FLASH_EEPROM_START_ADDR + PIOS_FLASH_SIZE - PIOS_FLASH_PAGE_SIZE)
#define PIOS_FLASH_EEPROM_LEN PIOS_FLASH_PAGE_SIZE
#endif /* STM32103CB_PIPXTREME_H_ */
#endif /* STM32103CB_OPLINK_H_ */

4
flight/PiOS/Boards/pios_board.h
View File

@ -3,8 +3,8 @@
#ifdef USE_STM3210E_OP
#include "STM3210E_OP.h"
#elif USE_STM32103CB_PIPXTREME
#include "STM32103CB_PIPXTREME_Rev1.h"
#elif USE_STM32103CB_OPLINK
#include "STM32103CB_OPLINK_Rev1.h"
#elif USE_STM32103CB_CC_Rev1
#include "STM32103CB_CC_Rev1.h"
#elif USE_STM32F2xx_INS

0
flight/PiOS/STM32F10x/link_STM32103CB_PIPXTREME_BL_sections.ld → flight/PiOS/STM32F10x/link_STM32103CB_OPLINK_BL_sections.ld
View File

0
flight/PiOS/STM32F10x/link_STM32103CB_PIPXTREME_memory.ld → flight/PiOS/STM32F10x/link_STM32103CB_OPLINK_memory.ld
View File

0
flight/PiOS/STM32F10x/link_STM32103CB_PIPXTREME_sections.ld → flight/PiOS/STM32F10x/link_STM32103CB_OPLINK_sections.ld
View File

4
flight/PiOS/inc/pios_usb_defs.h
View File

@ -351,7 +351,7 @@ enum usb_cdc_notification {
enum usb_product_ids {
USB_PRODUCT_ID_OPENPILOT_MAIN = 0x415A,
USB_PRODUCT_ID_COPTERCONTROL = 0x415B,
USB_PRODUCT_ID_PIPXTREME = 0x415C,
USB_PRODUCT_ID_OPLINK = 0x415C,
USB_PRODUCT_ID_CC3D = 0x415D,
USB_PRODUCT_ID_REVOLUTION = 0x415E,
USB_PRODUCT_ID_OSD = 0x4194,
@ -361,7 +361,7 @@ enum usb_product_ids {
enum usb_op_board_ids {
USB_OP_BOARD_ID_OPENPILOT_MAIN = 1,
/* Board ID 2 may be unused or AHRS */
USB_OP_BOARD_ID_PIPXTREME = 3,
USB_OP_BOARD_ID_OPLINK = 3,
USB_OP_BOARD_ID_COPTERCONTROL = 4,
USB_OP_BOARD_ID_REVOLUTION = 5,
USB_OP_BOARD_ID_OSD = 6,

596
flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/project.pbxproj
View File

@ -1,298 +1,298 @@
// !$*UTF8*$!
{
archiveVersion = 1;
classes = {
};
objectVersion = 45;
objects = {
/* Begin PBXFileReference section */
4354B66314FED9FE004BA3B4 /* flight */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flight; path = ../..; sourceTree = SOURCE_ROOT; };
65173C9F12EBFD1700D6A7CB /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; name = Makefile; path = ../../../Makefile; sourceTree = SOURCE_ROOT; };
65904F1814632C1700FD9482 /* firmware-defs.mk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "firmware-defs.mk"; sourceTree = "<group>"; };
65904F2214632C1700FD9482 /* board-info.mk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "board-info.mk"; sourceTree = "<group>"; };
65904F2314632C1700FD9482 /* board-info.mk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "board-info.mk"; sourceTree = "<group>"; };
65904F2414632C1700FD9482 /* board-info.mk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "board-info.mk"; sourceTree = "<group>"; };
65904F2514632C1700FD9482 /* board-info.mk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "board-info.mk"; sourceTree = "<group>"; };
65904F2614632C1700FD9482 /* board-info.mk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "board-info.mk"; sourceTree = "<group>"; };
65904F2714632C1700FD9482 /* board-info.mk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "board-info.mk"; sourceTree = "<group>"; };
65904F2814632C1700FD9482 /* version-info.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = "version-info.py"; sourceTree = "<group>"; };
65904F2914632C1700FD9482 /* firmwareinfotemplate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = firmwareinfotemplate.c; sourceTree = "<group>"; };
65904F2A14632C1700FD9482 /* gcsversioninfotemplate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gcsversioninfotemplate.h; sourceTree = "<group>"; };
65904F2D14632C1700FD9482 /* README.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.txt; sourceTree = "<group>"; };
65904F2E14632C1700FD9482 /* shell_script.reg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = shell_script.reg; sourceTree = "<group>"; };
65904F2F14632C1700FD9482 /* install */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = install; sourceTree = "<group>"; };
65904F3014632C1700FD9482 /* make */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = make; sourceTree = "<group>"; };
65904F3114632C1700FD9482 /* make.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = make.sh; sourceTree = "<group>"; };
65904F3214632C1700FD9482 /* sh.cmd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = sh.cmd; sourceTree = "<group>"; };
65904F34146362F300FD9482 /* board-info.mk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "board-info.mk"; sourceTree = "<group>"; };
65E466BC14E244020075459C /* uavobjectdefinition */ = {isa = PBXFileReference; lastKnownFileType = folder; path = uavobjectdefinition; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXGroup section */
08FB7794FE84155DC02AAC07 /* OpenPilotOSX */ = {
isa = PBXGroup;
children = (
4354B66314FED9FE004BA3B4 /* flight */,
65904F1614632C1700FD9482 /* make */,
65C35E4E12EFB2F3004811C2 /* shared */,
65173C9F12EBFD1700D6A7CB /* Makefile */,
);
name = OpenPilotOSX;
sourceTree = "<group>";
};
65904F1614632C1700FD9482 /* make */ = {
isa = PBXGroup;
children = (
65904F1714632C1700FD9482 /* boards */,
65904F1814632C1700FD9482 /* firmware-defs.mk */,
65904F1914632C1700FD9482 /* scripts */,
65904F1A14632C1700FD9482 /* templates */,
65904F1B14632C1700FD9482 /* winx86 */,
);
name = make;
path = OpenPilotOSX.xcodeproj/../../../../make;
sourceTree = "<group>";
};
65904F1714632C1700FD9482 /* boards */ = {
isa = PBXGroup;
children = (
65904F33146362F300FD9482 /* revolution */,
65904F1C14632C1700FD9482 /* ahrs */,
65904F1D14632C1700FD9482 /* coptercontrol */,
65904F1E14632C1700FD9482 /* esc */,
65904F1F14632C1700FD9482 /* ins */,
65904F2014632C1700FD9482 /* openpilot */,
65904F2114632C1700FD9482 /* pipxtreme */,
);
path = boards;
sourceTree = "<group>";
};
65904F1914632C1700FD9482 /* scripts */ = {
isa = PBXGroup;
children = (
65904F2814632C1700FD9482 /* version-info.py */,
);
path = scripts;
sourceTree = "<group>";
};
65904F1A14632C1700FD9482 /* templates */ = {
isa = PBXGroup;
children = (
65904F2914632C1700FD9482 /* firmwareinfotemplate.c */,
65904F2A14632C1700FD9482 /* gcsversioninfotemplate.h */,
);
path = templates;
sourceTree = "<group>";
};
65904F1B14632C1700FD9482 /* winx86 */ = {
isa = PBXGroup;
children = (
65904F2B14632C1700FD9482 /* bin */,
65904F2C14632C1700FD9482 /* cmd */,
65904F2D14632C1700FD9482 /* README.txt */,
65904F2E14632C1700FD9482 /* shell_script.reg */,
);
path = winx86;
sourceTree = "<group>";
};
65904F1C14632C1700FD9482 /* ahrs */ = {
isa = PBXGroup;
children = (
65904F2214632C1700FD9482 /* board-info.mk */,
);
path = ahrs;
sourceTree = "<group>";
};
65904F1D14632C1700FD9482 /* coptercontrol */ = {
isa = PBXGroup;
children = (
65904F2314632C1700FD9482 /* board-info.mk */,
);
path = coptercontrol;
sourceTree = "<group>";
};
65904F1E14632C1700FD9482 /* esc */ = {
isa = PBXGroup;
children = (
65904F2414632C1700FD9482 /* board-info.mk */,
);
path = esc;
sourceTree = "<group>";
};
65904F1F14632C1700FD9482 /* ins */ = {
isa = PBXGroup;
children = (
65904F2514632C1700FD9482 /* board-info.mk */,
);
path = ins;
sourceTree = "<group>";
};
65904F2014632C1700FD9482 /* openpilot */ = {
isa = PBXGroup;
children = (
65904F2614632C1700FD9482 /* board-info.mk */,
);
path = openpilot;
sourceTree = "<group>";
};
65904F2114632C1700FD9482 /* pipxtreme */ = {
isa = PBXGroup;
children = (
65904F2714632C1700FD9482 /* board-info.mk */,
);
path = pipxtreme;
sourceTree = "<group>";
};
65904F2B14632C1700FD9482 /* bin */ = {
isa = PBXGroup;
children = (
65904F2F14632C1700FD9482 /* install */,
65904F3014632C1700FD9482 /* make */,
);
path = bin;
sourceTree = "<group>";
};
65904F2C14632C1700FD9482 /* cmd */ = {
isa = PBXGroup;
children = (
65904F3114632C1700FD9482 /* make.sh */,
65904F3214632C1700FD9482 /* sh.cmd */,
);
path = cmd;
sourceTree = "<group>";
};
65904F33146362F300FD9482 /* revolution */ = {
isa = PBXGroup;
children = (
65904F34146362F300FD9482 /* board-info.mk */,
);
path = revolution;
sourceTree = "<group>";
};
65C35E4E12EFB2F3004811C2 /* shared */ = {
isa = PBXGroup;
children = (
65E466BC14E244020075459C /* uavobjectdefinition */,
);
name = shared;
path = ../../../shared;
sourceTree = SOURCE_ROOT;
};
/* End PBXGroup section */
/* Begin PBXLegacyTarget section */
6581071511DE809D0049FB12 /* OpenPilotOSX */ = {
isa = PBXLegacyTarget;
buildArgumentsString = "$(ACTION) -f Makefile.posix";
buildConfigurationList = 6581071A11DE80A30049FB12 /* Build configuration list for PBXLegacyTarget "OpenPilotOSX" */;
buildPhases = (
);
buildToolPath = /usr/bin/make;
buildWorkingDirectory = ../../OpenPilot;
dependencies = (
);
name = OpenPilotOSX;
passBuildSettingsInEnvironment = 1;
productName = OpenPilotOSX;
};
/* End PBXLegacyTarget section */
/* Begin PBXProject section */
08FB7793FE84155DC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
ORGANIZATIONNAME = OpenPilot;
};
buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "OpenPilotOSX" */;
compatibilityVersion = "Xcode 3.1";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
English,
Japanese,
French,
German,
);
mainGroup = 08FB7794FE84155DC02AAC07 /* OpenPilotOSX */;
projectDirPath = "";
projectRoot = ../../..;
targets = (
6581071511DE809D0049FB12 /* OpenPilotOSX */,
);
};
/* End PBXProject section */
/* Begin XCBuildConfiguration section */
1DEB928A08733DD80010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
SDKROOT = macosx10.6;
};
name = Debug;
};
1DEB928B08733DD80010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
PREBINDING = NO;
SDKROOT = macosx10.6;
};
name = Release;
};
6581071611DE809D0049FB12 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
PRODUCT_NAME = OpenPilotOSX;
};
name = Debug;
};
6581071711DE809D0049FB12 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
PRODUCT_NAME = OpenPilotOSX;
ZERO_LINK = NO;
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "OpenPilotOSX" */ = {
isa = XCConfigurationList;
buildConfigurations = (
1DEB928A08733DD80010E9CD /* Debug */,
1DEB928B08733DD80010E9CD /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
6581071A11DE80A30049FB12 /* Build configuration list for PBXLegacyTarget "OpenPilotOSX" */ = {
isa = XCConfigurationList;
buildConfigurations = (
6581071611DE809D0049FB12 /* Debug */,
6581071711DE809D0049FB12 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;
}
// !$*UTF8*$!
{
archiveVersion = 1;
classes = {
};
objectVersion = 45;
objects = {
/* Begin PBXFileReference section */
4354B66314FED9FE004BA3B4 /* flight */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flight; path = ../..; sourceTree = SOURCE_ROOT; };
65173C9F12EBFD1700D6A7CB /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; name = Makefile; path = ../../../Makefile; sourceTree = SOURCE_ROOT; };
65904F1814632C1700FD9482 /* firmware-defs.mk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "firmware-defs.mk"; sourceTree = "<group>"; };
65904F2214632C1700FD9482 /* board-info.mk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "board-info.mk"; sourceTree = "<group>"; };
65904F2314632C1700FD9482 /* board-info.mk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "board-info.mk"; sourceTree = "<group>"; };
65904F2414632C1700FD9482 /* board-info.mk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "board-info.mk"; sourceTree = "<group>"; };
65904F2514632C1700FD9482 /* board-info.mk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "board-info.mk"; sourceTree = "<group>"; };
65904F2614632C1700FD9482 /* board-info.mk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "board-info.mk"; sourceTree = "<group>"; };
65904F2714632C1700FD9482 /* board-info.mk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "board-info.mk"; sourceTree = "<group>"; };
65904F2814632C1700FD9482 /* version-info.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = "version-info.py"; sourceTree = "<group>"; };
65904F2914632C1700FD9482 /* firmwareinfotemplate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = firmwareinfotemplate.c; sourceTree = "<group>"; };
65904F2A14632C1700FD9482 /* gcsversioninfotemplate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gcsversioninfotemplate.h; sourceTree = "<group>"; };
65904F2D14632C1700FD9482 /* README.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.txt; sourceTree = "<group>"; };
65904F2E14632C1700FD9482 /* shell_script.reg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = shell_script.reg; sourceTree = "<group>"; };
65904F2F14632C1700FD9482 /* install */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = install; sourceTree = "<group>"; };
65904F3014632C1700FD9482 /* make */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = make; sourceTree = "<group>"; };
65904F3114632C1700FD9482 /* make.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = make.sh; sourceTree = "<group>"; };
65904F3214632C1700FD9482 /* sh.cmd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = sh.cmd; sourceTree = "<group>"; };
65904F34146362F300FD9482 /* board-info.mk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "board-info.mk"; sourceTree = "<group>"; };
65E466BC14E244020075459C /* uavobjectdefinition */ = {isa = PBXFileReference; lastKnownFileType = folder; path = uavobjectdefinition; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXGroup section */
08FB7794FE84155DC02AAC07 /* OpenPilotOSX */ = {
isa = PBXGroup;
children = (
4354B66314FED9FE004BA3B4 /* flight */,
65904F1614632C1700FD9482 /* make */,
65C35E4E12EFB2F3004811C2 /* shared */,
65173C9F12EBFD1700D6A7CB /* Makefile */,
);
name = OpenPilotOSX;
sourceTree = "<group>";
};
65904F1614632C1700FD9482 /* make */ = {
isa = PBXGroup;
children = (
65904F1714632C1700FD9482 /* boards */,
65904F1814632C1700FD9482 /* firmware-defs.mk */,
65904F1914632C1700FD9482 /* scripts */,
65904F1A14632C1700FD9482 /* templates */,
65904F1B14632C1700FD9482 /* winx86 */,
);
name = make;
path = OpenPilotOSX.xcodeproj/../../../../make;
sourceTree = "<group>";
};
65904F1714632C1700FD9482 /* boards */ = {
isa = PBXGroup;
children = (
65904F33146362F300FD9482 /* revolution */,
65904F1C14632C1700FD9482 /* ahrs */,
65904F1D14632C1700FD9482 /* coptercontrol */,
65904F1E14632C1700FD9482 /* esc */,
65904F1F14632C1700FD9482 /* ins */,
65904F2014632C1700FD9482 /* openpilot */,
65904F2114632C1700FD9482 /* oplink */,
);
path = boards;
sourceTree = "<group>";
};
65904F1914632C1700FD9482 /* scripts */ = {
isa = PBXGroup;
children = (
65904F2814632C1700FD9482 /* version-info.py */,
);
path = scripts;
sourceTree = "<group>";
};
65904F1A14632C1700FD9482 /* templates */ = {
isa = PBXGroup;
children = (
65904F2914632C1700FD9482 /* firmwareinfotemplate.c */,
65904F2A14632C1700FD9482 /* gcsversioninfotemplate.h */,
);
path = templates;
sourceTree = "<group>";
};
65904F1B14632C1700FD9482 /* winx86 */ = {
isa = PBXGroup;
children = (
65904F2B14632C1700FD9482 /* bin */,
65904F2C14632C1700FD9482 /* cmd */,
65904F2D14632C1700FD9482 /* README.txt */,
65904F2E14632C1700FD9482 /* shell_script.reg */,
);
path = winx86;
sourceTree = "<group>";
};
65904F1C14632C1700FD9482 /* ahrs */ = {
isa = PBXGroup;
children = (
65904F2214632C1700FD9482 /* board-info.mk */,
);
path = ahrs;
sourceTree = "<group>";
};
65904F1D14632C1700FD9482 /* coptercontrol */ = {
isa = PBXGroup;
children = (
65904F2314632C1700FD9482 /* board-info.mk */,
);
path = coptercontrol;
sourceTree = "<group>";
};
65904F1E14632C1700FD9482 /* esc */ = {
isa = PBXGroup;
children = (
65904F2414632C1700FD9482 /* board-info.mk */,
);
path = esc;
sourceTree = "<group>";
};
65904F1F14632C1700FD9482 /* ins */ = {
isa = PBXGroup;
children = (
65904F2514632C1700FD9482 /* board-info.mk */,
);
path = ins;
sourceTree = "<group>";
};
65904F2014632C1700FD9482 /* openpilot */ = {
isa = PBXGroup;
children = (
65904F2614632C1700FD9482 /* board-info.mk */,
);
path = openpilot;
sourceTree = "<group>";
};
65904F2114632C1700FD9482 /* oplink */ = {
isa = PBXGroup;
children = (
65904F2714632C1700FD9482 /* board-info.mk */,
);
path = oplink;
sourceTree = "<group>";
};
65904F2B14632C1700FD9482 /* bin */ = {
isa = PBXGroup;
children = (
65904F2F14632C1700FD9482 /* install */,
65904F3014632C1700FD9482 /* make */,
);
path = bin;
sourceTree = "<group>";
};
65904F2C14632C1700FD9482 /* cmd */ = {
isa = PBXGroup;
children = (
65904F3114632C1700FD9482 /* make.sh */,
65904F3214632C1700FD9482 /* sh.cmd */,
);
path = cmd;
sourceTree = "<group>";
};
65904F33146362F300FD9482 /* revolution */ = {
isa = PBXGroup;
children = (
65904F34146362F300FD9482 /* board-info.mk */,
);
path = revolution;
sourceTree = "<group>";
};
65C35E4E12EFB2F3004811C2 /* shared */ = {
isa = PBXGroup;
children = (
65E466BC14E244020075459C /* uavobjectdefinition */,
);
name = shared;
path = ../../../shared;
sourceTree = SOURCE_ROOT;
};
/* End PBXGroup section */
/* Begin PBXLegacyTarget section */
6581071511DE809D0049FB12 /* OpenPilotOSX */ = {
isa = PBXLegacyTarget;
buildArgumentsString = "$(ACTION) -f Makefile.posix";
buildConfigurationList = 6581071A11DE80A30049FB12 /* Build configuration list for PBXLegacyTarget "OpenPilotOSX" */;
buildPhases = (
);
buildToolPath = /usr/bin/make;
buildWorkingDirectory = ../../OpenPilot;
dependencies = (
);
name = OpenPilotOSX;
passBuildSettingsInEnvironment = 1;
productName = OpenPilotOSX;
};
/* End PBXLegacyTarget section */
/* Begin PBXProject section */
08FB7793FE84155DC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
ORGANIZATIONNAME = OpenPilot;
};
buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "OpenPilotOSX" */;
compatibilityVersion = "Xcode 3.1";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
English,
Japanese,
French,
German,
);
mainGroup = 08FB7794FE84155DC02AAC07 /* OpenPilotOSX */;
projectDirPath = "";
projectRoot = ../../..;
targets = (
6581071511DE809D0049FB12 /* OpenPilotOSX */,
);
};
/* End PBXProject section */
/* Begin XCBuildConfiguration section */
1DEB928A08733DD80010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
SDKROOT = macosx10.6;
};
name = Debug;
};
1DEB928B08733DD80010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
PREBINDING = NO;
SDKROOT = macosx10.6;
};
name = Release;
};
6581071611DE809D0049FB12 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
PRODUCT_NAME = OpenPilotOSX;
};
name = Debug;
};
6581071711DE809D0049FB12 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
PRODUCT_NAME = OpenPilotOSX;
ZERO_LINK = NO;
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "OpenPilotOSX" */ = {
isa = XCConfigurationList;
buildConfigurations = (
1DEB928A08733DD80010E9CD /* Debug */,
1DEB928B08733DD80010E9CD /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
6581071A11DE80A30049FB12 /* Build configuration list for PBXLegacyTarget "OpenPilotOSX" */ = {
isa = XCConfigurationList;
buildConfigurations = (
6581071611DE809D0049FB12 /* Debug */,
6581071711DE809D0049FB12 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;
}

6
flight/Project/Windows USB/OpenPilot-CDC.inf
View File

@ -10,11 +10,11 @@ DriverVer=10/15/2009,1.0.0.0
[DeviceList.NTx86]
%CopterControl%= DriverInstall,USB\VID_20A0&PID_415b&MI_00
%PipXtreme%= DriverInstall,USB\VID_20A0&PID_415c&MI_00
%OPLink%= DriverInstall,USB\VID_20A0&PID_415c&MI_00
[DeviceList.NTamd64]
%CopterControl%= DriverInstall,USB\VID_20A0&PID_415b&MI_00
%PipXtreme%= DriverInstall,USB\VID_20A0&PID_415c&MI_00
%OPLink%= DriverInstall,USB\VID_20A0&PID_415c&MI_00
[DriverInstall]
include=mdmcpq.inf
@ -32,4 +32,4 @@ HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
[Strings]
ProviderName = "CDC Driver"
CopterControl = "OpenPilot CDC Driver"
PipXtreme = "OpenPilot CDC Driver"
OPLink = "OpenPilot CDC Driver"

2
flight/Project/gdb/pipx → flight/Project/gdb/oplink
View File

@ -1,7 +1,7 @@
define connect
target remote localhost:3333
monitor cortex_m3 vector_catch all
file ./Build/PipXtreme.elf
file ./Build/OPLink.elf
end
#monitor reset halt

0
flight/targets/Bootloaders/PipXtreme/Makefile → flight/targets/Bootloaders/OPLink/Makefile
View File

0
flight/targets/Bootloaders/PipXtreme/inc/common.h → flight/targets/Bootloaders/OPLink/inc/common.h
View File

0
flight/targets/Bootloaders/PipXtreme/inc/op_dfu.h → flight/targets/Bootloaders/OPLink/inc/op_dfu.h
View File

0
flight/targets/Bootloaders/PipXtreme/inc/pios_config.h → flight/targets/Bootloaders/OPLink/inc/pios_config.h
View File

4
flight/targets/Bootloaders/PipXtreme/inc/pios_usb_board_data.h → flight/targets/Bootloaders/OPLink/inc/pios_usb_board_data.h
View File

@ -37,8 +37,8 @@
#include "pios_usb_defs.h" /* struct usb_* */
#define PIOS_USB_BOARD_PRODUCT_ID USB_PRODUCT_ID_PIPXTREME
#define PIOS_USB_BOARD_DEVICE_VER USB_OP_DEVICE_VER(USB_OP_BOARD_ID_PIPXTREME, USB_OP_BOARD_MODE_BL)
#define PIOS_USB_BOARD_PRODUCT_ID USB_PRODUCT_ID_OPLINK
#define PIOS_USB_BOARD_DEVICE_VER USB_OP_DEVICE_VER(USB_OP_BOARD_ID_OPLINK, USB_OP_BOARD_MODE_BL)
#define PIOS_USB_BOARD_SN_SUFFIX "+BL"
/*

0
flight/targets/Bootloaders/PipXtreme/main.c → flight/targets/Bootloaders/OPLink/main.c
View File

4
flight/targets/Bootloaders/PipXtreme/op_dfu.c → flight/targets/Bootloaders/OPLink/op_dfu.c
View File

@ -236,7 +236,7 @@ void processComand(uint8_t *xReceive_Buffer) {
}
break;
case Remote_flash_via_spi:
result = FALSE; // No support for this for the PipX
result = FALSE; // No support for this for the OPLink
break;
default:
result = 0;
@ -453,7 +453,7 @@ void sendData(uint8_t * buf, uint16_t size) {
bool flash_read(uint8_t * buffer, uint32_t adr, DFUProgType type) {
switch (type) {
case Remote_flash_via_spi:
return FALSE; // We should not get this for the PipX
return FALSE; // We should not get this for the OPLink
break;
case Self_flash:
for (uint8_t x = 0; x < 4; ++x) {

0
flight/targets/Bootloaders/PipXtreme/pios_board.c → flight/targets/Bootloaders/OPLink/pios_board.c
View File

0
flight/targets/Bootloaders/PipXtreme/pios_usb_board_data.c → flight/targets/Bootloaders/OPLink/pios_usb_board_data.c
View File

4
flight/targets/PipXtreme/Makefile → flight/targets/OPLink/Makefile
View File

@ -36,8 +36,8 @@ OPTMODULES =
# Use file-extension c for "c-only"-files
ifndef TESTAPP
## Application Core
SRC += $(OPMODULEDIR)/PipXtreme/pipxtrememod.c
SRC += $(OPSYSTEM)/pipxtreme.c
SRC += ${OPMODULEDIR}/OPLink/oplinkmod.c
SRC += $(OPSYSTEM)/oplink.c
SRC += $(OPSYSTEM)/pios_board.c
SRC += $(OPSYSTEM)/pios_usb_board_data.c
SRC += $(OPUAVTALK)/uavtalk.c

0
flight/targets/PipXtreme/System/inc/FreeRTOSConfig.h → flight/targets/OPLink/System/inc/FreeRTOSConfig.h
View File

0
flight/targets/PipXtreme/System/inc/openpilot.h → flight/targets/OPLink/System/inc/openpilot.h
View File

0
flight/targets/PipXtreme/System/inc/pios_board_posix.h → flight/targets/OPLink/System/inc/pios_board_posix.h
View File

0
flight/targets/PipXtreme/System/inc/pios_config.h → flight/targets/OPLink/System/inc/pios_config.h
View File

0
flight/targets/PipXtreme/System/inc/pios_config_posix.h → flight/targets/OPLink/System/inc/pios_config_posix.h
View File

4
flight/targets/PipXtreme/System/inc/pios_usb_board_data.h → flight/targets/OPLink/System/inc/pios_usb_board_data.h
View File

@ -39,8 +39,8 @@
#include "pios_usb_defs.h" /* USB_* macros */
#define PIOS_USB_BOARD_PRODUCT_ID USB_PRODUCT_ID_PIPXTREME
#define PIOS_USB_BOARD_DEVICE_VER USB_OP_DEVICE_VER(USB_OP_BOARD_ID_PIPXTREME, USB_OP_BOARD_MODE_FW)
#define PIOS_USB_BOARD_PRODUCT_ID USB_PRODUCT_ID_OPLINK
#define PIOS_USB_BOARD_DEVICE_VER USB_OP_DEVICE_VER(USB_OP_BOARD_ID_OPLINK, USB_OP_BOARD_MODE_FW)
#define PIOS_USB_BOARD_SN_SUFFIX "+FW"
#endif /* PIOS_USB_BOARD_DATA_H */

0
flight/targets/PipXtreme/System/pipxtreme.c → flight/targets/OPLink/System/oplink.c
View File

0
flight/targets/PipXtreme/System/pios_board.c → flight/targets/OPLink/System/pios_board.c
View File

0
flight/targets/PipXtreme/System/pios_board_posix.c → flight/targets/OPLink/System/pios_board_posix.c
View File

0
flight/targets/PipXtreme/System/pios_usb_board_data.c → flight/targets/OPLink/System/pios_usb_board_data.c
View File

4
flight/targets/board_hw_defs/pipxtreme/board_hw_defs.c → flight/targets/board_hw_defs/oplink/board_hw_defs.c
View File

@ -261,7 +261,7 @@ static const struct pios_exti_cfg pios_exti_rfm22b_cfg __exti_config = {
#include <pios_rfm22b_priv.h>
struct pios_rfm22b_cfg pios_rfm22b_pipx_cfg = {
struct pios_rfm22b_cfg pios_rfm22b_cfg = {
.spi_cfg = &pios_spi_rfm22b_cfg,
.exti_cfg = &pios_exti_rfm22b_cfg,
.RFXtalCap = 0x7f,
@ -272,7 +272,7 @@ struct pios_rfm22b_cfg pios_rfm22b_pipx_cfg = {
//! Compatibility layer for various hardware revisions
const struct pios_rfm22b_cfg * PIOS_BOARD_HW_DEFS_GetRfm22Cfg (uint32_t board_revision)
{
return &pios_rfm22b_pipx_cfg;
return &pios_rfm22b_cfg;
}
#endif /* PIOS_INCLUDE_RFM22B */

2
make/boards/pipxtreme/board-info.mk → make/boards/oplink/board-info.mk
View File

@ -5,7 +5,7 @@ HW_TYPE := 0x01
MCU := cortex-m3
CHIP := STM32F103CBT
BOARD := STM32103CB_PIPXTREME
BOARD := STM32103CB_OPLINK
MODEL := MD
MODEL_SUFFIX := _PX