[barometer] add pre-processor guards for optional barometer

main-solar-only
Richard Meadows 2016-02-28 15:47:05 +00:00
rodzic a572cc9ab6
commit ad47ec804e
3 zmienionych plików z 8 dodań i 3 usunięć

Wyświetl plik

@ -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

Wyświetl plik

@ -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
/**

Wyświetl plik

@ -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 */