diff options
| author | sicarius <devnull@localhost> | 2007-02-19 21:57:03 +0100 |
|---|---|---|
| committer | sicarius <devnull@localhost> | 2007-02-19 21:57:03 +0100 |
| commit | 42a38959ff5c097463c2c95d993e5934f100d223 (patch) | |
| tree | 7ad00518e3fdd85a800f5c8bf48588e7f5e1a23a /source/Concept/Framework/defines.h | |
| parent | b3196682b1d87c40156ed1b4092a7112dd0d80df (diff) | |
| download | rc2007-soccer-42a38959ff5c097463c2c95d993e5934f100d223.tar rc2007-soccer-42a38959ff5c097463c2c95d993e5934f100d223.zip | |
Code-stuff
Diffstat (limited to 'source/Concept/Framework/defines.h')
| -rw-r--r-- | source/Concept/Framework/defines.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/Concept/Framework/defines.h b/source/Concept/Framework/defines.h index 1cec0f3..6a88917 100644 --- a/source/Concept/Framework/defines.h +++ b/source/Concept/Framework/defines.h @@ -58,8 +58,14 @@ //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
|