From 10e75768b532d44e2c8cd1f2ef159d4d034a03b5 Mon Sep 17 00:00:00 2001
From: Peter de Kok
Date: Fri, 12 Jun 2015 10:14:58 +0200
Subject: lateste2
---
RPi_skeleton/RPi_skeleton | 1 -
.../RPi_skeleton.xcodeproj/project.pbxproj | 242 ---------------------
.../project.xcworkspace/contents.xcworkspacedata | 7 -
.../xcshareddata/RPi_skeleton.xccheckout | 41 ----
.../UserInterfaceState.xcuserstate | Bin 12611 -> 0 bytes
.../xcschemes/RPi_skeleton.xcscheme | 88 --------
.../xcschemes/xcschememanagement.plist | 22 --
Venus_Skeleton/definitions.h | 10 +-
8 files changed, 5 insertions(+), 406 deletions(-)
delete mode 160000 RPi_skeleton/RPi_skeleton
delete mode 100644 RPi_skeleton/RPi_skeleton.xcodeproj/project.pbxproj
delete mode 100644 RPi_skeleton/RPi_skeleton.xcodeproj/project.xcworkspace/contents.xcworkspacedata
delete mode 100644 RPi_skeleton/RPi_skeleton.xcodeproj/project.xcworkspace/xcshareddata/RPi_skeleton.xccheckout
delete mode 100644 RPi_skeleton/RPi_skeleton.xcodeproj/project.xcworkspace/xcuserdata/peterdekok.xcuserdatad/UserInterfaceState.xcuserstate
delete mode 100644 RPi_skeleton/RPi_skeleton.xcodeproj/xcuserdata/peterdekok.xcuserdatad/xcschemes/RPi_skeleton.xcscheme
delete mode 100644 RPi_skeleton/RPi_skeleton.xcodeproj/xcuserdata/peterdekok.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/RPi_skeleton/RPi_skeleton b/RPi_skeleton/RPi_skeleton
deleted file mode 160000
index b0b67e7..0000000
--- a/RPi_skeleton/RPi_skeleton
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b0b67e7cf8715520fd40cdc51af66c17a4ba54a3
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 = ""; };
-/* 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 = "";
- };
- C88771461B0CC48A003DDDD4 /* Products */ = {
- isa = PBXGroup;
- children = (
- C88771451B0CC48A003DDDD4 /* RPi_skeleton */,
- );
- name = Products;
- sourceTree = "";
- };
- C88771471B0CC48A003DDDD4 /* RPi_skeleton */ = {
- isa = PBXGroup;
- children = (
- C88771481B0CC48A003DDDD4 /* main.c */,
- );
- path = RPi_skeleton;
- sourceTree = "";
- };
-/* 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 @@
-
-
-
-
-
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 @@
-
-
-
-
- IDESourceControlProjectFavoriteDictionaryKey
-
- IDESourceControlProjectIdentifier
- 51C5F246-5DBB-42DB-85DC-78C2653CA244
- IDESourceControlProjectName
- project
- IDESourceControlProjectOriginsDictionary
-
- EC86EAF72C84463005E3A82B4C6719F0BEB98076
- git.lekensteyn.nl:tue/5XIB0-Venus/code.git
-
- IDESourceControlProjectPath
- RPi_skeleton/RPi_skeleton/RPi_skeleton.xcodeproj/project.xcworkspace
- IDESourceControlProjectRelativeInstallPathDictionary
-
- EC86EAF72C84463005E3A82B4C6719F0BEB98076
- ../../../..
-
- IDESourceControlProjectURL
- git.lekensteyn.nl:tue/5XIB0-Venus/code.git
- IDESourceControlProjectVersion
- 111
- IDESourceControlProjectWCCIdentifier
- EC86EAF72C84463005E3A82B4C6719F0BEB98076
- IDESourceControlProjectWCConfigurations
-
-
- IDESourceControlRepositoryExtensionIdentifierKey
- public.vcs.git
- IDESourceControlWCCIdentifierKey
- EC86EAF72C84463005E3A82B4C6719F0BEB98076
- IDESourceControlWCCName
- code
-
-
-
-
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
Binary files a/RPi_skeleton/RPi_skeleton.xcodeproj/project.xcworkspace/xcuserdata/peterdekok.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null 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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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 @@
-
-
-
-
- SchemeUserState
-
- RPi_skeleton.xcscheme
-
- orderHint
- 0
-
-
- SuppressBuildableAutocreation
-
- C88771441B0CC48A003DDDD4
-
- primary
-
-
-
-
-
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
--
cgit v1.2.1