From c21b4aaf2e4301ff83c222d61e4e1dedb1a320c8 Mon Sep 17 00:00:00 2001 From: Paul Riseborough Date: Mon, 9 Jan 2017 13:26:34 +0100 Subject: [PATCH] posix drivers: Populate baro device ID TODO - use unique HW ID --- src/platforms/posix/drivers/barosim/baro.cpp | 3 +++ .../posix/drivers/df_bmp280_wrapper/df_bmp280_wrapper.cpp | 4 +++- .../posix/drivers/df_ms5607_wrapper/df_ms5607_wrapper.cpp | 3 +++ .../posix/drivers/df_ms5611_wrapper/df_ms5611_wrapper.cpp | 3 +++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/platforms/posix/drivers/barosim/baro.cpp b/src/platforms/posix/drivers/barosim/baro.cpp index 248a20fef8..ce7ac03f93 100644 --- a/src/platforms/posix/drivers/barosim/baro.cpp +++ b/src/platforms/posix/drivers/barosim/baro.cpp @@ -680,6 +680,9 @@ BAROSIM::collect() report.altitude = raw_baro.altitude; report.temperature = raw_baro.temperature; + /* TODO get device ID for sensor */ + report.device_id = 0; + /* publish it */ if (!(m_pub_blocked)) { if (_baro_topic != nullptr) { diff --git a/src/platforms/posix/drivers/df_bmp280_wrapper/df_bmp280_wrapper.cpp b/src/platforms/posix/drivers/df_bmp280_wrapper/df_bmp280_wrapper.cpp index b773a225a2..dc6560efc2 100644 --- a/src/platforms/posix/drivers/df_bmp280_wrapper/df_bmp280_wrapper.cpp +++ b/src/platforms/posix/drivers/df_bmp280_wrapper/df_bmp280_wrapper.cpp @@ -155,9 +155,11 @@ int DfBmp280Wrapper::_publish(struct baro_sensor_data &data) baro_report.pressure = data.pressure_pa; baro_report.temperature = data.temperature_c; - // TODO: verify this, it's just copied from the MS5611 driver. + /* TODO get device ID for sensor */ + baro_report.device_id = 0; + // Constant for now const double MSL_PRESSURE_KPA = 101325.0 / 1000.0; diff --git a/src/platforms/posix/drivers/df_ms5607_wrapper/df_ms5607_wrapper.cpp b/src/platforms/posix/drivers/df_ms5607_wrapper/df_ms5607_wrapper.cpp index ec59f23a3d..d5af3054e5 100644 --- a/src/platforms/posix/drivers/df_ms5607_wrapper/df_ms5607_wrapper.cpp +++ b/src/platforms/posix/drivers/df_ms5607_wrapper/df_ms5607_wrapper.cpp @@ -156,6 +156,9 @@ int DfMS5607Wrapper::_publish(struct baro_sensor_data &data) // TODO: verify this, it's just copied from the MS5611 driver. + /* TODO get device ID for sensor */ + baro_report.device_id = 0; + // Constant for now const double MSL_PRESSURE_KPA = 101325.0 / 1000.0; diff --git a/src/platforms/posix/drivers/df_ms5611_wrapper/df_ms5611_wrapper.cpp b/src/platforms/posix/drivers/df_ms5611_wrapper/df_ms5611_wrapper.cpp index d10b7a8349..bda551f928 100644 --- a/src/platforms/posix/drivers/df_ms5611_wrapper/df_ms5611_wrapper.cpp +++ b/src/platforms/posix/drivers/df_ms5611_wrapper/df_ms5611_wrapper.cpp @@ -156,6 +156,9 @@ int DfMS5611Wrapper::_publish(struct baro_sensor_data &data) // TODO: verify this, it's just copied from the MS5611 driver. + /* TODO get device ID for sensor */ + baro_report.device_id = 0; + // Constant for now const double MSL_PRESSURE_KPA = 101325.0 / 1000.0;