Skip to content

Commit 503088e

Browse files
committed
hide warnings about incompatible types
1 parent 3c933f9 commit 503088e

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/components/i2c/WipperSnapper_I2C.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,7 +1177,7 @@ void WipperSnapper_Component_I2C::update() {
11771177
&WipperSnapper_I2C_Driver::getSensorRawPeriodPrv,
11781178
&WipperSnapper_I2C_Driver::setSensorRawPeriodPrv,
11791179
wippersnapper_i2c_v1_SensorType_SENSOR_TYPE_RAW,
1180-
"Raw", "", event, &sensors_event_t::data, sensorsReturningFalse, retries);
1180+
"Raw", "", event, nullptr, sensorsReturningFalse, retries);
11811181

11821182
// Gas sensor
11831183
sensorEventRead(iter, curTime, &msgi2cResponse,
@@ -1213,7 +1213,7 @@ void WipperSnapper_Component_I2C::update() {
12131213
&WipperSnapper_I2C_Driver::SensorProximityPeriodPrv,
12141214
&WipperSnapper_I2C_Driver::setSensorProximityPeriodPrv,
12151215
wippersnapper_i2c_v1_SensorType_SENSOR_TYPE_PROXIMITY,
1216-
"Proximity", "", event, &sensors_event_t::distance, sensorsReturningFalse, retries);
1216+
"Proximity", "", event, nullptr, sensorsReturningFalse, retries);
12171217

12181218

12191219
// Did this driver obtain data from sensors?
@@ -1244,7 +1244,7 @@ void WipperSnapper_Component_I2C::sensorEventRead(
12441244
void (WipperSnapper_I2C_Driver::*setPeriodPrvFunc)(long),
12451245
wippersnapper_i2c_v1_SensorType sensorType,
12461246
const char* sensorName, const char* unit, sensors_event_t event,
1247-
auto sensors_event_t::*valueMember, bool &sensorsReturningFalse, int &retries) {
1247+
float sensors_event_t::*valueMember, bool &sensorsReturningFalse, int &retries) {
12481248
// sensorName is a prefix and error message, units is a suffix when logging value
12491249
curTime = millis();
12501250
if (((*iter)->*getPeriodFunc)() != 0L &&
@@ -1256,7 +1256,7 @@ void WipperSnapper_Component_I2C::sensorEventRead(
12561256
sensorType == wippersnapper_i2c_v1_SensorType_SENSOR_TYPE_PROXIMITY) {
12571257
value = event.data[0];
12581258
} else {
1259-
value = (float)event.*valueMember;
1259+
value = event.*valueMember;
12601260
}
12611261
WS_DEBUG_PRINT("Sensor 0x");
12621262
WS_DEBUG_PRINTHEX((*iter)->getI2CAddress());

src/components/i2c/WipperSnapper_I2C.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class WipperSnapper_Component_I2C {
107107
void (WipperSnapper_I2C_Driver::*setPeriodPrvFunc)(long),
108108
wippersnapper_i2c_v1_SensorType sensorType, const char *sensorName,
109109
const char *unit, sensors_event_t event,
110-
auto sensors_event_t::*valueMember, bool &sensorsReturningFalse,
110+
float sensors_event_t::*valueMember, bool &sensorsReturningFalse,
111111
int &retries);
112112

113113
void fillEventMessage(wippersnapper_signal_v1_I2CResponse *msgi2cResponse,

0 commit comments

Comments
 (0)