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

Merge pull request #17102 from aabadie/pr/drivers/ads101x_ztimer

Browse Source 
drivers/ads101x: migrate to ztimer
This commit is contained in:
Francisco 2021-11-15 09:56:14 +01:00 committed by GitHub
commit 6dbf1c3013
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/ads101x/Kconfig
View File

@ -14,7 +14,8 @@ config MODULE_ADS101X
select MODULE_PERIPH_GPIO
select MODULE_PERIPH_GPIO_IRQ
select MODULE_PERIPH_I2C
select MODULE_XTIMER
select MODULE_ZTIMER
select MODULE_ZTIMER_MSEC
help
This driver works with the ads1013, ads1014, ads1015, ads1113, ads1114
and ads1115 models.

3
drivers/ads101x/Makefile.dep
View File

@ -1,3 +1,4 @@
FEATURES_REQUIRED += periph_gpio_irq
FEATURES_REQUIRED += periph_i2c
USEMODULE += xtimer
USEMODULE += ztimer
USEMODULE += ztimer_msec

8
drivers/ads101x/ads101x.c
View File

@ -22,7 +22,7 @@
#include "assert.h"
#include "periph/i2c.h"
#include "periph/gpio.h"
#include "xtimer.h"
#include "ztimer.h"
#include "ads101x.h"
#include "ads101x_params.h"
@ -31,8 +31,8 @@
#define ENABLE_DEBUG 0
#include "debug.h"
#ifndef ADS101X_READ_DELAY
#define ADS101X_READ_DELAY (8 * US_PER_MS) /* Compatible with 128SPS */
#ifndef ADS101X_READ_DELAY_MS
#define ADS101X_READ_DELAY_MS 8 /* ompatible with 128SPS */
#endif
#define DEV (dev->params.i2c)
@ -138,7 +138,7 @@ int ads101x_read_raw(const ads101x_t *dev, int16_t *raw)
i2c_write_regs(DEV, ADDR, ADS101X_CONF_ADDR, &regs, 2, 0x0);
/* Wait for the sample to be acquired */
xtimer_usleep(ADS101X_READ_DELAY);
ztimer_sleep(ZTIMER_MSEC, ADS101X_READ_DELAY_MS);
/* Read the sample */
if (i2c_read_regs(DEV, ADDR, ADS101X_CONV_RES_ADDR, &regs, 2, 0x0) < 0) {

2
tests/driver_ads101x/Makefile
View File

@ -1,5 +1,7 @@
include ../Makefile.tests_common
USEMODULE += ads101x
USEMODULE += ztimer
USEMODULE += ztimer_msec
include $(RIOTBASE)/Makefile.include

3
tests/driver_ads101x/Makefile.ci Normal file
View File

@ -0,0 +1,3 @@
BOARD_INSUFFICIENT_MEMORY := \
nucleo-l011k4 \
#

2
tests/driver_ads101x/app.config.test
View File

@ -1,3 +1,5 @@
# this file enables modules defined in Kconfig. Do not use this file for
# application configuration. This is only needed during migration.
CONFIG_MODULE_ADS101X=y
CONFIG_MODULE_ZTIMER=y
CONFIG_MODULE_ZTIMER_MSEC=y

7
tests/driver_ads101x/main.c
View File

@ -21,13 +21,12 @@
#include <stdio.h>
#include "xtimer.h"
#include "timex.h"
#include "ztimer.h"
#include "ads101x.h"
#include "ads101x_params.h"
#include "ads101x_regs.h"
#define SLEEP_USEC (100 * US_PER_MS)
#define SLEEP_MSEC 100
static ads101x_t dev;
static ads101x_alert_t alert_dev;
@ -117,7 +116,7 @@ int main(void)
puts("");
xtimer_usleep(SLEEP_USEC);
ztimer_sleep(ZTIMER_MSEC, SLEEP_MSEC);
}
return 0;