From ad47ec804ec98a7404567bd664d611f23378adf7 Mon Sep 17 00:00:00 2001
From: Richard Meadows <richardeoin@gmail.com>
Date: Sun, 28 Feb 2016 15:47:05 +0000
Subject: [PATCH] [barometer] add pre-processor guards for optional barometer

---
 firmware/inc/hw_config.h | 7 ++++---
 firmware/src/data.c      | 2 ++
 firmware/src/init.c      | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/firmware/inc/hw_config.h b/firmware/inc/hw_config.h
index 3eda091..062e640 100644
--- a/firmware/inc/hw_config.h
+++ b/firmware/inc/hw_config.h
@@ -133,9 +133,10 @@
 /**
  * Barometer
  */
-#define BAROMETER_TYPE_BMP180 0
-#define BAROMETER_TYPE_MS5607 1
-#define BAROMETER_TYPE_MS5611 0
+#define USE_BAROMETER		0
+#define BAROMETER_TYPE_BMP180	0
+#define BAROMETER_TYPE_MS5607	1
+#define BAROMETER_TYPE_MS5611	0
 
 /**
  * Battery ADC
diff --git a/firmware/src/data.c b/firmware/src/data.c
index b921f67..139dc99 100644
--- a/firmware/src/data.c
+++ b/firmware/src/data.c
@@ -101,9 +101,11 @@ struct tracker_datapoint* collect_data(void)
   /**
    * ---- Barometer ----
    */
+#if USE_BAROMETER
   struct barometer* b = get_barometer();
   datapoint.main_pressure = b->pressure;
   datapoint.bmp180_temperature = (float)b->temperature;
+#endif
 
 #ifdef GPS_TYPE_UBX
   /**
diff --git a/firmware/src/init.c b/firmware/src/init.c
index 036c610..652f4c7 100644
--- a/firmware/src/init.c
+++ b/firmware/src/init.c
@@ -133,8 +133,10 @@ void init(enum init_type init_t)
   /* i2c */
   i2c_bb_init();
 
+#if USE_BAROMETER
   /* barometer */
   barometer_init();
+#endif
 
   if (init_t != INIT_TESTCASE) {
     /* Telemetry init depends on gclk */