From 43279f18ba096e4eb01d04484d17b55b94b60c3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Fri, 29 May 2020 07:34:06 +0200 Subject: [PATCH] bmp388: fix variable shadowing warning --- src/drivers/barometer/bmp388/bmp388.cpp | 4 ++-- src/drivers/barometer/bmp388/bmp388.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/drivers/barometer/bmp388/bmp388.cpp b/src/drivers/barometer/bmp388/bmp388.cpp index e72a92027f..b9609f6462 100644 --- a/src/drivers/barometer/bmp388/bmp388.cpp +++ b/src/drivers/barometer/bmp388/bmp388.cpp @@ -264,7 +264,7 @@ BMP388::validate_trimming_param() } uint32_t -BMP388::get_measurement_time(uint8_t osr_t, uint8_t osr_p) +BMP388::get_measurement_time() { /* From BST-BMP388-DS001.pdf, page 25, table 21 @@ -325,7 +325,7 @@ BMP388::get_measurement_time(uint8_t osr_t, uint8_t osr_p) bool BMP388::set_sensor_settings() { - _measure_interval = get_measurement_time(osr_t, osr_p); + _measure_interval = get_measurement_time(); if (_measure_interval == 0) { PX4_WARN("unsupported oversampling selected"); diff --git a/src/drivers/barometer/bmp388/bmp388.h b/src/drivers/barometer/bmp388/bmp388.h index ac76b995db..a3004619fb 100644 --- a/src/drivers/barometer/bmp388/bmp388.h +++ b/src/drivers/barometer/bmp388/bmp388.h @@ -343,7 +343,7 @@ private: void start(); int measure(); int collect(); //get results and publish - uint32_t get_measurement_time(uint8_t osr_t, uint8_t osr_p); + uint32_t get_measurement_time(); bool soft_reset(); bool get_calib_data();