RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

drivers/sht3x: ztimer_msec port

Browse Source
This commit is contained in:
Gunar Schorcht 2022-03-10 07:26:42 +01:00
parent a0ec3a0e02
commit 0508850266
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/sht3x/Kconfig
View File

@ -11,7 +11,7 @@ config MODULE_SHT3X
depends on TEST_KCONFIG depends on TEST_KCONFIG
select MODULE_PERIPH_I2C select MODULE_PERIPH_I2C
select MODULE_CHECKSUM select MODULE_CHECKSUM
select MODULE_XTIMER select MODULE_ZTIMER_MSEC
config HAVE_SHT3X config HAVE_SHT3X
bool bool

2
drivers/sht3x/Makefile.dep
View File

@ -1,3 +1,3 @@
USEMODULE += xtimer USEMODULE += ztimer_msec
USEMODULE += checksum USEMODULE += checksum
FEATURES_REQUIRED += periph_i2c FEATURES_REQUIRED += periph_i2c

38
drivers/sht3x/sht3x.c
View File

@ -23,7 +23,7 @@
#include "checksum/crc8.h" #include "checksum/crc8.h"
#include "sht3x.h" #include "sht3x.h"
#include "xtimer.h" #include "ztimer.h"
#define ASSERT_PARAM(cond) \ #define ASSERT_PARAM(cond) \
do { \ do { \
@ -60,12 +60,12 @@
/* SHT3x measurement period times in us */ /* SHT3x measurement period times in us */
static const uint32_t SHT3X_MEASURE_PERIOD[] = { static const uint32_t SHT3X_MEASURE_PERIOD[] = {
0, /* [SINGLE_SHOT ] */ 0, /* [SINGLE_SHOT ] */
2000000, /* [PERIODIC_0_5] */ 2000, /* [PERIODIC_0_5] */
1000000, /* [PERIODIC_1 ] */ 1000, /* [PERIODIC_1 ] */
500000, /* [PERIODIC_2 ] */ 500, /* [PERIODIC_2 ] */
250000, /* [PERIODIC_4 ] */ 250, /* [PERIODIC_4 ] */
100000 /* [PERIODIC_10 ] */ 100 /* [PERIODIC_10 ] */
}; };
/* SHT3x measurement command sequences */ /* SHT3x measurement command sequences */
@ -84,9 +84,9 @@ static const uint16_t SHT3X_CMD_MEASURE[6][3] = {
#define SHT3X_MEAS_DURATION_REP_LOW 5 #define SHT3X_MEAS_DURATION_REP_LOW 5
/* measurement durations in us */ /* measurement durations in us */
const uint16_t SHT3X_MEAS_DURATION_US[3] = { SHT3X_MEAS_DURATION_REP_HIGH * 1000, const uint16_t SHT3X_MEAS_DURATION_MS[3] = { SHT3X_MEAS_DURATION_REP_HIGH,
SHT3X_MEAS_DURATION_REP_MEDIUM * 1000, SHT3X_MEAS_DURATION_REP_MEDIUM,
SHT3X_MEAS_DURATION_REP_LOW * 1000 }; SHT3X_MEAS_DURATION_REP_LOW };
/* functions for internal use */ /* functions for internal use */
static int _get_raw_data(sht3x_dev_t* dev, uint8_t* raw_data); static int _get_raw_data(sht3x_dev_t* dev, uint8_t* raw_data);
@ -180,7 +180,7 @@ static int _start_measurement (sht3x_dev_t* dev)
*/ */
if (dev->mode != SHT3X_SINGLE_SHOT) { if (dev->mode != SHT3X_SINGLE_SHOT) {
/* sensor needs up to 250 us to process the measurement command */ /* sensor needs up to 250 us to process the measurement command */
xtimer_usleep (1000); ztimer_sleep(ZTIMER_MSEC, 1);
uint16_t status; uint16_t status;
int res; int res;
@ -197,8 +197,8 @@ static int _start_measurement (sht3x_dev_t* dev)
} }
} }
dev->meas_start_time = xtimer_now_usec(); dev->meas_start_time = ztimer_now(ZTIMER_MSEC);
dev->meas_duration = SHT3X_MEAS_DURATION_US[dev->repeat]; dev->meas_duration = SHT3X_MEAS_DURATION_MS[dev->repeat];
dev->meas_started = true; dev->meas_started = true;
return SHT3X_OK; return SHT3X_OK;
@ -215,10 +215,10 @@ static int _get_raw_data(sht3x_dev_t* dev, uint8_t* raw_data)
} }
/* determine the time elapsed since the start of current measurement cycle */ /* determine the time elapsed since the start of current measurement cycle */
uint32_t elapsed = xtimer_now_usec() - dev->meas_start_time; uint32_t elapsed = ztimer_now(ZTIMER_MSEC) - dev->meas_start_time;
if (elapsed < dev->meas_duration) { if (elapsed < dev->meas_duration) {
/* if necessary, wait until the measurement results become available */ /* if necessary, wait until the measurement results become available */
xtimer_usleep(dev->meas_duration - elapsed); ztimer_sleep(ZTIMER_MSEC, dev->meas_duration - elapsed);
} }
/* send fetch command in any periodic mode (mode > 0) before read raw data */ /* send fetch command in any periodic mode (mode > 0) before read raw data */
@ -240,7 +240,7 @@ static int _get_raw_data(sht3x_dev_t* dev, uint8_t* raw_data)
} }
/* start next measurement cycle in periodic modes */ /* start next measurement cycle in periodic modes */
else { else {
dev->meas_start_time = xtimer_now_usec(); dev->meas_start_time = ztimer_now(ZTIMER_MSEC);
dev->meas_duration = SHT3X_MEASURE_PERIOD[dev->mode]; dev->meas_duration = SHT3X_MEASURE_PERIOD[dev->mode];
} }
@ -340,7 +340,7 @@ static int _reset (sht3x_dev_t* dev)
* in idle mode. We don't check I2C errors at this moment. * in idle mode. We don't check I2C errors at this moment.
*/ */
_send_command(dev, SHT3X_CMD_BREAK); _send_command(dev, SHT3X_CMD_BREAK);
xtimer_usleep (1000); ztimer_sleep(ZTIMER_MSEC, 1);
/* send the soft-reset command */ /* send the soft-reset command */
if (_send_command(dev, SHT3X_CMD_RESET) != SHT3X_OK) { if (_send_command(dev, SHT3X_CMD_RESET) != SHT3X_OK) {
@ -349,7 +349,7 @@ static int _reset (sht3x_dev_t* dev)
} }
/* wait for 2 ms, the time needed to restart (according to datasheet 0.5 ms) */ /* wait for 2 ms, the time needed to restart (according to datasheet 0.5 ms) */
xtimer_usleep (2000); ztimer_sleep(ZTIMER_MSEC, 2);
/* send reset command */ /* send reset command */
if (_send_command(dev, SHT3X_CMD_CLEAR_STATUS) != SHT3X_OK) { if (_send_command(dev, SHT3X_CMD_CLEAR_STATUS) != SHT3X_OK) {
@ -358,7 +358,7 @@ static int _reset (sht3x_dev_t* dev)
} }
/* sensor needs some time to process the command */ /* sensor needs some time to process the command */
xtimer_usleep (500); ztimer_sleep(ZTIMER_MSEC, 1);
uint16_t status; uint16_t status;
int res = SHT3X_OK; int res = SHT3X_OK;