diff options
author | masterm <devnull@localhost> | 2007-02-19 23:02:01 +0100 |
---|---|---|
committer | masterm <devnull@localhost> | 2007-02-19 23:02:01 +0100 |
commit | ec2a18e931cdaa6c62a8843c29dc93c4a823a2cd (patch) | |
tree | fc5d5c1891c076091dd4e3734b2675db0c757de3 /source/Concept/Framework/defines.h | |
parent | 42a38959ff5c097463c2c95d993e5934f100d223 (diff) | |
download | rc2007-soccer-ec2a18e931cdaa6c62a8843c29dc93c4a823a2cd.tar rc2007-soccer-ec2a18e931cdaa6c62a8843c29dc93c4a823a2cd.zip |
+++ corrected svn cripplement
Diffstat (limited to 'source/Concept/Framework/defines.h')
-rw-r--r-- | source/Concept/Framework/defines.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/source/Concept/Framework/defines.h b/source/Concept/Framework/defines.h index 6a88917..8cf2d7a 100644 --- a/source/Concept/Framework/defines.h +++ b/source/Concept/Framework/defines.h @@ -58,16 +58,10 @@ //Constants
#define SPEED_PER_PWM 1
#define DISTANCE_PER_VALUE 1
-<<<<<<< .mine + #define PI 3.14159265358979323846f
#define CYCLES_PER_CORRECTION 200
#define EMPTY_FLOAT 81188.1484f
-======= -#define PI 3.14159265358979323846f
-#define CYCLES_PER_CORRECTION 200
->>>>>>> .r199 -
-#define EMPTY_FLOAT 81188.1484f
//IO Module Names
enum IOModuleNames
|