1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-25 06:23:53 +01:00

Merge pull request #13048 from maribu/adc-int32_t

periph/adc: Change return type of `adc_sample()` to `int32_t`
This commit is contained in:
Francisco 2020-01-13 12:56:09 +01:00 committed by GitHub
commit 1977423e9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 20 additions and 19 deletions

View File

@ -99,7 +99,7 @@ int adc_init(adc_t line)
return 0;
}
int adc_sample(adc_t line, adc_res_t res)
int32_t adc_sample(adc_t line, adc_res_t res)
{
int sample = 0;

View File

@ -51,7 +51,7 @@ int adc_init(adc_t line)
return 0;
}
int adc_sample(adc_t line, adc_res_t res)
int32_t adc_sample(adc_t line, adc_res_t res)
{
/* check if adc line valid */
if (line >= ADC_NUMOF) {

View File

@ -59,7 +59,7 @@ int adc_init(adc_t line)
return 0;
}
int adc_sample(adc_t line, adc_res_t res)
int32_t adc_sample(adc_t line, adc_res_t res)
{
/* resolutions larger than 12 bits are not supported */
if (res >= ADC_MODE_UNDEF(0)) {

View File

@ -149,7 +149,7 @@ int adc_init(adc_t line)
}
int adc_sample(adc_t line, adc_res_t res)
int32_t adc_sample(adc_t line, adc_res_t res)
{
CHECK_PARAM_RET (line < ADC_NUMOF, -1)
CHECK_PARAM_RET (res <= ADC_RES_12BIT, -1)

View File

@ -42,7 +42,7 @@ int adc_init(adc_t line)
}
int adc_sample(adc_t line, adc_res_t res)
int32_t adc_sample(adc_t line, adc_res_t res)
{
CHECK_PARAM_RET (line < ADC_NUMOF, -1)
CHECK_PARAM_RET (res == ADC_RES_10BIT, -1)

View File

@ -207,7 +207,7 @@ int adc_init(adc_t line)
return res;
}
int adc_sample(adc_t line, adc_res_t res)
int32_t adc_sample(adc_t line, adc_res_t res)
{
int sample;

View File

@ -100,7 +100,7 @@ int adc_init(adc_t line)
return 0;
}
int adc_sample(adc_t line, adc_res_t res)
int32_t adc_sample(adc_t line, adc_res_t res)
{
int value[2];

View File

@ -55,7 +55,7 @@ int adc_init(adc_t line)
return 0;
}
int adc_sample(adc_t line, adc_res_t res)
int32_t adc_sample(adc_t line, adc_res_t res)
{
int val;

View File

@ -103,7 +103,7 @@ int adc_init(adc_t line)
return 0;
}
int adc_sample(adc_t line, adc_res_t res)
int32_t adc_sample(adc_t line, adc_res_t res)
{
assert(line < ADC_NUMOF);

View File

@ -164,7 +164,7 @@ int adc_init(adc_t line)
return 0;
}
int adc_sample(adc_t line, adc_res_t res)
int32_t adc_sample(adc_t line, adc_res_t res)
{
if (line >= ADC_NUMOF) {
DEBUG("adc: line arg not applicable\n");

View File

@ -68,7 +68,7 @@ int adc_init(adc_t line)
return 0;
}
int adc_sample(adc_t line, adc_res_t res)
int32_t adc_sample(adc_t line, adc_res_t res)
{
assert(line < ADC_NUMOF);

View File

@ -75,7 +75,7 @@ int adc_init(adc_t line)
return 0;
}
int adc_sample(adc_t line, adc_res_t res)
int32_t adc_sample(adc_t line, adc_res_t res)
{
int sample;

View File

@ -125,7 +125,7 @@ int adc_init(adc_t line)
return 0;
}
int adc_sample(adc_t line, adc_res_t res)
int32_t adc_sample(adc_t line, adc_res_t res)
{
int sample;

View File

@ -111,7 +111,7 @@ int adc_init(adc_t line)
return 0;
}
int adc_sample(adc_t line, adc_res_t res)
int32_t adc_sample(adc_t line, adc_res_t res)
{
int sample;

View File

@ -94,7 +94,7 @@ int adc_init(adc_t line)
return 0;
}
int adc_sample(adc_t line, adc_res_t res)
int32_t adc_sample(adc_t line, adc_res_t res)
{
int sample;

View File

@ -123,7 +123,7 @@ int adc_init(adc_t line)
return 0;
}
int adc_sample(adc_t line, adc_res_t res)
int32_t adc_sample(adc_t line, adc_res_t res)
{
int sample;

View File

@ -152,7 +152,7 @@ int adc_init(adc_t line)
return 0;
}
int adc_sample(adc_t line, adc_res_t res)
int32_t adc_sample(adc_t line, adc_res_t res)
{
int sample;

View File

@ -179,7 +179,7 @@ int adc_init(adc_t line)
return 0;
}
int adc_sample(adc_t line, adc_res_t res)
int32_t adc_sample(adc_t line, adc_res_t res)
{
int sample;

View File

@ -56,6 +56,7 @@
#define PERIPH_ADC_H
#include <limits.h>
#include <stdint.h>
#include "periph_cpu.h"
#include "periph_conf.h"
@ -125,7 +126,7 @@ int adc_init(adc_t line);
* @return the sampled value on success
* @return -1 if resolution is not applicable
*/
int adc_sample(adc_t line, adc_res_t res);
int32_t adc_sample(adc_t line, adc_res_t res);
#ifdef __cplusplus
}