Skip to content

Commit cdb4d02

Browse files
committed
Swap Previous Period helper functions to ulong
1 parent 736d1ba commit cdb4d02

File tree

5 files changed

+51
-58
lines changed

5 files changed

+51
-58
lines changed

platformio.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@ extra_scripts = pre:rename_usb_config.py
275275
[env:adafruit_metro_esp32s3_debug]
276276
extends = common:esp32
277277
board = adafruit_metro_esp32s3
278+
build_type = debug
278279
build_flags = -DARDUINO_METRO_ESP32S3 -DBOARD_HAS_PSRAM -DCFG_TUSB_DEBUG=1 -DDEBUG=1 -DESP_LOG_LEVEL=ESP_LOG_VERBOSE -DARDUINO_CORE_DEBUG_LEVEL=5 -DCORE_DEBUG_LEVEL=5 -DARDUHAL_LOG_LEVEL=5 -DARDUINO_USB_CDC_ON_BOOT=1
279280
;set partition to tinyuf2-partitions-16MB.csv as of idf 5.1
280281
board_build.partitions = tinyuf2-partitions-16MB.csv

src/components/i2c/WipperSnapper_I2C.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1328,16 +1328,16 @@ void WipperSnapper_Component_I2C::sensorEventRead(
13281328
unsigned long curTime, wippersnapper_signal_v1_I2CResponse *msgi2cResponse,
13291329
bool (WipperSnapper_I2C_Driver::*getEventFunc)(sensors_event_t *),
13301330
long (WipperSnapper_I2C_Driver::*getPeriodFunc)(),
1331-
long (WipperSnapper_I2C_Driver::*getPeriodPrvFunc)(),
1332-
void (WipperSnapper_I2C_Driver::*setPeriodPrvFunc)(long),
1331+
ulong (WipperSnapper_I2C_Driver::*getPeriodPrvFunc)(),
1332+
void (WipperSnapper_I2C_Driver::*setPeriodPrvFunc)(ulong),
13331333
wippersnapper_i2c_v1_SensorType sensorType, const char *sensorName,
13341334
const char *unit, sensors_event_t event,
13351335
float sensors_event_t::*valueMember, bool &sensorsReturningFalse,
13361336
int &retries) {
13371337
// sensorName used for prefix + error message, units is value suffix
13381338
curTime = millis();
13391339
if (((*iter)->*getPeriodFunc)() != 0L &&
1340-
curTime - ((*iter)->*getPeriodPrvFunc)() > ((*iter)->*getPeriodFunc)()) {
1340+
curTime - ((*iter)->*getPeriodPrvFunc)() > (ulong)((*iter)->*getPeriodFunc)()) {
13411341
// within the period, read the sensor
13421342
if (((*iter)->*getEventFunc)(&event)) {
13431343
float value;

src/components/i2c/WipperSnapper_I2C.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ class WipperSnapper_Component_I2C {
106106
wippersnapper_signal_v1_I2CResponse *msgi2cResponse,
107107
bool (WipperSnapper_I2C_Driver::*getEventFunc)(sensors_event_t *),
108108
long (WipperSnapper_I2C_Driver::*getPeriodFunc)(),
109-
long (WipperSnapper_I2C_Driver::*getPeriodPrvFunc)(),
110-
void (WipperSnapper_I2C_Driver::*setPeriodPrvFunc)(long),
109+
ulong (WipperSnapper_I2C_Driver::*getPeriodPrvFunc)(),
110+
void (WipperSnapper_I2C_Driver::*setPeriodPrvFunc)(ulong),
111111
wippersnapper_i2c_v1_SensorType sensorType, const char *sensorName,
112112
const char *unit, sensors_event_t event,
113113
float sensors_event_t::*valueMember, bool &sensorsReturningFalse,

0 commit comments

Comments
 (0)