1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-30 15:52:12 +01:00

LP-512 Addressed most of the PR comments.

This commit is contained in:
Vladimir Zidar 2017-05-26 01:06:31 +02:00
parent 58e19db08f
commit b523f69f0e
74 changed files with 553 additions and 2098 deletions

View File

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

View File

@ -2,6 +2,7 @@
****************************************************************************** ******************************************************************************
* *
* @file op_dfu.h * @file op_dfu.h
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2017.
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief * @brief
* @see The GNU Public License (GPL) Version 3 * @see The GNU Public License (GPL) Version 3
@ -26,9 +27,91 @@
/* Define to prevent recursive inclusion -------------------------------------*/ /* Define to prevent recursive inclusion -------------------------------------*/
#ifndef __OP_DFU_H #ifndef __OP_DFU_H
#define __OP_DFU_H #define __OP_DFU_H
#include "common.h"
/* Includes ------------------------------------------------------------------*/ /* Includes ------------------------------------------------------------------*/
/* Exported types ------------------------------------------------------------*/ /* Exported types ------------------------------------------------------------*/
typedef enum {
start, keepgoing,
} DownloadAction;
/**************************************************/
/* OP_DFU states */
/**************************************************/
typedef enum {
DFUidle, // 0
uploading, // 1
wrong_packet_received, // 2
too_many_packets, // 3
too_few_packets, // 4
Last_operation_Success, // 5
downloading, // 6
BLidle, // 7
Last_operation_failed, // 8
uploadingStarting, // 9
outsideDevCapabilities, // 10
CRC_Fail, // 11
failed_jump,
// 12
} DFUStates;
/**************************************************/
/* OP_DFU commands */
/**************************************************/
typedef enum {
Reserved, // 0
Req_Capabilities, // 1
Rep_Capabilities, // 2
EnterDFU, // 3
JumpFW, // 4
Reset, // 5
Abort_Operation, // 6
Upload, // 7
Op_END, // 8
Download_Req, // 9
Download, // 10
Status_Request, // 11
Status_Rep
// 12
} DFUCommands;
typedef enum {
High_Density, Medium_Density
} DeviceType;
/**************************************************/
/* OP_DFU transfer types */
/**************************************************/
typedef enum {
FW, // 0
Descript
// 2
} DFUTransfer;
/**************************************************/
/* OP_DFU transfer port */
/**************************************************/
typedef enum {
Usb, // 0
Serial
// 2
} DFUPort;
/**************************************************/
/* OP_DFU programable programable HW types */
/**************************************************/
typedef enum {
Self_flash, // 0
Remote_flash_via_spi
// 1
} DFUProgType;
/**************************************************/
/* OP_DFU programable sources */
/**************************************************/
#define USB 0
#define SPI 1
#define DownloadDelay 100000
#define MAX_DEL_RETRYS 3
#define MAX_WRI_RETRYS 3
typedef struct { typedef struct {
uint8_t programmingType; uint8_t programmingType;
uint8_t readWriteFlags; uint8_t readWriteFlags;

View File

@ -362,8 +362,8 @@ enum usb_product_ids {
USB_PRODUCT_ID_CC3D = 0x415D, USB_PRODUCT_ID_CC3D = 0x415D,
USB_PRODUCT_ID_REVOLUTION = 0x415E, USB_PRODUCT_ID_REVOLUTION = 0x415E,
USB_PRODUCT_ID_SPARKY2 = 0x41D0, // was 0x415E during LP testing USB_PRODUCT_ID_SPARKY2 = 0x41D0, // was 0x415E during LP testing
USB_PRODUCT_ID_OSD = 0x4194, USB_PRODUCT_ID_OSD = 0x4194,
USB_PRODUCT_ID_SPARE = 0x4195, USB_PRODUCT_ID_LIBREPILOT = 0x4195,
} __attribute__((packed)); } __attribute__((packed));
enum usb_op_board_ids { enum usb_op_board_ids {
@ -372,8 +372,13 @@ enum usb_op_board_ids {
USB_OP_BOARD_ID_OPLINK = 3, USB_OP_BOARD_ID_OPLINK = 3,
USB_OP_BOARD_ID_COPTERCONTROL = 4, USB_OP_BOARD_ID_COPTERCONTROL = 4,
USB_OP_BOARD_ID_REVOLUTION = 5, USB_OP_BOARD_ID_REVOLUTION = 5,
USB_OP_BOARD_ID_SPARKY2 = 5, USB_OP_BOARD_ID_SPARKY2 = 5,
USB_OP_BOARD_ID_OSD = 6, USB_OP_BOARD_ID_OSD = 6,
USB_OP_BOARD_ID_CCF3D = 7,
USB_OP_BOARD_ID_SPRACINGF3 = 8,
USB_OP_BOARD_ID_SPRACINGF3EVO = 9,
USB_OP_BOARD_ID_NUCLEOF303RE = 10,
USB_OP_BOARD_ID_PIKOBLX = 11,
} __attribute__((packed)); } __attribute__((packed));
enum usb_op_board_modes { enum usb_op_board_modes {

View File

@ -3,13 +3,14 @@
* @addtogroup PIOS PIOS Core hardware abstraction layer * @addtogroup PIOS PIOS Core hardware abstraction layer
* @{ * @{
* @addtogroup PIOS_I2C I2C Functions * @addtogroup PIOS_I2C I2C Functions
* @brief STM32F4xx Hardware dependent I2C functionality * @brief STM32F30x Hardware dependent I2C functionality
* @{ * @{
* *
* @file pios_i2c.c * @file pios_i2c.c
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012. * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2017.
* @author Tau Labs, http://taulabs.org, Copyright (C) 2012-2014 * dRonin, http://dronin.org, Copyright (C) 2016
* @author dRonin, http://dronin.org, Copyright (C) 2016 * Tau Labs, http://taulabs.org, Copyright (C) 2012-2014
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012.
* @brief I2C Enable/Disable routines * @brief I2C Enable/Disable routines
* @see The GNU Public License (GPL) Version 3 * @see The GNU Public License (GPL) Version 3
* *

View File

@ -2,14 +2,14 @@
****************************************************************************** ******************************************************************************
* @addtogroup PIOS PIOS Core hardware abstraction layer * @addtogroup PIOS PIOS Core hardware abstraction layer
* @{ * @{
* @addtogroup PIOS_PWM PWM Input Functions * @addtogroup PIOS_RTC RTC Functions
* @brief Code to measure with PWM input * @brief Code to manage initialization and interrups of RTC peripheral
* @{ * @{
* *
* @file pios_pwm.c * @file pios_rtc.c
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012. * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2017.
* @author Tau Labs, http://taulabs.org, Copyright (C) 2012-2013 * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012.
* @brief PWM Input functions (STM32 dependent) * @brief RTC Functions (STM32 dependent)
* @see The GNU Public License (GPL) Version 3 * @see The GNU Public License (GPL) Version 3
* *
*****************************************************************************/ *****************************************************************************/
@ -29,10 +29,10 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/* Project Includes */
#include "pios.h" #include "pios.h"
#if defined(PIOS_INCLUDE_RTC) #ifdef PIOS_INCLUDE_RTC
#include <pios_rtc_priv.h> #include <pios_rtc_priv.h>
#ifndef PIOS_RTC_PRESCALER #ifndef PIOS_RTC_PRESCALER
@ -54,14 +54,14 @@ void PIOS_RTC_Init(const struct pios_rtc_cfg *cfg)
RCC_BackupResetCmd(DISABLE); RCC_BackupResetCmd(DISABLE);
RCC_APB1PeriphClockCmd(RCC_APB1Periph_PWR, ENABLE); RCC_APB1PeriphClockCmd(RCC_APB1Periph_PWR, ENABLE);
PWR_BackupAccessCmd(ENABLE); PWR_BackupAccessCmd(ENABLE);
// Divide external 8 MHz clock by 32 to 250kHz // Divide external 8 MHz clock to 1 MHz
RCC_RTCCLKConfig(cfg->clksrc); RCC_RTCCLKConfig(cfg->clksrc);
RCC_RTCCLKCmd(ENABLE); RCC_RTCCLKCmd(ENABLE);
RTC_WakeUpCmd(DISABLE); RTC_WakeUpCmd(DISABLE);
// Divide 250kHz Mhz clock by 16 to 15625Hz // Divide 1 Mhz clock by 16 -> 62.5 khz
RTC_WakeUpClockConfig(RTC_WakeUpClock_RTCCLK_Div16); RTC_WakeUpClockConfig(RTC_WakeUpClock_RTCCLK_Div16);
// Divide 15625Hz by 25 to get 625 Hz // Divide 62.5 khz by 200 to get 625 Hz
RTC_SetWakeUpCounter(cfg->prescaler); // cfg->prescaler); RTC_SetWakeUpCounter(cfg->prescaler); // cfg->prescaler);
RTC_WakeUpCmd(ENABLE); RTC_WakeUpCmd(ENABLE);
@ -115,10 +115,6 @@ bool PIOS_RTC_RegisterTickCallback(void (*fn)(uint32_t id), uint32_t data)
void PIOS_RTC_irq_handler(void) void PIOS_RTC_irq_handler(void)
{ {
#if defined(PIOS_INCLUDE_CHIBIOS)
CH_IRQ_PROLOGUE();
#endif /* defined(PIOS_INCLUDE_CHIBIOS) */
if (RTC_GetITStatus(RTC_IT_WUT)) { if (RTC_GetITStatus(RTC_IT_WUT)) {
/* Call all registered callbacks */ /* Call all registered callbacks */
for (uint8_t i = 0; i < rtc_callback_next; i++) { for (uint8_t i = 0; i < rtc_callback_next; i++) {
@ -132,15 +128,12 @@ void PIOS_RTC_irq_handler(void)
RTC_ClearITPendingBit(RTC_IT_WUT); RTC_ClearITPendingBit(RTC_IT_WUT);
} }
if (EXTI_GetITStatus(EXTI_Line20) != RESET) { if (EXTI_GetITStatus(EXTI_Line22) != RESET) {
EXTI_ClearITPendingBit(EXTI_Line20); EXTI_ClearITPendingBit(EXTI_Line22);
} }
#if defined(PIOS_INCLUDE_CHIBIOS)
CH_IRQ_EPILOGUE();
#endif /* defined(PIOS_INCLUDE_CHIBIOS) */
} }
#endif /* if defined(PIOS_INCLUDE_RTC) */
#endif /* PIOS_INCLUDE_RTC */
/** /**
* @} * @}

View File

@ -7,8 +7,9 @@
* @notes This implements a CDC Serial Port * @notes This implements a CDC Serial Port
* @{ * @{
* *
* @file pios_usb_com_cdc.c * @file pios_usb_cdc.c
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2017.
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief USB COM functions (STM32 dependent code) * @brief USB COM functions (STM32 dependent code)
* @see The GNU Public License (GPL) Version 3 * @see The GNU Public License (GPL) Version 3
* *

View File

@ -8,9 +8,8 @@
* @{ * @{
* *
* @file pios_usb_hid.c * @file pios_usb_hid.c
* @author The LibrePilot Project, htpp://www.librepilot.org Copyright (C) 2017.
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @author Tau Labs, http://taulabs.org, Copyright (C) 2012-2014
* @author dRonin, http://dronin.org, Copyright (C) 2016
* @brief USB COM functions (STM32 dependent code) * @brief USB COM functions (STM32 dependent code)
* @see The GNU Public License (GPL) Version 3 * @see The GNU Public License (GPL) Version 3
* *
@ -31,12 +30,10 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/* Project Includes */
#include "pios.h" #include "pios.h"
#if defined(PIOS_INCLUDE_USB_HID) #ifdef PIOS_INCLUDE_USB_HID
#include "pios_usb.h"
#include "pios_usb_hid_priv.h" #include "pios_usb_hid_priv.h"
#include "pios_usb_board_data.h" /* PIOS_BOARD_*_DATA_LENGTH */ #include "pios_usb_board_data.h" /* PIOS_BOARD_*_DATA_LENGTH */
@ -200,6 +197,12 @@ static void PIOS_USB_HID_SendReport(struct pios_usb_hid_dev *usb_hid_dev)
/* Is this correct? Why do we always send the whole buffer? */ /* Is this correct? Why do we always send the whole buffer? */
SetEPTxCount(usb_hid_dev->cfg->data_tx_ep, sizeof(usb_hid_dev->tx_packet_buffer)); SetEPTxCount(usb_hid_dev->cfg->data_tx_ep, sizeof(usb_hid_dev->tx_packet_buffer));
SetEPTxValid(usb_hid_dev->cfg->data_tx_ep); SetEPTxValid(usb_hid_dev->cfg->data_tx_ep);
#ifdef PIOS_INCLUDE_FREERTOS
if (need_yield) {
vPortYield();
}
#endif /* PIOS_INCLUDE_FREERTOS */
} }
static void PIOS_USB_HID_RxStart(uint32_t usbhid_id, uint16_t rx_bytes_avail) static void PIOS_USB_HID_RxStart(uint32_t usbhid_id, uint16_t rx_bytes_avail)
@ -361,6 +364,12 @@ static void PIOS_USB_HID_EP_OUT_Callback(void)
/* Not enough room left for a message, apply backpressure */ /* Not enough room left for a message, apply backpressure */
SetEPRxStatus(usb_hid_dev->cfg->data_rx_ep, EP_RX_NAK); SetEPRxStatus(usb_hid_dev->cfg->data_rx_ep, EP_RX_NAK);
} }
#ifdef PIOS_INCLUDE_FREERTOS
if (need_yield) {
vPortYield();
}
#endif /* PIOS_INCLUDE_FREERTOS */
} }
static uint32_t PIOS_USB_HID_Available(uint32_t usbhid_id) static uint32_t PIOS_USB_HID_Available(uint32_t usbhid_id)
@ -368,5 +377,4 @@ static uint32_t PIOS_USB_HID_Available(uint32_t usbhid_id)
return PIOS_USB_CheckAvailable(usbhid_id) ? COM_AVAILABLE_RXTX : COM_AVAILABLE_NONE; return PIOS_USB_CheckAvailable(usbhid_id) ? COM_AVAILABLE_RXTX : COM_AVAILABLE_NONE;
} }
#endif /* PIOS_INCLUDE_USB_HID */ #endif /* PIOS_INCLUDE_USB_HID */

View File

@ -3,10 +3,11 @@
* @addtogroup PIOS PIOS Core hardware abstraction layer * @addtogroup PIOS PIOS Core hardware abstraction layer
* @{ * @{
* *
* @file vector_stm32f4xx.c * @file vectors_stm32f30x.c
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012. * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2017.
* @author Tau Labs, http://taulabs.org, Copyright (C) 2012-2013 * Tau Labs, http://taulabs.org, Copyright (C) 2012-2013
* @brief C based vectors for F4 * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012.
* @brief C based vectors for F3
* @see The GNU Public License (GPL) Version 3 * @see The GNU Public License (GPL) Version 3
* *
*****************************************************************************/ *****************************************************************************/

View File

@ -187,7 +187,8 @@ void PIOS_WS2811_Init(uint32_t *dev_id, const struct pios_ws2811_cfg *ws2811_cfg
setupTimer(); setupTimer();
setupDMA(); setupDMA();
// // This is required so client (for example Notify module)
// can test for != 0 to know if device is configured or not.
*dev_id = PIOS_WS2811_MAGIC; *dev_id = PIOS_WS2811_MAGIC;
} }

View File

@ -1,7 +1,7 @@
/** /**
****************************************************************************** ******************************************************************************
* @file board_hw_defs.c * @file board_hw_defs.c
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015. * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2017.
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012. * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012.
* PhoenixPilot, http://github.com/PhoenixPilot, Copyright (C) 2012 * PhoenixPilot, http://github.com/PhoenixPilot, Copyright (C) 2012
* *
@ -9,7 +9,7 @@
* @{ * @{
* @addtogroup OpenPilotCore OpenPilot Core * @addtogroup OpenPilotCore OpenPilot Core
* @{ * @{
* @brief Defines board specific static initializers for hardware for the CopterControl board. * @brief Defines board specific static initializers for hardware for the CCF3D board.
*****************************************************************************/ *****************************************************************************/
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

View File

@ -1,115 +0,0 @@
/**
******************************************************************************
* @addtogroup CopterControlBL CopterControl BootLoader
* @brief These files contain the code to the CopterControl Bootloader.
*
* @{
* @file common.c
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief This file contains various common defines for the BootLoader
* @see The GNU Public License (GPL) Version 3
*
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef COMMON_H_
#define COMMON_H_
// #include "board.h"
typedef enum {
start, keepgoing,
} DownloadAction;
/**************************************************/
/* OP_DFU states */
/**************************************************/
typedef enum {
DFUidle, // 0
uploading, // 1
wrong_packet_received, // 2
too_many_packets, // 3
too_few_packets, // 4
Last_operation_Success, // 5
downloading, // 6
BLidle, // 7
Last_operation_failed, // 8
uploadingStarting, // 9
outsideDevCapabilities, // 10
CRC_Fail, // 11
failed_jump,
// 12
} DFUStates;
/**************************************************/
/* OP_DFU commands */
/**************************************************/
typedef enum {
Reserved, // 0
Req_Capabilities, // 1
Rep_Capabilities, // 2
EnterDFU, // 3
JumpFW, // 4
Reset, // 5
Abort_Operation, // 6
Upload, // 7
Op_END, // 8
Download_Req, // 9
Download, // 10
Status_Request, // 11
Status_Rep
// 12
} DFUCommands;
typedef enum {
High_Density, Medium_Density
} DeviceType;
/**************************************************/
/* OP_DFU transfer types */
/**************************************************/
typedef enum {
FW, // 0
Descript
// 2
} DFUTransfer;
/**************************************************/
/* OP_DFU transfer port */
/**************************************************/
typedef enum {
Usb, // 0
Serial
// 2
} DFUPort;
/**************************************************/
/* OP_DFU programable programable HW types */
/**************************************************/
typedef enum {
Self_flash, // 0
Remote_flash_via_spi
// 1
} DFUProgType;
/**************************************************/
/* OP_DFU programable sources */
/**************************************************/
#define USB 0
#define SPI 1
#define DownloadDelay 100000
#define MAX_DEL_RETRYS 3
#define MAX_WRI_RETRYS 3
#endif /* COMMON_H_ */

View File

@ -1,7 +1,7 @@
/** /**
****************************************************************************** ******************************************************************************
* @addtogroup CopterControlBL CopterControl BootLoader * @addtogroup BootLoader
* @brief These files contain the code to the CopterControl Bootloader. * @brief These files contain the code to the CCF3D Bootloader.
* @{ * @{
* @file pios_config.h * @file pios_config.h
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.

View File

@ -38,8 +38,8 @@
#include <pios_usb_defs.h> /* struct usb_* */ #include <pios_usb_defs.h> /* struct usb_* */
#define PIOS_USB_BOARD_PRODUCT_ID USB_PRODUCT_ID_COPTERCONTROL #define PIOS_USB_BOARD_PRODUCT_ID USB_PRODUCT_ID_LIBREPILOT
#define PIOS_USB_BOARD_DEVICE_VER USB_OP_DEVICE_VER(USB_OP_BOARD_ID_COPTERCONTROL, USB_OP_BOARD_MODE_BL) #define PIOS_USB_BOARD_DEVICE_VER USB_OP_DEVICE_VER(USB_OP_BOARD_ID_CCF3D, USB_OP_BOARD_MODE_BL)
#define PIOS_USB_BOARD_SN_SUFFIX "+BL" #define PIOS_USB_BOARD_SN_SUFFIX "+BL"
/* /*

View File

@ -1,12 +1,12 @@
/** /**
****************************************************************************** ******************************************************************************
* @addtogroup CopterControlBL CopterControl BootLoader * @addtogroup BootLoader
* @brief These files contain the code to the CopterControl Bootloader.
* *
* @{ * @{
* @file main.c * @file main.c
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2017.
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief This is the file with the main function of the OpenPilot BootLoader * @brief This is the file with the main function of the LibrePilot BootLoader
* @see The GNU Public License (GPL) Version 3 * @see The GNU Public License (GPL) Version 3
* *
*****************************************************************************/ *****************************************************************************/
@ -34,6 +34,7 @@
#include <fifo_buffer.h> #include <fifo_buffer.h>
#include <pios_com_msg.h> #include <pios_com_msg.h>
#include <pios_board_init.h> #include <pios_board_init.h>
#include <pios_board_io.h>
extern void FLASH_Download(); extern void FLASH_Download();
#define BSL_HOLD_STATE ((PIOS_USB_DETECT_GPIO_PORT->IDR & PIOS_USB_DETECT_GPIO_PIN) ? 0 : 1) #define BSL_HOLD_STATE ((PIOS_USB_DETECT_GPIO_PORT->IDR & PIOS_USB_DETECT_GPIO_PIN) ? 0 : 1)

View File

@ -2,8 +2,9 @@
****************************************************************************** ******************************************************************************
* *
* @file pios_board.c * @file pios_board.c
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2017.
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief Defines board specific static initializers for hardware for the CopterControl board. * @brief Defines board specific static initializers for hardware for the CCF3D board.
* @see The GNU Public License (GPL) Version 3 * @see The GNU Public License (GPL) Version 3
* *
*****************************************************************************/ *****************************************************************************/

View File

@ -25,7 +25,7 @@ endif
include ../board-info.mk include ../board-info.mk
include $(FLIGHT_ROOT_DIR)/make/firmware-defs.mk include $(FLIGHT_ROOT_DIR)/make/firmware-defs.mk
# REVO C++ support # C++ support
USE_CXX = YES USE_CXX = YES
# ARM DSP library # ARM DSP library
@ -76,7 +76,7 @@ ifndef TESTAPP
## Application Core ## Application Core
SRC += ../pios_usb_board_data.c SRC += ../pios_usb_board_data.c
SRC += $(OPMODULEDIR)/System/systemmod.c SRC += $(OPMODULEDIR)/System/systemmod.c
CPPSRC += $(OPSYSTEM)/coptercontrol.cpp CPPSRC += $(OPSYSTEM)/main.cpp
SRC += $(OPSYSTEM)/pios_board.c SRC += $(OPSYSTEM)/pios_board.c
SRC += $(FLIGHTLIB)/alarms.c SRC += $(FLIGHTLIB)/alarms.c
SRC += $(OPUAVTALK)/uavtalk.c SRC += $(OPUAVTALK)/uavtalk.c

View File

@ -40,8 +40,8 @@
#include <pios_usb_defs.h> /* USB_* macros */ #include <pios_usb_defs.h> /* USB_* macros */
#define PIOS_USB_BOARD_PRODUCT_ID USB_PRODUCT_ID_COPTERCONTROL #define PIOS_USB_BOARD_PRODUCT_ID USB_PRODUCT_ID_LIBREPILOT
#define PIOS_USB_BOARD_DEVICE_VER USB_OP_DEVICE_VER(USB_OP_BOARD_ID_COPTERCONTROL, USB_OP_BOARD_MODE_FW) #define PIOS_USB_BOARD_DEVICE_VER USB_OP_DEVICE_VER(USB_OP_BOARD_ID_CCF3D, USB_OP_BOARD_MODE_FW)
#define PIOS_USB_BOARD_SN_SUFFIX "+FW" #define PIOS_USB_BOARD_SN_SUFFIX "+FW"
#endif /* PIOS_USB_BOARD_DATA_H */ #endif /* PIOS_USB_BOARD_DATA_H */

View File

@ -1,15 +1,12 @@
/** /**
****************************************************************************** ******************************************************************************
* @addtogroup LibrePilotSystem LibrePilot System * @addtogroup LibrePilotSystem LibrePilot System
* @brief These files are the core system files for CopterControl.
* They are the ground layer just above PiOS. In practice, CopterControl actually starts
* in the main() function of coptercontrol.c
* @{ * @{
* @addtogroup LibrePilotCore LibrePilot Core * @addtogroup LibrePilotCore LibrePilot Core
* @brief This is where the LP firmware starts. Those files also define the compile-time * @brief This is where the LP firmware starts. Those files also define the compile-time
* options of the firmware. * options of the firmware.
* @{ * @{
* @file coptercontrol.c * @file main.cpp
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015. * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015.
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010-2015 * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010-2015
* @brief Sets up and runs main tasks. * @brief Sets up and runs main tasks.

View File

@ -1,14 +1,14 @@
/** /**
***************************************************************************** *****************************************************************************
* @file pios_board.c * @file pios_board.c
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015. * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015-2017.
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* PhoenixPilot, http://github.com/PhoenixPilot, Copyright (C) 2012 * PhoenixPilot, http://github.com/PhoenixPilot, Copyright (C) 2012
* @addtogroup LibrePilotSystem LibrePilot System * @addtogroup LibrePilotSystem LibrePilot System
* @{ * @{
* @addtogroup LibrePilotCore LibrePilot Core * @addtogroup LibrePilotCore LibrePilot Core
* @{ * @{
* @brief Defines board specific static initializers for hardware for the CopterControl board. * @brief Defines board specific static initializers for hardware for the CCF3D board.
*****************************************************************************/ *****************************************************************************/
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

View File

@ -2,7 +2,7 @@
****************************************************************************** ******************************************************************************
* *
* @file pios_board.h * @file pios_board.h
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015. * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015-2017.
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* *
* @brief Defines board hardware for the OpenPilot Version 1.1 hardware. * @brief Defines board hardware for the OpenPilot Version 1.1 hardware.
@ -132,37 +132,6 @@ extern uint32_t pios_spi_gyro_id;
// ------------------------- // -------------------------
#define PIOS_COM_MAX_DEVS 3 #define PIOS_COM_MAX_DEVS 3
extern uint32_t pios_com_telem_rf_id;
#define PIOS_COM_TELEM_RF (pios_com_telem_rf_id)
#if defined(PIOS_INCLUDE_GPS)
extern uint32_t pios_com_gps_id;
#define PIOS_COM_GPS (pios_com_gps_id)
#endif /* PIOS_INCLUDE_GPS */
extern uint32_t pios_com_bridge_id;
#define PIOS_COM_BRIDGE (pios_com_bridge_id)
extern uint32_t pios_com_vcp_id;
#define PIOS_COM_VCP (pios_com_vcp_id)
extern uint32_t pios_com_telem_usb_id;
#define PIOS_COM_TELEM_USB (pios_com_telem_usb_id)
#if defined(PIOS_INCLUDE_DEBUG_CONSOLE)
extern uint32_t pios_com_debug_id;
#define PIOS_COM_DEBUG (pios_com_debug_id)
#endif /* PIOS_INCLUDE_DEBUG_CONSOLE */
extern uint32_t pios_com_hkosd_id;
#define PIOS_COM_OSDHK (pios_com_hkosd_id)
extern uint32_t pios_com_msp_id;
#define PIOS_COM_MSP (pios_com_msp_id)
extern uint32_t pios_com_mavlink_id;
#define PIOS_COM_MAVLINK (pios_com_mavlink_id)
#ifdef PIOS_INCLUDE_WS2811 #ifdef PIOS_INCLUDE_WS2811
extern uint32_t pios_ws2811_id; extern uint32_t pios_ws2811_id;
#define PIOS_WS2811_DEVICE (pios_ws2811_id) #define PIOS_WS2811_DEVICE (pios_ws2811_id)

View File

@ -1,115 +0,0 @@
/**
******************************************************************************
* @addtogroup CopterControlBL CopterControl BootLoader
* @brief These files contain the code to the CopterControl Bootloader.
*
* @{
* @file common.c
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief This file contains various common defines for the BootLoader
* @see The GNU Public License (GPL) Version 3
*
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef COMMON_H_
#define COMMON_H_
// #include "board.h"
typedef enum {
start, keepgoing,
} DownloadAction;
/**************************************************/
/* OP_DFU states */
/**************************************************/
typedef enum {
DFUidle, // 0
uploading, // 1
wrong_packet_received, // 2
too_many_packets, // 3
too_few_packets, // 4
Last_operation_Success, // 5
downloading, // 6
BLidle, // 7
Last_operation_failed, // 8
uploadingStarting, // 9
outsideDevCapabilities, // 10
CRC_Fail, // 11
failed_jump,
// 12
} DFUStates;
/**************************************************/
/* OP_DFU commands */
/**************************************************/
typedef enum {
Reserved, // 0
Req_Capabilities, // 1
Rep_Capabilities, // 2
EnterDFU, // 3
JumpFW, // 4
Reset, // 5
Abort_Operation, // 6
Upload, // 7
Op_END, // 8
Download_Req, // 9
Download, // 10
Status_Request, // 11
Status_Rep
// 12
} DFUCommands;
typedef enum {
High_Density, Medium_Density
} DeviceType;
/**************************************************/
/* OP_DFU transfer types */
/**************************************************/
typedef enum {
FW, // 0
Descript
// 2
} DFUTransfer;
/**************************************************/
/* OP_DFU transfer port */
/**************************************************/
typedef enum {
Usb, // 0
Serial
// 2
} DFUPort;
/**************************************************/
/* OP_DFU programable programable HW types */
/**************************************************/
typedef enum {
Self_flash, // 0
Remote_flash_via_spi
// 1
} DFUProgType;
/**************************************************/
/* OP_DFU programable sources */
/**************************************************/
#define USB 0
#define SPI 1
#define DownloadDelay 100000
#define MAX_DEL_RETRYS 3
#define MAX_WRI_RETRYS 3
#endif /* COMMON_H_ */

View File

@ -1,115 +0,0 @@
/**
******************************************************************************
* @addtogroup CopterControlBL CopterControl BootLoader
* @brief These files contain the code to the CopterControl Bootloader.
*
* @{
* @file common.c
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief This file contains various common defines for the BootLoader
* @see The GNU Public License (GPL) Version 3
*
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef COMMON_H_
#define COMMON_H_
// #include "board.h"
typedef enum {
start, keepgoing,
} DownloadAction;
/**************************************************/
/* OP_DFU states */
/**************************************************/
typedef enum {
DFUidle, // 0
uploading, // 1
wrong_packet_received, // 2
too_many_packets, // 3
too_few_packets, // 4
Last_operation_Success, // 5
downloading, // 6
BLidle, // 7
Last_operation_failed, // 8
uploadingStarting, // 9
outsideDevCapabilities, // 10
CRC_Fail, // 11
failed_jump,
// 12
} DFUStates;
/**************************************************/
/* OP_DFU commands */
/**************************************************/
typedef enum {
Reserved, // 0
Req_Capabilities, // 1
Rep_Capabilities, // 2
EnterDFU, // 3
JumpFW, // 4
Reset, // 5
Abort_Operation, // 6
Upload, // 7
Op_END, // 8
Download_Req, // 9
Download, // 10
Status_Request, // 11
Status_Rep
// 12
} DFUCommands;
typedef enum {
High_Density, Medium_Density
} DeviceType;
/**************************************************/
/* OP_DFU transfer types */
/**************************************************/
typedef enum {
FW, // 0
Descript
// 2
} DFUTransfer;
/**************************************************/
/* OP_DFU transfer port */
/**************************************************/
typedef enum {
Usb, // 0
Serial
// 2
} DFUPort;
/**************************************************/
/* OP_DFU programable programable HW types */
/**************************************************/
typedef enum {
Self_flash, // 0
Remote_flash_via_spi
// 1
} DFUProgType;
/**************************************************/
/* OP_DFU programable sources */
/**************************************************/
#define USB 0
#define SPI 1
#define DownloadDelay 100000
#define MAX_DEL_RETRYS 3
#define MAX_WRI_RETRYS 3
#endif /* COMMON_H_ */

View File

@ -1,115 +0,0 @@
/**
******************************************************************************
* @addtogroup CopterControlBL CopterControl BootLoader
* @brief These files contain the code to the CopterControl Bootloader.
*
* @{
* @file common.c
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief This file contains various common defines for the BootLoader
* @see The GNU Public License (GPL) Version 3
*
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef COMMON_H_
#define COMMON_H_
// #include "board.h"
typedef enum {
start, keepgoing,
} DownloadAction;
/**************************************************/
/* OP_DFU states */
/**************************************************/
typedef enum {
DFUidle, // 0
uploading, // 1
wrong_packet_received, // 2
too_many_packets, // 3
too_few_packets, // 4
Last_operation_Success, // 5
downloading, // 6
BLidle, // 7
Last_operation_failed, // 8
uploadingStarting, // 9
outsideDevCapabilities, // 10
CRC_Fail, // 11
failed_jump,
// 12
} DFUStates;
/**************************************************/
/* OP_DFU commands */
/**************************************************/
typedef enum {
Reserved, // 0
Req_Capabilities, // 1
Rep_Capabilities, // 2
EnterDFU, // 3
JumpFW, // 4
Reset, // 5
Abort_Operation, // 6
Upload, // 7
Op_END, // 8
Download_Req, // 9
Download, // 10
Status_Request, // 11
Status_Rep
// 12
} DFUCommands;
typedef enum {
High_Density, Medium_Density
} DeviceType;
/**************************************************/
/* OP_DFU transfer types */
/**************************************************/
typedef enum {
FW, // 0
Descript
// 2
} DFUTransfer;
/**************************************************/
/* OP_DFU transfer port */
/**************************************************/
typedef enum {
Usb, // 0
Serial
// 2
} DFUPort;
/**************************************************/
/* OP_DFU programable programable HW types */
/**************************************************/
typedef enum {
Self_flash, // 0
Remote_flash_via_spi
// 1
} DFUProgType;
/**************************************************/
/* OP_DFU programable sources */
/**************************************************/
#define USB 0
#define SPI 1
#define DownloadDelay 100000
#define MAX_DEL_RETRYS 3
#define MAX_WRI_RETRYS 3
#endif /* COMMON_H_ */

View File

@ -1,7 +1,7 @@
/** /**
****************************************************************************** ******************************************************************************
* @file board_hw_defs.c * @file board_hw_defs.c
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015. * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015-2017.
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012. * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012.
* PhoenixPilot, http://github.com/PhoenixPilot, Copyright (C) 2012 * PhoenixPilot, http://github.com/PhoenixPilot, Copyright (C) 2012
* *
@ -9,7 +9,7 @@
* @{ * @{
* @addtogroup OpenPilotCore OpenPilot Core * @addtogroup OpenPilotCore OpenPilot Core
* @{ * @{
* @brief Defines board specific static initializers for hardware for the CopterControl board. * @brief Defines board specific static initializers for hardware for the NucleoF303RE board.
*****************************************************************************/ *****************************************************************************/
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

View File

@ -1,115 +0,0 @@
/**
******************************************************************************
* @addtogroup CopterControlBL CopterControl BootLoader
* @brief These files contain the code to the CopterControl Bootloader.
*
* @{
* @file common.c
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief This file contains various common defines for the BootLoader
* @see The GNU Public License (GPL) Version 3
*
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef COMMON_H_
#define COMMON_H_
// #include "board.h"
typedef enum {
start, keepgoing,
} DownloadAction;
/**************************************************/
/* OP_DFU states */
/**************************************************/
typedef enum {
DFUidle, // 0
uploading, // 1
wrong_packet_received, // 2
too_many_packets, // 3
too_few_packets, // 4
Last_operation_Success, // 5
downloading, // 6
BLidle, // 7
Last_operation_failed, // 8
uploadingStarting, // 9
outsideDevCapabilities, // 10
CRC_Fail, // 11
failed_jump,
// 12
} DFUStates;
/**************************************************/
/* OP_DFU commands */
/**************************************************/
typedef enum {
Reserved, // 0
Req_Capabilities, // 1
Rep_Capabilities, // 2
EnterDFU, // 3
JumpFW, // 4
Reset, // 5
Abort_Operation, // 6
Upload, // 7
Op_END, // 8
Download_Req, // 9
Download, // 10
Status_Request, // 11
Status_Rep
// 12
} DFUCommands;
typedef enum {
High_Density, Medium_Density
} DeviceType;
/**************************************************/
/* OP_DFU transfer types */
/**************************************************/
typedef enum {
FW, // 0
Descript
// 2
} DFUTransfer;
/**************************************************/
/* OP_DFU transfer port */
/**************************************************/
typedef enum {
Usb, // 0
Serial
// 2
} DFUPort;
/**************************************************/
/* OP_DFU programable programable HW types */
/**************************************************/
typedef enum {
Self_flash, // 0
Remote_flash_via_spi
// 1
} DFUProgType;
/**************************************************/
/* OP_DFU programable sources */
/**************************************************/
#define USB 0
#define SPI 1
#define DownloadDelay 100000
#define MAX_DEL_RETRYS 3
#define MAX_WRI_RETRYS 3
#endif /* COMMON_H_ */

View File

@ -1,7 +1,6 @@
/** /**
****************************************************************************** ******************************************************************************
* @addtogroup CopterControlBL CopterControl BootLoader * @addtogroup BootLoader
* @brief These files contain the code to the CopterControl Bootloader.
* @{ * @{
* @file pios_config.h * @file pios_config.h
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
@ -48,6 +47,5 @@
#endif /* PIOS_CONFIG_H */ #endif /* PIOS_CONFIG_H */
/** /**
* @}
* @} * @}
*/ */

View File

@ -38,8 +38,8 @@
#include <pios_usb_defs.h> /* struct usb_* */ #include <pios_usb_defs.h> /* struct usb_* */
#define PIOS_USB_BOARD_PRODUCT_ID USB_PRODUCT_ID_COPTERCONTROL #define PIOS_USB_BOARD_PRODUCT_ID USB_PRODUCT_ID_LIBREPILOT
#define PIOS_USB_BOARD_DEVICE_VER USB_OP_DEVICE_VER(USB_OP_BOARD_ID_COPTERCONTROL, USB_OP_BOARD_MODE_BL) #define PIOS_USB_BOARD_DEVICE_VER USB_OP_DEVICE_VER(USB_OP_BOARD_ID_NUCLEOF303RE, USB_OP_BOARD_MODE_BL)
#define PIOS_USB_BOARD_SN_SUFFIX "+BL" #define PIOS_USB_BOARD_SN_SUFFIX "+BL"
/* /*

View File

@ -1,12 +1,12 @@
/** /**
****************************************************************************** ******************************************************************************
* @addtogroup CopterControlBL CopterControl BootLoader * @addtogroup BootLoader
* @brief These files contain the code to the CopterControl Bootloader.
* *
* @{ * @{
* @file main.c * @file main.c
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2017.
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief This is the file with the main function of the OpenPilot BootLoader * @brief This is the file with the main function of the LibrePilot BootLoader
* @see The GNU Public License (GPL) Version 3 * @see The GNU Public License (GPL) Version 3
* *
*****************************************************************************/ *****************************************************************************/

View File

@ -2,8 +2,9 @@
****************************************************************************** ******************************************************************************
* *
* @file pios_board.c * @file pios_board.c
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2017.
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief Defines board specific static initializers for hardware for the CopterControl board. * @brief Defines board specific static initializers for hardware for the NucleoF303RE board.
* @see The GNU Public License (GPL) Version 3 * @see The GNU Public License (GPL) Version 3
* *
*****************************************************************************/ *****************************************************************************/

View File

@ -25,7 +25,7 @@ endif
include ../board-info.mk include ../board-info.mk
include $(FLIGHT_ROOT_DIR)/make/firmware-defs.mk include $(FLIGHT_ROOT_DIR)/make/firmware-defs.mk
# REVO C++ support # C++ support
USE_CXX = YES USE_CXX = YES
# ARM DSP library # ARM DSP library

View File

@ -40,8 +40,8 @@
#include <pios_usb_defs.h> /* USB_* macros */ #include <pios_usb_defs.h> /* USB_* macros */
#define PIOS_USB_BOARD_PRODUCT_ID USB_PRODUCT_ID_COPTERCONTROL #define PIOS_USB_BOARD_PRODUCT_ID USB_PRODUCT_ID_LIBREPILOT
#define PIOS_USB_BOARD_DEVICE_VER USB_OP_DEVICE_VER(USB_OP_BOARD_ID_COPTERCONTROL, USB_OP_BOARD_MODE_FW) #define PIOS_USB_BOARD_DEVICE_VER USB_OP_DEVICE_VER(USB_OP_BOARD_ID_NUCLEOF303RE, USB_OP_BOARD_MODE_FW)
#define PIOS_USB_BOARD_SN_SUFFIX "+FW" #define PIOS_USB_BOARD_SN_SUFFIX "+FW"
#endif /* PIOS_USB_BOARD_DATA_H */ #endif /* PIOS_USB_BOARD_DATA_H */

View File

@ -1,16 +1,16 @@
/** /**
****************************************************************************** ******************************************************************************
* @addtogroup LibrePilotSystem LibrePilot System * @addtogroup LibrePilotSystem LibrePilot System
* @brief These files are the core system files for CopterControl. * @brief These files are the core system files for LibrePilot.
* They are the ground layer just above PiOS. In practice, CopterControl actually starts * They are the ground layer just above PiOS. In practice, LibrePilot actually starts
* in the main() function of coptercontrol.c * in the main() function of main.cpp
* @{ * @{
* @addtogroup LibrePilotCore LibrePilot Core * @addtogroup LibrePilotCore LibrePilot Core
* @brief This is where the LP firmware starts. Those files also define the compile-time * @brief This is where the LP firmware starts. Those files also define the compile-time
* options of the firmware. * options of the firmware.
* @{ * @{
* @file coptercontrol.c * @file main.cpp
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015. * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015-2017.
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010-2015 * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010-2015
* @brief Sets up and runs main tasks. * @brief Sets up and runs main tasks.
* @see The GNU Public License (GPL) Version 3 * @see The GNU Public License (GPL) Version 3

View File

@ -1,14 +1,14 @@
/** /**
***************************************************************************** *****************************************************************************
* @file pios_board.c * @file pios_board.c
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015. * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2017.
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* PhoenixPilot, http://github.com/PhoenixPilot, Copyright (C) 2012 * PhoenixPilot, http://github.com/PhoenixPilot, Copyright (C) 2012
* @addtogroup LibrePilotSystem LibrePilot System * @addtogroup LibrePilotSystem LibrePilot System
* @{ * @{
* @addtogroup LibrePilotCore LibrePilot Core * @addtogroup LibrePilotCore LibrePilot Core
* @{ * @{
* @brief Defines board specific static initializers for hardware for the CopterControl board. * @brief Defines board specific static initializers for hardware for the NucleoF303RE board.
*****************************************************************************/ *****************************************************************************/
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

View File

@ -5,7 +5,7 @@
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015. * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015.
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* *
* @brief Defines board hardware for the OpenPilot Version 1.1 hardware. * @brief Defines board hardware for the NucleoF303RE board.
* @see The GNU Public License (GPL) Version 3 * @see The GNU Public License (GPL) Version 3
* *
*****************************************************************************/ *****************************************************************************/
@ -79,17 +79,17 @@
// ------------------------ // ------------------------
// TELEMETRY // TELEMETRY
// ------------------------ // ------------------------
#define TELEM_QUEUE_SIZE 10 #define TELEM_QUEUE_SIZE 10
// ------------------------ // ------------------------
// PIOS_LED // PIOS_LED
// ------------------------ // ------------------------
#define PIOS_LED_HEARTBEAT 0 #define PIOS_LED_HEARTBEAT 0
// ------------------------- // -------------------------
// System Settings // System Settings
// ------------------------- // -------------------------
#define PIOS_MASTER_CLOCK 72000000 #define PIOS_MASTER_CLOCK 72000000
#define PIOS_RCC_HSE_BYPASS #define PIOS_RCC_HSE_BYPASS
// ------------------------- // -------------------------
@ -131,7 +131,7 @@ extern uint32_t pios_i2c_id;
// //
// See also pios_board.c // See also pios_board.c
// ------------------------- // -------------------------
#define PIOS_COM_MAX_DEVS 3 #define PIOS_COM_MAX_DEVS 3
// ------------------------- // -------------------------
// ADC // ADC

View File

@ -1,115 +0,0 @@
/**
******************************************************************************
* @addtogroup OpenPilotBL OpenPilot BootLoader
* @brief These files contain the code to the OpenPilot MB Bootloader.
*
* @{
* @file common.c
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief This file contains various common defines for the BootLoader
* @see The GNU Public License (GPL) Version 3
*
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef COMMON_H_
#define COMMON_H_
// #include "board.h"
typedef enum {
start, keepgoing,
} DownloadAction;
/**************************************************/
/* OP_DFU states */
/**************************************************/
typedef enum {
DFUidle, // 0
uploading, // 1
wrong_packet_received, // 2
too_many_packets, // 3
too_few_packets, // 4
Last_operation_Success, // 5
downloading, // 6
BLidle, // 7
Last_operation_failed, // 8
uploadingStarting, // 9
outsideDevCapabilities, // 10
CRC_Fail, // 11
failed_jump,
// 12
} DFUStates;
/**************************************************/
/* OP_DFU commands */
/**************************************************/
typedef enum {
Reserved, // 0
Req_Capabilities, // 1
Rep_Capabilities, // 2
EnterDFU, // 3
JumpFW, // 4
Reset, // 5
Abort_Operation, // 6
Upload, // 7
Op_END, // 8
Download_Req, // 9
Download, // 10
Status_Request, // 11
Status_Rep
// 12
} DFUCommands;
typedef enum {
High_Density, Medium_Density
} DeviceType;
/**************************************************/
/* OP_DFU transfer types */
/**************************************************/
typedef enum {
FW, // 0
Descript
// 2
} DFUTransfer;
/**************************************************/
/* OP_DFU transfer port */
/**************************************************/
typedef enum {
Usb, // 0
Serial
// 2
} DFUPort;
/**************************************************/
/* OP_DFU programable programable HW types */
/**************************************************/
typedef enum {
Self_flash, // 0
Remote_flash_via_spi
// 1
} DFUProgType;
/**************************************************/
/* OP_DFU programable sources */
/**************************************************/
#define USB 0
#define SPI 1
#define DownloadDelay 100000
#define MAX_DEL_RETRYS 3
#define MAX_WRI_RETRYS 3
#endif /* COMMON_H_ */

View File

@ -1,115 +0,0 @@
/**
******************************************************************************
* @addtogroup CopterControlBL CopterControl BootLoader
* @brief These files contain the code to the CopterControl Bootloader.
*
* @{
* @file common.c
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief This file contains various common defines for the BootLoader
* @see The GNU Public License (GPL) Version 3
*
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef COMMON_H_
#define COMMON_H_
// #include "board.h"
typedef enum {
start, keepgoing,
} DownloadAction;
/**************************************************/
/* OP_DFU states */
/**************************************************/
typedef enum {
DFUidle, // 0
uploading, // 1
wrong_packet_received, // 2
too_many_packets, // 3
too_few_packets, // 4
Last_operation_Success, // 5
downloading, // 6
BLidle, // 7
Last_operation_failed, // 8
uploadingStarting, // 9
outsideDevCapabilities, // 10
CRC_Fail, // 11
failed_jump,
// 12
} DFUStates;
/**************************************************/
/* OP_DFU commands */
/**************************************************/
typedef enum {
Reserved, // 0
Req_Capabilities, // 1
Rep_Capabilities, // 2
EnterDFU, // 3
JumpFW, // 4
Reset, // 5
Abort_Operation, // 6
Upload, // 7
Op_END, // 8
Download_Req, // 9
Download, // 10
Status_Request, // 11
Status_Rep
// 12
} DFUCommands;
typedef enum {
High_Density, Medium_Density
} DeviceType;
/**************************************************/
/* OP_DFU transfer types */
/**************************************************/
typedef enum {
FW, // 0
Descript
// 2
} DFUTransfer;
/**************************************************/
/* OP_DFU transfer port */
/**************************************************/
typedef enum {
Usb, // 0
Serial
// 2
} DFUPort;
/**************************************************/
/* OP_DFU programable programable HW types */
/**************************************************/
typedef enum {
Self_flash, // 0
Remote_flash_via_spi
// 1
} DFUProgType;
/**************************************************/
/* OP_DFU programable sources */
/**************************************************/
#define USB 0
#define SPI 1
#define DownloadDelay 100000
#define MAX_DEL_RETRYS 3
#define MAX_WRI_RETRYS 3
#endif /* COMMON_H_ */

View File

@ -1,15 +1,11 @@
/** /**
****************************************************************************** ******************************************************************************
* @file board_hw_defs.c * @file board_hw_defs.c
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015. * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2017.
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012. * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012.
* PhoenixPilot, http://github.com/PhoenixPilot, Copyright (C) 2012 * PhoenixPilot, http://github.com/PhoenixPilot, Copyright (C) 2012
* *
* @addtogroup OpenPilotSystem OpenPilot System * @brief Defines board specific static initializers for hardware for the PikoBLX board.
* @{
* @addtogroup OpenPilotCore OpenPilot Core
* @{
* @brief Defines board specific static initializers for hardware for the CopterControl board.
*****************************************************************************/ *****************************************************************************/
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

View File

@ -1,115 +0,0 @@
/**
******************************************************************************
* @addtogroup CopterControlBL CopterControl BootLoader
* @brief These files contain the code to the CopterControl Bootloader.
*
* @{
* @file common.c
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief This file contains various common defines for the BootLoader
* @see The GNU Public License (GPL) Version 3
*
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef COMMON_H_
#define COMMON_H_
// #include "board.h"
typedef enum {
start, keepgoing,
} DownloadAction;
/**************************************************/
/* OP_DFU states */
/**************************************************/
typedef enum {
DFUidle, // 0
uploading, // 1
wrong_packet_received, // 2
too_many_packets, // 3
too_few_packets, // 4
Last_operation_Success, // 5
downloading, // 6
BLidle, // 7
Last_operation_failed, // 8
uploadingStarting, // 9
outsideDevCapabilities, // 10
CRC_Fail, // 11
failed_jump,
// 12
} DFUStates;
/**************************************************/
/* OP_DFU commands */
/**************************************************/
typedef enum {
Reserved, // 0
Req_Capabilities, // 1
Rep_Capabilities, // 2
EnterDFU, // 3
JumpFW, // 4
Reset, // 5
Abort_Operation, // 6
Upload, // 7
Op_END, // 8
Download_Req, // 9
Download, // 10
Status_Request, // 11
Status_Rep
// 12
} DFUCommands;
typedef enum {
High_Density, Medium_Density
} DeviceType;
/**************************************************/
/* OP_DFU transfer types */
/**************************************************/
typedef enum {
FW, // 0
Descript
// 2
} DFUTransfer;
/**************************************************/
/* OP_DFU transfer port */
/**************************************************/
typedef enum {
Usb, // 0
Serial
// 2
} DFUPort;
/**************************************************/
/* OP_DFU programable programable HW types */
/**************************************************/
typedef enum {
Self_flash, // 0
Remote_flash_via_spi
// 1
} DFUProgType;
/**************************************************/
/* OP_DFU programable sources */
/**************************************************/
#define USB 0
#define SPI 1
#define DownloadDelay 100000
#define MAX_DEL_RETRYS 3
#define MAX_WRI_RETRYS 3
#endif /* COMMON_H_ */

View File

@ -1,7 +1,7 @@
/** /**
****************************************************************************** ******************************************************************************
* @addtogroup CopterControlBL CopterControl BootLoader * @addtogroup BootLoader
* @brief These files contain the code to the CopterControl Bootloader. *
* @{ * @{
* @file pios_config.h * @file pios_config.h
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.

View File

@ -38,8 +38,8 @@
#include <pios_usb_defs.h> /* struct usb_* */ #include <pios_usb_defs.h> /* struct usb_* */
#define PIOS_USB_BOARD_PRODUCT_ID USB_PRODUCT_ID_COPTERCONTROL #define PIOS_USB_BOARD_PRODUCT_ID USB_PRODUCT_ID_LIBREPILOT
#define PIOS_USB_BOARD_DEVICE_VER USB_OP_DEVICE_VER(USB_OP_BOARD_ID_COPTERCONTROL, USB_OP_BOARD_MODE_BL) #define PIOS_USB_BOARD_DEVICE_VER USB_OP_DEVICE_VER(USB_OP_BOARD_ID_PIKOBLX, USB_OP_BOARD_MODE_BL)
#define PIOS_USB_BOARD_SN_SUFFIX "+BL" #define PIOS_USB_BOARD_SN_SUFFIX "+BL"
/* /*

View File

@ -1,12 +1,12 @@
/** /**
****************************************************************************** ******************************************************************************
* @addtogroup CopterControlBL CopterControl BootLoader * @addtogroup BootLoader
* @brief These files contain the code to the CopterControl Bootloader.
* *
* @{ * @{
* @file main.c * @file main.c
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2017.
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief This is the file with the main function of the OpenPilot BootLoader * @brief This is the file with the main function of the LibrePilot BootLoader
* @see The GNU Public License (GPL) Version 3 * @see The GNU Public License (GPL) Version 3
* *
*****************************************************************************/ *****************************************************************************/

View File

@ -2,8 +2,9 @@
****************************************************************************** ******************************************************************************
* *
* @file pios_board.c * @file pios_board.c
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2017.
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief Defines board specific static initializers for hardware for the CopterControl board. * @brief Defines board specific static initializers for hardware for the PikoBLX board.
* @see The GNU Public License (GPL) Version 3 * @see The GNU Public License (GPL) Version 3
* *
*****************************************************************************/ *****************************************************************************/

View File

@ -25,7 +25,7 @@ endif
include ../board-info.mk include ../board-info.mk
include $(FLIGHT_ROOT_DIR)/make/firmware-defs.mk include $(FLIGHT_ROOT_DIR)/make/firmware-defs.mk
# REVO C++ support # C++ support
USE_CXX = YES USE_CXX = YES
# ARM DSP library # ARM DSP library

View File

@ -40,8 +40,8 @@
#include <pios_usb_defs.h> /* USB_* macros */ #include <pios_usb_defs.h> /* USB_* macros */
#define PIOS_USB_BOARD_PRODUCT_ID USB_PRODUCT_ID_COPTERCONTROL #define PIOS_USB_BOARD_PRODUCT_ID USB_PRODUCT_ID_LIBREPILOT
#define PIOS_USB_BOARD_DEVICE_VER USB_OP_DEVICE_VER(USB_OP_BOARD_ID_COPTERCONTROL, USB_OP_BOARD_MODE_FW) #define PIOS_USB_BOARD_DEVICE_VER USB_OP_DEVICE_VER(USB_OP_BOARD_ID_PIKOBLX, USB_OP_BOARD_MODE_FW)
#define PIOS_USB_BOARD_SN_SUFFIX "+FW" #define PIOS_USB_BOARD_SN_SUFFIX "+FW"
#endif /* PIOS_USB_BOARD_DATA_H */ #endif /* PIOS_USB_BOARD_DATA_H */

View File

@ -1,16 +1,16 @@
/** /**
****************************************************************************** ******************************************************************************
* @addtogroup LibrePilotSystem LibrePilot System * @addtogroup LibrePilotSystem LibrePilot System
* @brief These files are the core system files for CopterControl. * @brief These files are the core system files for LibrePilot.
* They are the ground layer just above PiOS. In practice, CopterControl actually starts * They are the ground layer just above PiOS. In practice, LibrePilot actually starts
* in the main() function of coptercontrol.c * in the main() function of main.cpp
* @{ * @{
* @addtogroup LibrePilotCore LibrePilot Core * @addtogroup LibrePilotCore LibrePilot Core
* @brief This is where the LP firmware starts. Those files also define the compile-time * @brief This is where the LP firmware starts. Those files also define the compile-time
* options of the firmware. * options of the firmware.
* @{ * @{
* @file coptercontrol.c * @file main.cpp
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015. * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015-2017.
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010-2015 * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010-2015
* @brief Sets up and runs main tasks. * @brief Sets up and runs main tasks.
* @see The GNU Public License (GPL) Version 3 * @see The GNU Public License (GPL) Version 3

View File

@ -1,14 +1,14 @@
/** /**
***************************************************************************** *****************************************************************************
* @file pios_board.c * @file pios_board.c
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015. * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2017.
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* PhoenixPilot, http://github.com/PhoenixPilot, Copyright (C) 2012 * PhoenixPilot, http://github.com/PhoenixPilot, Copyright (C) 2012
* @addtogroup LibrePilotSystem LibrePilot System * @addtogroup LibrePilotSystem LibrePilot System
* @{ * @{
* @addtogroup LibrePilotCore LibrePilot Core * @addtogroup LibrePilotCore LibrePilot Core
* @{ * @{
* @brief Defines board specific static initializers for hardware for the CopterControl board. * @brief Defines board specific static initializers for hardware for the PikoBLX board.
*****************************************************************************/ *****************************************************************************/
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

View File

@ -2,10 +2,10 @@
****************************************************************************** ******************************************************************************
* *
* @file pios_board.h * @file pios_board.h
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015. * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2017.
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* *
* @brief Defines board hardware for the OpenPilot Version 1.1 hardware. * @brief Defines board hardware for the PikoBLX board
* @see The GNU Public License (GPL) Version 3 * @see The GNU Public License (GPL) Version 3
* *
*****************************************************************************/ *****************************************************************************/

View File

@ -7,6 +7,7 @@
* @{ * @{
* *
* @file pios_usb_board_data.c * @file pios_usb_board_data.c
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2017.
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief Board specific USB definitions * @brief Board specific USB definitions
* @see The GNU Public License (GPL) Version 3 * @see The GNU Public License (GPL) Version 3

View File

@ -1,115 +0,0 @@
/**
******************************************************************************
* @addtogroup CopterControlBL CopterControl BootLoader
* @brief These files contain the code to the CopterControl Bootloader.
*
* @{
* @file common.c
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief This file contains various common defines for the BootLoader
* @see The GNU Public License (GPL) Version 3
*
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef COMMON_H_
#define COMMON_H_
// #include "board.h"
typedef enum {
start, keepgoing,
} DownloadAction;
/**************************************************/
/* OP_DFU states */
/**************************************************/
typedef enum {
DFUidle, // 0
uploading, // 1
wrong_packet_received, // 2
too_many_packets, // 3
too_few_packets, // 4
Last_operation_Success, // 5
downloading, // 6
BLidle, // 7
Last_operation_failed, // 8
uploadingStarting, // 9
outsideDevCapabilities, // 10
CRC_Fail, // 11
failed_jump,
// 12
} DFUStates;
/**************************************************/
/* OP_DFU commands */
/**************************************************/
typedef enum {
Reserved, // 0
Req_Capabilities, // 1
Rep_Capabilities, // 2
EnterDFU, // 3
JumpFW, // 4
Reset, // 5
Abort_Operation, // 6
Upload, // 7
Op_END, // 8
Download_Req, // 9
Download, // 10
Status_Request, // 11
Status_Rep
// 12
} DFUCommands;
typedef enum {
High_Density, Medium_Density
} DeviceType;
/**************************************************/
/* OP_DFU transfer types */
/**************************************************/
typedef enum {
FW, // 0
Descript
// 2
} DFUTransfer;
/**************************************************/
/* OP_DFU transfer port */
/**************************************************/
typedef enum {
Usb, // 0
Serial
// 2
} DFUPort;
/**************************************************/
/* OP_DFU programable programable HW types */
/**************************************************/
typedef enum {
Self_flash, // 0
Remote_flash_via_spi
// 1
} DFUProgType;
/**************************************************/
/* OP_DFU programable sources */
/**************************************************/
#define USB 0
#define SPI 1
#define DownloadDelay 100000
#define MAX_DEL_RETRYS 3
#define MAX_WRI_RETRYS 3
#endif /* COMMON_H_ */

View File

@ -1,115 +0,0 @@
/**
******************************************************************************
* @addtogroup CopterControlBL CopterControl BootLoader
* @brief These files contain the code to the CopterControl Bootloader.
*
* @{
* @file common.c
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief This file contains various common defines for the BootLoader
* @see The GNU Public License (GPL) Version 3
*
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef COMMON_H_
#define COMMON_H_
// #include "board.h"
typedef enum {
start, keepgoing,
} DownloadAction;
/**************************************************/
/* OP_DFU states */
/**************************************************/
typedef enum {
DFUidle, // 0
uploading, // 1
wrong_packet_received, // 2
too_many_packets, // 3
too_few_packets, // 4
Last_operation_Success, // 5
downloading, // 6
BLidle, // 7
Last_operation_failed, // 8
uploadingStarting, // 9
outsideDevCapabilities, // 10
CRC_Fail, // 11
failed_jump,
// 12
} DFUStates;
/**************************************************/
/* OP_DFU commands */
/**************************************************/
typedef enum {
Reserved, // 0
Req_Capabilities, // 1
Rep_Capabilities, // 2
EnterDFU, // 3
JumpFW, // 4
Reset, // 5
Abort_Operation, // 6
Upload, // 7
Op_END, // 8
Download_Req, // 9
Download, // 10
Status_Request, // 11
Status_Rep
// 12
} DFUCommands;
typedef enum {
High_Density, Medium_Density
} DeviceType;
/**************************************************/
/* OP_DFU transfer types */
/**************************************************/
typedef enum {
FW, // 0
Descript
// 2
} DFUTransfer;
/**************************************************/
/* OP_DFU transfer port */
/**************************************************/
typedef enum {
Usb, // 0
Serial
// 2
} DFUPort;
/**************************************************/
/* OP_DFU programable programable HW types */
/**************************************************/
typedef enum {
Self_flash, // 0
Remote_flash_via_spi
// 1
} DFUProgType;
/**************************************************/
/* OP_DFU programable sources */
/**************************************************/
#define USB 0
#define SPI 1
#define DownloadDelay 100000
#define MAX_DEL_RETRYS 3
#define MAX_WRI_RETRYS 3
#endif /* COMMON_H_ */

View File

@ -1,115 +0,0 @@
/**
******************************************************************************
* @addtogroup CopterControlBL CopterControl BootLoader
* @brief These files contain the code to the CopterControl Bootloader.
*
* @{
* @file common.c
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief This file contains various common defines for the BootLoader
* @see The GNU Public License (GPL) Version 3
*
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef COMMON_H_
#define COMMON_H_
// #include "board.h"
typedef enum {
start, keepgoing,
} DownloadAction;
/**************************************************/
/* OP_DFU states */
/**************************************************/
typedef enum {
DFUidle, // 0
uploading, // 1
wrong_packet_received, // 2
too_many_packets, // 3
too_few_packets, // 4
Last_operation_Success, // 5
downloading, // 6
BLidle, // 7
Last_operation_failed, // 8
uploadingStarting, // 9
outsideDevCapabilities, // 10
CRC_Fail, // 11
failed_jump,
// 12
} DFUStates;
/**************************************************/
/* OP_DFU commands */
/**************************************************/
typedef enum {
Reserved, // 0
Req_Capabilities, // 1
Rep_Capabilities, // 2
EnterDFU, // 3
JumpFW, // 4
Reset, // 5
Abort_Operation, // 6
Upload, // 7
Op_END, // 8
Download_Req, // 9
Download, // 10
Status_Request, // 11
Status_Rep
// 12
} DFUCommands;
typedef enum {
High_Density, Medium_Density
} DeviceType;
/**************************************************/
/* OP_DFU transfer types */
/**************************************************/
typedef enum {
FW, // 0
Descript
// 2
} DFUTransfer;
/**************************************************/
/* OP_DFU transfer port */
/**************************************************/
typedef enum {
Usb, // 0
Serial
// 2
} DFUPort;
/**************************************************/
/* OP_DFU programable programable HW types */
/**************************************************/
typedef enum {
Self_flash, // 0
Remote_flash_via_spi
// 1
} DFUProgType;
/**************************************************/
/* OP_DFU programable sources */
/**************************************************/
#define USB 0
#define SPI 1
#define DownloadDelay 100000
#define MAX_DEL_RETRYS 3
#define MAX_WRI_RETRYS 3
#endif /* COMMON_H_ */

View File

@ -1,115 +0,0 @@
/**
******************************************************************************
* @addtogroup CopterControlBL CopterControl BootLoader
* @brief These files contain the code to the CopterControl Bootloader.
*
* @{
* @file common.c
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief This file contains various common defines for the BootLoader
* @see The GNU Public License (GPL) Version 3
*
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef COMMON_H_
#define COMMON_H_
// #include "board.h"
typedef enum {
start, keepgoing,
} DownloadAction;
/**************************************************/
/* OP_DFU states */
/**************************************************/
typedef enum {
DFUidle, // 0
uploading, // 1
wrong_packet_received, // 2
too_many_packets, // 3
too_few_packets, // 4
Last_operation_Success, // 5
downloading, // 6
BLidle, // 7
Last_operation_failed, // 8
uploadingStarting, // 9
outsideDevCapabilities, // 10
CRC_Fail, // 11
failed_jump,
// 12
} DFUStates;
/**************************************************/
/* OP_DFU commands */
/**************************************************/
typedef enum {
Reserved, // 0
Req_Capabilities, // 1
Rep_Capabilities, // 2
EnterDFU, // 3
JumpFW, // 4
Reset, // 5
Abort_Operation, // 6
Upload, // 7
Op_END, // 8
Download_Req, // 9
Download, // 10
Status_Request, // 11
Status_Rep
// 12
} DFUCommands;
typedef enum {
High_Density, Medium_Density
} DeviceType;
/**************************************************/
/* OP_DFU transfer types */
/**************************************************/
typedef enum {
FW, // 0
Descript
// 2
} DFUTransfer;
/**************************************************/
/* OP_DFU transfer port */
/**************************************************/
typedef enum {
Usb, // 0
Serial
// 2
} DFUPort;
/**************************************************/
/* OP_DFU programable programable HW types */
/**************************************************/
typedef enum {
Self_flash, // 0
Remote_flash_via_spi
// 1
} DFUProgType;
/**************************************************/
/* OP_DFU programable sources */
/**************************************************/
#define USB 0
#define SPI 1
#define DownloadDelay 100000
#define MAX_DEL_RETRYS 3
#define MAX_WRI_RETRYS 3
#endif /* COMMON_H_ */

View File

@ -1,7 +1,7 @@
/** /**
****************************************************************************** ******************************************************************************
* @file board_hw_defs.c * @file board_hw_defs.c
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015. * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2017.
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012. * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012.
* PhoenixPilot, http://github.com/PhoenixPilot, Copyright (C) 2012 * PhoenixPilot, http://github.com/PhoenixPilot, Copyright (C) 2012
* *
@ -9,7 +9,7 @@
* @{ * @{
* @addtogroup OpenPilotCore OpenPilot Core * @addtogroup OpenPilotCore OpenPilot Core
* @{ * @{
* @brief Defines board specific static initializers for hardware for the CopterControl board. * @brief Defines board specific static initializers for hardware for the SPRacing F3 board.
*****************************************************************************/ *****************************************************************************/
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

View File

@ -1,115 +0,0 @@
/**
******************************************************************************
* @addtogroup SPRacingF3 serial BootLoader
* @brief These files contain the code to the SPRacingF3 serial Bootloader.
*
* @{
* @file common.c
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief This file contains various common defines for the BootLoader
* @see The GNU Public License (GPL) Version 3
*
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef COMMON_H_
#define COMMON_H_
// #include "board.h"
typedef enum {
start, keepgoing,
} DownloadAction;
/**************************************************/
/* OP_DFU states */
/**************************************************/
typedef enum {
DFUidle, // 0
uploading, // 1
wrong_packet_received, // 2
too_many_packets, // 3
too_few_packets, // 4
Last_operation_Success, // 5
downloading, // 6
BLidle, // 7
Last_operation_failed, // 8
uploadingStarting, // 9
outsideDevCapabilities, // 10
CRC_Fail, // 11
failed_jump,
// 12
} DFUStates;
/**************************************************/
/* OP_DFU commands */
/**************************************************/
typedef enum {
Reserved, // 0
Req_Capabilities, // 1
Rep_Capabilities, // 2
EnterDFU, // 3
JumpFW, // 4
Reset, // 5
Abort_Operation, // 6
Upload, // 7
Op_END, // 8
Download_Req, // 9
Download, // 10
Status_Request, // 11
Status_Rep
// 12
} DFUCommands;
typedef enum {
High_Density, Medium_Density
} DeviceType;
/**************************************************/
/* OP_DFU transfer types */
/**************************************************/
typedef enum {
FW, // 0
Descript
// 2
} DFUTransfer;
/**************************************************/
/* OP_DFU transfer port */
/**************************************************/
typedef enum {
Usb, // 0
Serial
// 2
} DFUPort;
/**************************************************/
/* OP_DFU programable programable HW types */
/**************************************************/
typedef enum {
Self_flash, // 0
Remote_flash_via_spi
// 1
} DFUProgType;
/**************************************************/
/* OP_DFU programable sources */
/**************************************************/
#define USB 0
#define SPI 1
#define DownloadDelay 100000
#define MAX_DEL_RETRYS 3
#define MAX_WRI_RETRYS 3
#endif /* COMMON_H_ */

View File

@ -1,7 +1,6 @@
/** /**
****************************************************************************** ******************************************************************************
* @addtogroup CopterControlBL CopterControl BootLoader * @addtogroup BootLoader
* @brief These files contain the code to the CopterControl Bootloader.
* @{ * @{
* @file pios_config.h * @file pios_config.h
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.

View File

@ -5,8 +5,8 @@
* *
* @{ * @{
* @file main.c * @file main.c
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2017.
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief This is the file with the main function of the OpenPilot BootLoader
* @see The GNU Public License (GPL) Version 3 * @see The GNU Public License (GPL) Version 3
* *
*****************************************************************************/ *****************************************************************************/

View File

@ -2,8 +2,9 @@
****************************************************************************** ******************************************************************************
* *
* @file pios_board.c * @file pios_board.c
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2014. * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2017.
* @brief Defines board specific static initializers for hardware for the GPS board. * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2014.
* @brief Defines board specific static initializers for hardware for the SPRacing F3 board.
* @see The GNU Public License (GPL) Version 3 * @see The GNU Public License (GPL) Version 3
* *
*****************************************************************************/ *****************************************************************************/

View File

@ -1,16 +1,16 @@
/** /**
****************************************************************************** ******************************************************************************
* @addtogroup LibrePilotSystem LibrePilot System * @addtogroup LibrePilotSystem LibrePilot System
* @brief These files are the core system files for CopterControl. * @brief These files are the core system files for LibrePilot.
* They are the ground layer just above PiOS. In practice, CopterControl actually starts * They are the ground layer just above PiOS. In practice, LibrePilot actually starts
* in the main() function of coptercontrol.c * in the main() function of main.cpp
* @{ * @{
* @addtogroup LibrePilotCore LibrePilot Core * @addtogroup LibrePilotCore LibrePilot Core
* @brief This is where the LP firmware starts. Those files also define the compile-time * @brief This is where the LP firmware starts. Those files also define the compile-time
* options of the firmware. * options of the firmware.
* @{ * @{
* @file coptercontrol.c * @file main.cpp
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015. * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015-2017.
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010-2015 * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010-2015
* @brief Sets up and runs main tasks. * @brief Sets up and runs main tasks.
* @see The GNU Public License (GPL) Version 3 * @see The GNU Public License (GPL) Version 3

View File

@ -1,14 +1,14 @@
/** /**
***************************************************************************** *****************************************************************************
* @file pios_board.c * @file pios_board.c
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015. * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2017.
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* PhoenixPilot, http://github.com/PhoenixPilot, Copyright (C) 2012 * PhoenixPilot, http://github.com/PhoenixPilot, Copyright (C) 2012
* @addtogroup LibrePilotSystem LibrePilot System * @addtogroup LibrePilotSystem LibrePilot System
* @{ * @{
* @addtogroup LibrePilotCore LibrePilot Core * @addtogroup LibrePilotCore LibrePilot Core
* @{ * @{
* @brief Defines board specific static initializers for hardware for the CopterControl board. * @brief Defines board specific static initializers for hardware for the SPRacing F3 board.
*****************************************************************************/ *****************************************************************************/
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

View File

@ -5,7 +5,7 @@
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015. * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015.
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* *
* @brief Defines board hardware for the OpenPilot Version 1.1 hardware. * @brief Defines board hardware for the SPRacing F3 board.
* @see The GNU Public License (GPL) Version 3 * @see The GNU Public License (GPL) Version 3
* *
*****************************************************************************/ *****************************************************************************/

View File

@ -1,7 +1,7 @@
/** /**
****************************************************************************** ******************************************************************************
* @file board_hw_defs.c * @file board_hw_defs.c
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015. * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2017.
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012. * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012.
* PhoenixPilot, http://github.com/PhoenixPilot, Copyright (C) 2012 * PhoenixPilot, http://github.com/PhoenixPilot, Copyright (C) 2012
* *
@ -9,7 +9,7 @@
* @{ * @{
* @addtogroup OpenPilotCore OpenPilot Core * @addtogroup OpenPilotCore OpenPilot Core
* @{ * @{
* @brief Defines board specific static initializers for hardware for the CopterControl board. * @brief Defines board specific static initializers for hardware for the SPRacing F3 EVO board.
*****************************************************************************/ *****************************************************************************/
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

View File

@ -1,115 +0,0 @@
/**
******************************************************************************
* @addtogroup CopterControlBL CopterControl BootLoader
* @brief These files contain the code to the CopterControl Bootloader.
*
* @{
* @file common.c
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief This file contains various common defines for the BootLoader
* @see The GNU Public License (GPL) Version 3
*
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef COMMON_H_
#define COMMON_H_
// #include "board.h"
typedef enum {
start, keepgoing,
} DownloadAction;
/**************************************************/
/* OP_DFU states */
/**************************************************/
typedef enum {
DFUidle, // 0
uploading, // 1
wrong_packet_received, // 2
too_many_packets, // 3
too_few_packets, // 4
Last_operation_Success, // 5
downloading, // 6
BLidle, // 7
Last_operation_failed, // 8
uploadingStarting, // 9
outsideDevCapabilities, // 10
CRC_Fail, // 11
failed_jump,
// 12
} DFUStates;
/**************************************************/
/* OP_DFU commands */
/**************************************************/
typedef enum {
Reserved, // 0
Req_Capabilities, // 1
Rep_Capabilities, // 2
EnterDFU, // 3
JumpFW, // 4
Reset, // 5
Abort_Operation, // 6
Upload, // 7
Op_END, // 8
Download_Req, // 9
Download, // 10
Status_Request, // 11
Status_Rep
// 12
} DFUCommands;
typedef enum {
High_Density, Medium_Density
} DeviceType;
/**************************************************/
/* OP_DFU transfer types */
/**************************************************/
typedef enum {
FW, // 0
Descript
// 2
} DFUTransfer;
/**************************************************/
/* OP_DFU transfer port */
/**************************************************/
typedef enum {
Usb, // 0
Serial
// 2
} DFUPort;
/**************************************************/
/* OP_DFU programable programable HW types */
/**************************************************/
typedef enum {
Self_flash, // 0
Remote_flash_via_spi
// 1
} DFUProgType;
/**************************************************/
/* OP_DFU programable sources */
/**************************************************/
#define USB 0
#define SPI 1
#define DownloadDelay 100000
#define MAX_DEL_RETRYS 3
#define MAX_WRI_RETRYS 3
#endif /* COMMON_H_ */

View File

@ -1,7 +1,6 @@
/** /**
****************************************************************************** ******************************************************************************
* @addtogroup CopterControlBL CopterControl BootLoader * @addtogroup BootLoader
* @brief These files contain the code to the CopterControl Bootloader.
* @{ * @{
* @file pios_config.h * @file pios_config.h
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.

View File

@ -38,8 +38,8 @@
#include <pios_usb_defs.h> /* struct usb_* */ #include <pios_usb_defs.h> /* struct usb_* */
#define PIOS_USB_BOARD_PRODUCT_ID USB_PRODUCT_ID_COPTERCONTROL #define PIOS_USB_BOARD_PRODUCT_ID USB_PRODUCT_ID_LIBREPILOT
#define PIOS_USB_BOARD_DEVICE_VER USB_OP_DEVICE_VER(USB_OP_BOARD_ID_COPTERCONTROL, USB_OP_BOARD_MODE_BL) #define PIOS_USB_BOARD_DEVICE_VER USB_OP_DEVICE_VER(USB_OP_BOARD_ID_SPRACINGF3EVO, USB_OP_BOARD_MODE_BL)
#define PIOS_USB_BOARD_SN_SUFFIX "+BL" #define PIOS_USB_BOARD_SN_SUFFIX "+BL"
/* /*

View File

@ -1,12 +1,12 @@
/** /**
****************************************************************************** ******************************************************************************
* @addtogroup CopterControlBL CopterControl BootLoader * @addtogroup SPRacingF3 EVO serial BootLoader
* @brief These files contain the code to the CopterControl Bootloader. * @brief These files contain the code to the SPRacingF3 EVO serial Bootloader.
* *
* @{ * @{
* @file main.c * @file main.c
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2017.
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief This is the file with the main function of the OpenPilot BootLoader
* @see The GNU Public License (GPL) Version 3 * @see The GNU Public License (GPL) Version 3
* *
*****************************************************************************/ *****************************************************************************/

View File

@ -2,8 +2,9 @@
****************************************************************************** ******************************************************************************
* *
* @file pios_board.c * @file pios_board.c
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2017.
* @brief Defines board specific static initializers for hardware for the CopterControl board. * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2014.
* @brief Defines board specific static initializers for hardware for the SPRacing F3 EVO board.
* @see The GNU Public License (GPL) Version 3 * @see The GNU Public License (GPL) Version 3
* *
*****************************************************************************/ *****************************************************************************/

View File

@ -40,8 +40,8 @@
#include <pios_usb_defs.h> /* USB_* macros */ #include <pios_usb_defs.h> /* USB_* macros */
#define PIOS_USB_BOARD_PRODUCT_ID USB_PRODUCT_ID_COPTERCONTROL #define PIOS_USB_BOARD_PRODUCT_ID USB_PRODUCT_ID_LIBREPILOT
#define PIOS_USB_BOARD_DEVICE_VER USB_OP_DEVICE_VER(USB_OP_BOARD_ID_COPTERCONTROL, USB_OP_BOARD_MODE_FW) #define PIOS_USB_BOARD_DEVICE_VER USB_OP_DEVICE_VER(USB_OP_BOARD_ID_SPRACINGF3EVO, USB_OP_BOARD_MODE_FW)
#define PIOS_USB_BOARD_SN_SUFFIX "+FW" #define PIOS_USB_BOARD_SN_SUFFIX "+FW"
#endif /* PIOS_USB_BOARD_DATA_H */ #endif /* PIOS_USB_BOARD_DATA_H */

View File

@ -1,16 +1,16 @@
/** /**
****************************************************************************** ******************************************************************************
* @addtogroup LibrePilotSystem LibrePilot System * @addtogroup LibrePilotSystem LibrePilot System
* @brief These files are the core system files for CopterControl. * @brief These files are the core system files for LibrePilot.
* They are the ground layer just above PiOS. In practice, CopterControl actually starts * They are the ground layer just above PiOS. In practice, LibrePilot actually starts
* in the main() function of coptercontrol.c * in the main() function of main.cpp
* @{ * @{
* @addtogroup LibrePilotCore LibrePilot Core * @addtogroup LibrePilotCore LibrePilot Core
* @brief This is where the LP firmware starts. Those files also define the compile-time * @brief This is where the LP firmware starts. Those files also define the compile-time
* options of the firmware. * options of the firmware.
* @{ * @{
* @file coptercontrol.c * @file main.cpp
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015. * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015-2017.
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010-2015 * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010-2015
* @brief Sets up and runs main tasks. * @brief Sets up and runs main tasks.
* @see The GNU Public License (GPL) Version 3 * @see The GNU Public License (GPL) Version 3

View File

@ -1,14 +1,14 @@
/** /**
***************************************************************************** *****************************************************************************
* @file pios_board.c * @file pios_board.c
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015. * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2017.
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* PhoenixPilot, http://github.com/PhoenixPilot, Copyright (C) 2012 * PhoenixPilot, http://github.com/PhoenixPilot, Copyright (C) 2012
* @addtogroup LibrePilotSystem LibrePilot System * @addtogroup LibrePilotSystem LibrePilot System
* @{ * @{
* @addtogroup LibrePilotCore LibrePilot Core * @addtogroup LibrePilotCore LibrePilot Core
* @{ * @{
* @brief Defines board specific static initializers for hardware for the CopterControl board. * @brief Defines board specific static initializers for hardware for the SPRacing F3 EVO board.
*****************************************************************************/ *****************************************************************************/
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

View File

@ -5,7 +5,7 @@
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015. * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015.
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* *
* @brief Defines board hardware for the OpenPilot Version 1.1 hardware. * @brief Defines board hardware for the SPRacing F3 EVO board.
* @see The GNU Public License (GPL) Version 3 * @see The GNU Public License (GPL) Version 3
* *
*****************************************************************************/ *****************************************************************************/

View File

@ -1,7 +1,7 @@
/** /**
****************************************************************************** ******************************************************************************
* *
* @file configSPRacingF3HWWidget.cpp * @file configspracingf3hwwidget.cpp
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016. * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @addtogroup GCSPlugins GCS Plugins * @addtogroup GCSPlugins GCS Plugins

View File

@ -1,14 +1,14 @@
/** /**
****************************************************************************** ******************************************************************************
* *
* @file configSPRacingF3HWWidget.h * @file configspracingf3hwwidget.h
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016. * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @addtogroup GCSPlugins GCS Plugins * @addtogroup GCSPlugins GCS Plugins
* @{ * @{
* @addtogroup ConfigPlugin Config Plugin * @addtogroup ConfigPlugin Config Plugin
* @{ * @{
* @brief Revolution hardware configuration panel * @brief SPRacingF3 hardware configuration panel
*****************************************************************************/ *****************************************************************************/
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

View File

@ -154,6 +154,7 @@ void ControllerPage::setupBoardTypes()
ui->boardTypeCombo->addItem(tr("TauLabs Sparky 2.0"), SetupWizard::CONTROLLER_SPARKY2); ui->boardTypeCombo->addItem(tr("TauLabs Sparky 2.0"), SetupWizard::CONTROLLER_SPARKY2);
ui->boardTypeCombo->addItem(tr("SPRacing F3"), SetupWizard::CONTROLLER_SPRACINGF3); ui->boardTypeCombo->addItem(tr("SPRacing F3"), SetupWizard::CONTROLLER_SPRACINGF3);
ui->boardTypeCombo->addItem(tr("SPRacing F3 EVO"), SetupWizard::CONTROLLER_SPRACINGF3EVO); ui->boardTypeCombo->addItem(tr("SPRacing F3 EVO"), SetupWizard::CONTROLLER_SPRACINGF3EVO);
ui->boardTypeCombo->addItem(tr("PikoBLX"), SetupWizard::CONTROLLER_PIKOBLX);
} }
void ControllerPage::setControllerType(SetupWizard::CONTROLLER_TYPE type) void ControllerPage::setControllerType(SetupWizard::CONTROLLER_TYPE type)
@ -252,6 +253,10 @@ void ControllerPage::connectionStatusChanged()
ui->boardImg->setPixmap(boardPic.scaled(picSize, Qt::KeepAspectRatio)); ui->boardImg->setPixmap(boardPic.scaled(picSize, Qt::KeepAspectRatio));
break; break;
case SetupWizard::CONTROLLER_PIKOBLX:
boardPic.load(":/configgadget/images/pikoblx_top.png");
ui->boardImg->setPixmap(boardPic.scaled(picSize, Qt::KeepAspectRatio));
break;
default: default:
ui->boardImg->setPixmap(QPixmap()); ui->boardImg->setPixmap(QPixmap());

View File

@ -785,12 +785,12 @@ bool UploaderGadgetWidget::autoUpdate(bool erase)
case 0x9201: case 0x9201:
filename = "fw_sparky2"; filename = "fw_sparky2";
break; break;
case 0x1002:
filename = "fw_spracingf3evo";
break;
case 0x1001: case 0x1001:
filename = "fw_spracingf3"; filename = "fw_spracingf3";
break; break;
case 0x1002:
filename = "fw_spracingf3evo";
break;
case 0x1003: case 0x1003:
filename = "fw_nucleof303re"; filename = "fw_nucleof303re";
break; break;