diff --git a/Libraries/aprs/aprs.c b/Libraries/aprs/aprs.c --- a/Libraries/aprs/aprs.c +++ b/Libraries/aprs/aprs.c @@ -24,8 +24,11 @@ #include #include "config.h" -//#include "pressure.h" -#include "bme280.h" +#ifdef LPS25H + #include "lps25h.h" +#else + #include "bme280.h" +#endif #include "aprs.h" #include "gps.h" //#include "gps.h" @@ -80,8 +83,10 @@ void aprs_send(void) snprintf(tmpBuffer, 128, "%d,", gps_getdata()->altitude); ax25_send_string(tmpBuffer); + +#ifdef LPS25H // Pressure - snprintf(tmpBuffer, 128, "%d,", bme280_get_pressure()); + snprintf(tmpBuffer, 128, "%d,", lps25h_get_pressure()); ax25_send_string(tmpBuffer); // Temperature @@ -89,8 +94,22 @@ void aprs_send(void) ax25_send_string(tmpBuffer); // Humidity + snprintf(tmpBuffer, 128, "0,"); + ax25_send_string(tmpBuffer); + +#else + // Pressure + snprintf(tmpBuffer, 128, "%d,", bme280_get_pressure()); + ax25_send_string(tmpBuffer); + + // Temperature + snprintf(tmpBuffer, 128, "%d,", bme280_get_temperature()); + ax25_send_string(tmpBuffer); + + // Humidity snprintf(tmpBuffer, 128, "%d,", bme280_get_humidity()); ax25_send_string(tmpBuffer); +#endif // HDOP snprintf(tmpBuffer, 128, "%u,", gps_getdata()->pdop);