From 657564efa7907c34fa2e733e47379170189846c4 Mon Sep 17 00:00:00 2001
From: blckmn <blackman@xtra.com.au>
Date: Tue, 28 Jun 2016 19:47:00 +1000
Subject: [PATCH] Small tidy

---
 src/main/drivers/bus_i2c_stm32f30x.c | 8 ++++----
 src/main/sensors/compass.c           | 2 +-
 src/main/sensors/initialisation.c    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/drivers/bus_i2c_stm32f30x.c b/src/main/drivers/bus_i2c_stm32f30x.c
index adb424390..145731667 100644
--- a/src/main/drivers/bus_i2c_stm32f30x.c
+++ b/src/main/drivers/bus_i2c_stm32f30x.c
@@ -31,6 +31,9 @@
 
 #ifndef SOFT_I2C
 
+#define I2C_HIGHSPEED_TIMING  0x00500E30  // 1000 Khz, 72Mhz Clock, Analog Filter Delay ON, Setup 40, Hold 4.
+#define I2C_STANDARD_TIMING   0x00E0257A  // 400 Khz, 72Mhz Clock, Analog Filter Delay ON, Rise 100, Fall 10.
+
 #define I2C_SHORT_TIMEOUT   ((uint32_t)0x1000)
 #define I2C_LONG_TIMEOUT    ((uint32_t)(10 * I2C_SHORT_TIMEOUT))
 #define I2C_GPIO_AF         GPIO_AF_4 
@@ -93,10 +96,7 @@ void i2cInit(I2CDevice device)
         .I2C_OwnAddress1 = 0x00,
         .I2C_Ack = I2C_Ack_Enable,
         .I2C_AcknowledgedAddress = I2C_AcknowledgedAddress_7bit,
-        .I2C_Timing = i2c->overClock ?
-            0x00500E30 : // 1000 Khz, 72Mhz Clock, Analog Filter Delay ON, Setup 40, Hold 4.
-            0x00E0257A, // 400 Khz, 72Mhz Clock, Analog Filter Delay ON, Rise 100, Fall 10.
-        //.I2C_Timing              = 0x8000050B;
+        .I2C_Timing = (i2c->overClock ? I2C_HIGHSPEED_TIMING : I2C_STANDARD_TIMING)
     };
     
     I2C_Init(I2Cx, &i2cInit);
diff --git a/src/main/sensors/compass.c b/src/main/sensors/compass.c
index de075bfe2..cca2328c0 100644
--- a/src/main/sensors/compass.c
+++ b/src/main/sensors/compass.c
@@ -35,7 +35,7 @@
 #include "sensors/sensors.h"
 #include "sensors/compass.h"
 
-#ifdef NAZE
+#ifdef USE_HARDWARE_REVISION_DETECTION
 #include "hardware_revision.h"
 #endif
 
diff --git a/src/main/sensors/initialisation.c b/src/main/sensors/initialisation.c
index 2d96a0130..399ad7b84 100755
--- a/src/main/sensors/initialisation.c
+++ b/src/main/sensors/initialisation.c
@@ -499,11 +499,11 @@ static void detectMag(magSensor_e magHardwareToUse)
 #endif
 
 #ifdef MAG_INT_EXTI
-    static const hmc5883Config_t spRacingF3Hmc5883Config = {
+    static const hmc5883Config_t extiHmc5883Config = {
         .intTag = IO_TAG(MAG_INT_EXTI)
     };
 
-    hmc5883Config = &spRacingF3Hmc5883Config;
+	hmc5883Config = &extiHmc5883Config;
 #endif
 
 #endif