From 42a38959ff5c097463c2c95d993e5934f100d223 Mon Sep 17 00:00:00 2001 From: sicarius Date: Mon, 19 Feb 2007 20:57:03 +0000 Subject: Code-stuff --- source/Concept/Framework/defines.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source/Concept/Framework/defines.h') 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 -- cgit v1.2.3