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/sfr04: Use uncrustify

Browse Source
This commit is contained in:
Gilles Diribarne 2020-11-22 23:00:39 +01:00
parent caa1ad822d
commit 5a5c8507d4
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/include/srf04.h
View File

@ -87,7 +87,7 @@ void srf04_trigger(const srf04_t *dev);
* @return SRF04_MEASURING if measurement is in progress
* @return SRF04_INVALID if no valid measurement is available
*/
int srf04_read(const srf04_t* dev);
int srf04_read(const srf04_t *dev);
/**
* @brief Convenience function triggers a measurement and returns distance
@ -100,7 +100,7 @@ int srf04_read(const srf04_t* dev);
* @return SRF04_MEASURING if measurement is in progress
* @return SRF04_INVALID if no valid measurement is available
*/
int srf04_get_distance(const srf04_t* dev);
int srf04_get_distance(const srf04_t *dev);
#ifdef __cplusplus
}

16
drivers/srf04/srf04.c
View File

@ -31,17 +31,19 @@ static void _cb(void *arg)
{
uint32_t t = xtimer_now_usec();
srf04_t* dev = (srf04_t*)arg;
srf04_t *dev = (srf04_t *)arg;
if (dev->distance > SRF04_ERR_MEASURING) {
dev->distance = SRF04_ERR_MEASURING;
dev->time = t;
} else {
}
else {
gpio_irq_disable(dev->p.echo);
dev->distance = (t - dev->time);
}
}
int srf04_init(srf04_t* dev, const srf04_params_t *params)
int srf04_init(srf04_t *dev, const srf04_params_t *params)
{
dev->p = *params;
@ -53,7 +55,7 @@ int srf04_init(srf04_t* dev, const srf04_params_t *params)
return SRF04_ERR_GPIO;
}
if (gpio_init_int(dev->p.echo, GPIO_IN, GPIO_BOTH, _cb, (void*)dev) != 0) {
if (gpio_init_int(dev->p.echo, GPIO_IN, GPIO_BOTH, _cb, (void *)dev) != 0) {
DEBUG("[srf04] Error: could not initialize GPIO echo pin\n");
return SRF04_ERR_GPIO;
}
@ -63,7 +65,7 @@ int srf04_init(srf04_t* dev, const srf04_params_t *params)
return SRF04_OK;
}
void srf04_trigger(const srf04_t* dev)
void srf04_trigger(const srf04_t *dev)
{
if (dev->distance == SRF04_ERR_MEASURING) {
return;
@ -76,12 +78,12 @@ void srf04_trigger(const srf04_t* dev)
gpio_clear(dev->p.trigger);
}
int srf04_read(const srf04_t* dev)
int srf04_read(const srf04_t *dev)
{
return dev->distance;
}
int srf04_get_distance(const srf04_t* dev)
int srf04_get_distance(const srf04_t *dev)
{
/* Trigger new reading */
srf04_trigger(dev);

3
tests/driver_srf04/main.c
View File

@ -39,7 +39,8 @@ int main(void)
int distance = srf04_get_distance(&dev);
if (distance < SRF04_OK) {
puts("Error: no valid data available");
} else {
}
else {
printf("D: %d mm\n", distance);
}
}