summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter de Kok <p.j.s.d.kok@gmail.com>2015-06-12 10:14:58 +0200
committerPeter de Kok <p.j.s.d.kok@gmail.com>2015-06-12 10:14:58 +0200
commit10e75768b532d44e2c8cd1f2ef159d4d034a03b5 (patch)
treec1edacdd1055bc746ed7890b9c0b1e4b9d66931a
parent3f30bd36140280c605789f9874fffc2784683118 (diff)
downloadcode-10e75768b532d44e2c8cd1f2ef159d4d034a03b5.tar.gz
lateste2
m---------RPi_skeleton/RPi_skeleton0
-rw-r--r--RPi_skeleton/RPi_skeleton.xcodeproj/project.pbxproj242
-rw-r--r--RPi_skeleton/RPi_skeleton.xcodeproj/project.xcworkspace/contents.xcworkspacedata7
-rw-r--r--RPi_skeleton/RPi_skeleton.xcodeproj/project.xcworkspace/xcshareddata/RPi_skeleton.xccheckout41
-rw-r--r--RPi_skeleton/RPi_skeleton.xcodeproj/project.xcworkspace/xcuserdata/peterdekok.xcuserdatad/UserInterfaceState.xcuserstatebin12611 -> 0 bytes
-rw-r--r--RPi_skeleton/RPi_skeleton.xcodeproj/xcuserdata/peterdekok.xcuserdatad/xcschemes/RPi_skeleton.xcscheme88
-rw-r--r--RPi_skeleton/RPi_skeleton.xcodeproj/xcuserdata/peterdekok.xcuserdatad/xcschemes/xcschememanagement.plist22
-rw-r--r--Venus_Skeleton/definitions.h10
8 files changed, 5 insertions, 405 deletions
diff --git a/RPi_skeleton/RPi_skeleton b/RPi_skeleton/RPi_skeleton
deleted file mode 160000
-Subproject b0b67e7cf8715520fd40cdc51af66c17a4ba54a
diff --git a/RPi_skeleton/RPi_skeleton.xcodeproj/project.pbxproj b/RPi_skeleton/RPi_skeleton.xcodeproj/project.pbxproj
deleted file mode 100644
index 8e970da..0000000
--- a/RPi_skeleton/RPi_skeleton.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,242 +0,0 @@
-// !$*UTF8*$!
-{
- archiveVersion = 1;
- classes = {
- };
- objectVersion = 46;
- objects = {
-
-/* Begin PBXBuildFile section */
- C88771491B0CC48A003DDDD4 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = C88771481B0CC48A003DDDD4 /* main.c */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXCopyFilesBuildPhase section */
- C88771431B0CC48A003DDDD4 /* CopyFiles */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- dstPath = /usr/share/man/man1/;
- dstSubfolderSpec = 0;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 1;
- };
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
- C88771451B0CC48A003DDDD4 /* RPi_skeleton */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = RPi_skeleton; sourceTree = BUILT_PRODUCTS_DIR; };
- C88771481B0CC48A003DDDD4 /* main.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
- C88771421B0CC48A003DDDD4 /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
- C887713C1B0CC48A003DDDD4 = {
- isa = PBXGroup;
- children = (
- C88771471B0CC48A003DDDD4 /* RPi_skeleton */,
- C88771461B0CC48A003DDDD4 /* Products */,
- );
- sourceTree = "<group>";
- };
- C88771461B0CC48A003DDDD4 /* Products */ = {
- isa = PBXGroup;
- children = (
- C88771451B0CC48A003DDDD4 /* RPi_skeleton */,
- );
- name = Products;
- sourceTree = "<group>";
- };
- C88771471B0CC48A003DDDD4 /* RPi_skeleton */ = {
- isa = PBXGroup;
- children = (
- C88771481B0CC48A003DDDD4 /* main.c */,
- );
- path = RPi_skeleton;
- sourceTree = "<group>";
- };
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
- C88771441B0CC48A003DDDD4 /* RPi_skeleton */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = C887714C1B0CC48A003DDDD4 /* Build configuration list for PBXNativeTarget "RPi_skeleton" */;
- buildPhases = (
- C88771411B0CC48A003DDDD4 /* Sources */,
- C88771421B0CC48A003DDDD4 /* Frameworks */,
- C88771431B0CC48A003DDDD4 /* CopyFiles */,
- );
- buildRules = (
- );
- dependencies = (
- );
- name = RPi_skeleton;
- productName = RPi_skeleton;
- productReference = C88771451B0CC48A003DDDD4 /* RPi_skeleton */;
- productType = "com.apple.product-type.tool";
- };
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
- C887713D1B0CC48A003DDDD4 /* Project object */ = {
- isa = PBXProject;
- attributes = {
- LastUpgradeCheck = 0640;
- ORGANIZATIONNAME = "Peter de Kok";
- TargetAttributes = {
- C88771441B0CC48A003DDDD4 = {
- CreatedOnToolsVersion = 6.4;
- };
- };
- };
- buildConfigurationList = C88771401B0CC48A003DDDD4 /* Build configuration list for PBXProject "RPi_skeleton" */;
- compatibilityVersion = "Xcode 3.2";
- developmentRegion = English;
- hasScannedForEncodings = 0;
- knownRegions = (
- en,
- );
- mainGroup = C887713C1B0CC48A003DDDD4;
- productRefGroup = C88771461B0CC48A003DDDD4 /* Products */;
- projectDirPath = "";
- projectRoot = "";
- targets = (
- C88771441B0CC48A003DDDD4 /* RPi_skeleton */,
- );
- };
-/* End PBXProject section */
-
-/* Begin PBXSourcesBuildPhase section */
- C88771411B0CC48A003DDDD4 /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- C88771491B0CC48A003DDDD4 /* main.c in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXSourcesBuildPhase section */
-
-/* Begin XCBuildConfiguration section */
- C887714A1B0CC48A003DDDD4 /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
- CLANG_CXX_LIBRARY = "libc++";
- CLANG_ENABLE_MODULES = YES;
- CLANG_ENABLE_OBJC_ARC = YES;
- CLANG_WARN_BOOL_CONVERSION = YES;
- CLANG_WARN_CONSTANT_CONVERSION = YES;
- CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
- CLANG_WARN_EMPTY_BODY = YES;
- CLANG_WARN_ENUM_CONVERSION = YES;
- CLANG_WARN_INT_CONVERSION = YES;
- CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
- CLANG_WARN_UNREACHABLE_CODE = YES;
- CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
- COPY_PHASE_STRIP = NO;
- DEBUG_INFORMATION_FORMAT = dwarf;
- ENABLE_STRICT_OBJC_MSGSEND = YES;
- GCC_C_LANGUAGE_STANDARD = gnu99;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_NO_COMMON_BLOCKS = YES;
- GCC_OPTIMIZATION_LEVEL = 0;
- GCC_PREPROCESSOR_DEFINITIONS = (
- "DEBUG=1",
- "$(inherited)",
- );
- GCC_SYMBOLS_PRIVATE_EXTERN = NO;
- GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
- GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
- GCC_WARN_UNDECLARED_SELECTOR = YES;
- GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
- GCC_WARN_UNUSED_FUNCTION = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- MACOSX_DEPLOYMENT_TARGET = 10.10;
- MTL_ENABLE_DEBUG_INFO = YES;
- ONLY_ACTIVE_ARCH = YES;
- SDKROOT = macosx;
- };
- name = Debug;
- };
- C887714B1B0CC48A003DDDD4 /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
- CLANG_CXX_LIBRARY = "libc++";
- CLANG_ENABLE_MODULES = YES;
- CLANG_ENABLE_OBJC_ARC = YES;
- CLANG_WARN_BOOL_CONVERSION = YES;
- CLANG_WARN_CONSTANT_CONVERSION = YES;
- CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
- CLANG_WARN_EMPTY_BODY = YES;
- CLANG_WARN_ENUM_CONVERSION = YES;
- CLANG_WARN_INT_CONVERSION = YES;
- CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
- CLANG_WARN_UNREACHABLE_CODE = YES;
- CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
- COPY_PHASE_STRIP = NO;
- DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- ENABLE_NS_ASSERTIONS = NO;
- ENABLE_STRICT_OBJC_MSGSEND = YES;
- GCC_C_LANGUAGE_STANDARD = gnu99;
- GCC_NO_COMMON_BLOCKS = YES;
- GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
- GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
- GCC_WARN_UNDECLARED_SELECTOR = YES;
- GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
- GCC_WARN_UNUSED_FUNCTION = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- MACOSX_DEPLOYMENT_TARGET = 10.10;
- MTL_ENABLE_DEBUG_INFO = NO;
- SDKROOT = macosx;
- };
- name = Release;
- };
- C887714D1B0CC48A003DDDD4 /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = "$(TARGET_NAME)";
- };
- name = Debug;
- };
- C887714E1B0CC48A003DDDD4 /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = "$(TARGET_NAME)";
- };
- name = Release;
- };
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
- C88771401B0CC48A003DDDD4 /* Build configuration list for PBXProject "RPi_skeleton" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- C887714A1B0CC48A003DDDD4 /* Debug */,
- C887714B1B0CC48A003DDDD4 /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
- C887714C1B0CC48A003DDDD4 /* Build configuration list for PBXNativeTarget "RPi_skeleton" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- C887714D1B0CC48A003DDDD4 /* Debug */,
- C887714E1B0CC48A003DDDD4 /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- };
-/* End XCConfigurationList section */
- };
- rootObject = C887713D1B0CC48A003DDDD4 /* Project object */;
-}
diff --git a/RPi_skeleton/RPi_skeleton.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/RPi_skeleton/RPi_skeleton.xcodeproj/project.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 9269460..0000000
--- a/RPi_skeleton/RPi_skeleton.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
- version = "1.0">
- <FileRef
- location = "self:RPi_skeleton.xcodeproj">
- </FileRef>
-</Workspace>
diff --git a/RPi_skeleton/RPi_skeleton.xcodeproj/project.xcworkspace/xcshareddata/RPi_skeleton.xccheckout b/RPi_skeleton/RPi_skeleton.xcodeproj/project.xcworkspace/xcshareddata/RPi_skeleton.xccheckout
deleted file mode 100644
index 531f8aa..0000000
--- a/RPi_skeleton/RPi_skeleton.xcodeproj/project.xcworkspace/xcshareddata/RPi_skeleton.xccheckout
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>IDESourceControlProjectFavoriteDictionaryKey</key>
- <false/>
- <key>IDESourceControlProjectIdentifier</key>
- <string>51C5F246-5DBB-42DB-85DC-78C2653CA244</string>
- <key>IDESourceControlProjectName</key>
- <string>project</string>
- <key>IDESourceControlProjectOriginsDictionary</key>
- <dict>
- <key>EC86EAF72C84463005E3A82B4C6719F0BEB98076</key>
- <string>git.lekensteyn.nl:tue/5XIB0-Venus/code.git</string>
- </dict>
- <key>IDESourceControlProjectPath</key>
- <string>RPi_skeleton/RPi_skeleton/RPi_skeleton.xcodeproj/project.xcworkspace</string>
- <key>IDESourceControlProjectRelativeInstallPathDictionary</key>
- <dict>
- <key>EC86EAF72C84463005E3A82B4C6719F0BEB98076</key>
- <string>../../../..</string>
- </dict>
- <key>IDESourceControlProjectURL</key>
- <string>git.lekensteyn.nl:tue/5XIB0-Venus/code.git</string>
- <key>IDESourceControlProjectVersion</key>
- <integer>111</integer>
- <key>IDESourceControlProjectWCCIdentifier</key>
- <string>EC86EAF72C84463005E3A82B4C6719F0BEB98076</string>
- <key>IDESourceControlProjectWCConfigurations</key>
- <array>
- <dict>
- <key>IDESourceControlRepositoryExtensionIdentifierKey</key>
- <string>public.vcs.git</string>
- <key>IDESourceControlWCCIdentifierKey</key>
- <string>EC86EAF72C84463005E3A82B4C6719F0BEB98076</string>
- <key>IDESourceControlWCCName</key>
- <string>code</string>
- </dict>
- </array>
-</dict>
-</plist>
diff --git a/RPi_skeleton/RPi_skeleton.xcodeproj/project.xcworkspace/xcuserdata/peterdekok.xcuserdatad/UserInterfaceState.xcuserstate b/RPi_skeleton/RPi_skeleton.xcodeproj/project.xcworkspace/xcuserdata/peterdekok.xcuserdatad/UserInterfaceState.xcuserstate
deleted file mode 100644
index 91ef072..0000000
--- a/RPi_skeleton/RPi_skeleton.xcodeproj/project.xcworkspace/xcuserdata/peterdekok.xcuserdatad/UserInterfaceState.xcuserstate
+++ /dev/null
Binary files differ
diff --git a/RPi_skeleton/RPi_skeleton.xcodeproj/xcuserdata/peterdekok.xcuserdatad/xcschemes/RPi_skeleton.xcscheme b/RPi_skeleton/RPi_skeleton.xcodeproj/xcuserdata/peterdekok.xcuserdatad/xcschemes/RPi_skeleton.xcscheme
deleted file mode 100644
index 8faf2ed..0000000
--- a/RPi_skeleton/RPi_skeleton.xcodeproj/xcuserdata/peterdekok.xcuserdatad/xcschemes/RPi_skeleton.xcscheme
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
- LastUpgradeVersion = "0640"
- version = "1.3">
- <BuildAction
- parallelizeBuildables = "YES"
- buildImplicitDependencies = "YES">
- <BuildActionEntries>
- <BuildActionEntry
- buildForTesting = "YES"
- buildForRunning = "YES"
- buildForProfiling = "YES"
- buildForArchiving = "YES"
- buildForAnalyzing = "YES">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "C88771441B0CC48A003DDDD4"
- BuildableName = "RPi_skeleton"
- BlueprintName = "RPi_skeleton"
- ReferencedContainer = "container:RPi_skeleton.xcodeproj">
- </BuildableReference>
- </BuildActionEntry>
- </BuildActionEntries>
- </BuildAction>
- <TestAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- shouldUseLaunchSchemeArgsEnv = "YES"
- buildConfiguration = "Debug">
- <Testables>
- </Testables>
- <MacroExpansion>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "C88771441B0CC48A003DDDD4"
- BuildableName = "RPi_skeleton"
- BlueprintName = "RPi_skeleton"
- ReferencedContainer = "container:RPi_skeleton.xcodeproj">
- </BuildableReference>
- </MacroExpansion>
- </TestAction>
- <LaunchAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- launchStyle = "0"
- useCustomWorkingDirectory = "NO"
- buildConfiguration = "Debug"
- ignoresPersistentStateOnLaunch = "NO"
- debugDocumentVersioning = "YES"
- allowLocationSimulation = "YES">
- <BuildableProductRunnable
- runnableDebuggingMode = "0">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "C88771441B0CC48A003DDDD4"
- BuildableName = "RPi_skeleton"
- BlueprintName = "RPi_skeleton"
- ReferencedContainer = "container:RPi_skeleton.xcodeproj">
- </BuildableReference>
- </BuildableProductRunnable>
- <AdditionalOptions>
- </AdditionalOptions>
- </LaunchAction>
- <ProfileAction
- shouldUseLaunchSchemeArgsEnv = "YES"
- savedToolIdentifier = ""
- useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release"
- debugDocumentVersioning = "YES">
- <BuildableProductRunnable
- runnableDebuggingMode = "0">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "C88771441B0CC48A003DDDD4"
- BuildableName = "RPi_skeleton"
- BlueprintName = "RPi_skeleton"
- ReferencedContainer = "container:RPi_skeleton.xcodeproj">
- </BuildableReference>
- </BuildableProductRunnable>
- </ProfileAction>
- <AnalyzeAction
- buildConfiguration = "Debug">
- </AnalyzeAction>
- <ArchiveAction
- buildConfiguration = "Release"
- revealArchiveInOrganizer = "YES">
- </ArchiveAction>
-</Scheme>
diff --git a/RPi_skeleton/RPi_skeleton.xcodeproj/xcuserdata/peterdekok.xcuserdatad/xcschemes/xcschememanagement.plist b/RPi_skeleton/RPi_skeleton.xcodeproj/xcuserdata/peterdekok.xcuserdatad/xcschemes/xcschememanagement.plist
deleted file mode 100644
index e7675ed..0000000
--- a/RPi_skeleton/RPi_skeleton.xcodeproj/xcuserdata/peterdekok.xcuserdatad/xcschemes/xcschememanagement.plist
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>SchemeUserState</key>
- <dict>
- <key>RPi_skeleton.xcscheme</key>
- <dict>
- <key>orderHint</key>
- <integer>0</integer>
- </dict>
- </dict>
- <key>SuppressBuildableAutocreation</key>
- <dict>
- <key>C88771441B0CC48A003DDDD4</key>
- <dict>
- <key>primary</key>
- <true/>
- </dict>
- </dict>
-</dict>
-</plist>
diff --git a/Venus_Skeleton/definitions.h b/Venus_Skeleton/definitions.h
index 1e4a110..dc7d540 100644
--- a/Venus_Skeleton/definitions.h
+++ b/Venus_Skeleton/definitions.h
@@ -3,17 +3,17 @@
// *****************
// Pin configuration
-#define PIN_SENS_COMPASS
#define PIN_SENS_OBSTACLE_TURRET 9
#define PIN_SENS_IR_LEFT A1
#define PIN_SENS_IR_RIGHT A0
-#define PIN_SENS_SAMPLE_TURRET
-#define PIN_SENS_SAMPLE_GRIPPER
-#define PIN_SENS_BEACON_TURRET
+#define PIN_SENS_SAMPLE_TURRET 5
+#define PIN_SENS_SAMPLE_GRIPPER 6
+#define PIN_SENS_BEACON_TURRET 3
#define PIN_SERVO_LEFT 12
#define PIN_SERVO_RIGHT 13
#define PIN_SERVO_TURRET 11
#define PIN_SERVO_GRIPPER 10
+// Compass is on A4, A5
// Number of directions the robot can choose from: ((x-1) * (360/x)) degree. Preferably a multiple of 4, I think.
#define NUM_DIRECTIONS 12
@@ -28,4 +28,4 @@
#define OBSTACLE_TOO_CLOSE 30
// Maximum time between communications to Raspberry Pi (ms)
-#define MAX_COMMUNICATION_DELAY 3000 \ No newline at end of file
+#define MAX_COMMUNICATION_DELAY 3000