mirror of https://github.com/ARMmbed/mbed-os.git
Merge pull request #465 from bcostm/master
[NUCLEOs] Fix bug (normalization to 16bit) in adc read_u16()pull/431/merge
commit
74958e0f72
|
@ -169,7 +169,10 @@ static inline uint16_t adc_read(analogin_t *obj) {
|
|||
}
|
||||
|
||||
uint16_t analogin_read_u16(analogin_t *obj) {
|
||||
return (adc_read(obj));
|
||||
uint16_t value = adc_read(obj);
|
||||
// 12-bit to 16-bit conversion
|
||||
value = ((value << 4) & (uint16_t)0xFFF0) | ((value >> 8) & (uint16_t)0x000F);
|
||||
return value;
|
||||
}
|
||||
|
||||
float analogin_read(analogin_t *obj) {
|
||||
|
|
|
@ -176,7 +176,10 @@ static inline uint16_t adc_read(analogin_t *obj) {
|
|||
}
|
||||
|
||||
uint16_t analogin_read_u16(analogin_t *obj) {
|
||||
return (adc_read(obj));
|
||||
uint16_t value = adc_read(obj);
|
||||
// 12-bit to 16-bit conversion
|
||||
value = ((value << 4) & (uint16_t)0xFFF0) | ((value >> 8) & (uint16_t)0x000F);
|
||||
return value;
|
||||
}
|
||||
|
||||
float analogin_read(analogin_t *obj) {
|
||||
|
|
|
@ -171,7 +171,10 @@ static inline uint16_t adc_read(analogin_t *obj) {
|
|||
}
|
||||
|
||||
uint16_t analogin_read_u16(analogin_t *obj) {
|
||||
return (adc_read(obj));
|
||||
uint16_t value = adc_read(obj);
|
||||
// 12-bit to 16-bit conversion
|
||||
value = ((value << 4) & (uint16_t)0xFFF0) | ((value >> 8) & (uint16_t)0x000F);
|
||||
return value;
|
||||
}
|
||||
|
||||
float analogin_read(analogin_t *obj) {
|
||||
|
|
|
@ -180,7 +180,10 @@ static inline uint16_t adc_read(analogin_t *obj) {
|
|||
}
|
||||
|
||||
uint16_t analogin_read_u16(analogin_t *obj) {
|
||||
return (adc_read(obj));
|
||||
uint16_t value = adc_read(obj);
|
||||
// 12-bit to 16-bit conversion
|
||||
value = ((value << 4) & (uint16_t)0xFFF0) | ((value >> 8) & (uint16_t)0x000F);
|
||||
return value;
|
||||
}
|
||||
|
||||
float analogin_read(analogin_t *obj) {
|
||||
|
|
|
@ -198,7 +198,10 @@ static inline uint16_t adc_read(analogin_t *obj)
|
|||
|
||||
uint16_t analogin_read_u16(analogin_t *obj)
|
||||
{
|
||||
return (adc_read(obj));
|
||||
uint16_t value = adc_read(obj);
|
||||
// 12-bit to 16-bit conversion
|
||||
value = ((value << 4) & (uint16_t)0xFFF0) | ((value >> 8) & (uint16_t)0x000F);
|
||||
return value;
|
||||
}
|
||||
|
||||
float analogin_read(analogin_t *obj)
|
||||
|
|
|
@ -170,7 +170,10 @@ static inline uint16_t adc_read(analogin_t *obj) {
|
|||
}
|
||||
|
||||
uint16_t analogin_read_u16(analogin_t *obj) {
|
||||
return (adc_read(obj));
|
||||
uint16_t value = adc_read(obj);
|
||||
// 12-bit to 16-bit conversion
|
||||
value = ((value << 4) & (uint16_t)0xFFF0) | ((value >> 8) & (uint16_t)0x000F);
|
||||
return value;
|
||||
}
|
||||
|
||||
float analogin_read(analogin_t *obj) {
|
||||
|
|
|
@ -173,7 +173,10 @@ static inline uint16_t adc_read(analogin_t *obj)
|
|||
|
||||
uint16_t analogin_read_u16(analogin_t *obj)
|
||||
{
|
||||
return (adc_read(obj));
|
||||
uint16_t value = adc_read(obj);
|
||||
// 12-bit to 16-bit conversion
|
||||
value = ((value << 4) & (uint16_t)0xFFF0) | ((value >> 8) & (uint16_t)0x000F);
|
||||
return value;
|
||||
}
|
||||
|
||||
float analogin_read(analogin_t *obj)
|
||||
|
|
|
@ -177,7 +177,10 @@ static inline uint16_t adc_read(analogin_t *obj) {
|
|||
}
|
||||
|
||||
uint16_t analogin_read_u16(analogin_t *obj) {
|
||||
return (adc_read(obj));
|
||||
uint16_t value = adc_read(obj);
|
||||
// 12-bit to 16-bit conversion
|
||||
value = ((value << 4) & (uint16_t)0xFFF0) | ((value >> 8) & (uint16_t)0x000F);
|
||||
return value;
|
||||
}
|
||||
|
||||
float analogin_read(analogin_t *obj) {
|
||||
|
|
|
@ -180,7 +180,10 @@ static inline uint16_t adc_read(analogin_t *obj) {
|
|||
}
|
||||
|
||||
uint16_t analogin_read_u16(analogin_t *obj) {
|
||||
return (adc_read(obj));
|
||||
uint16_t value = adc_read(obj);
|
||||
// 12-bit to 16-bit conversion
|
||||
value = ((value << 4) & (uint16_t)0xFFF0) | ((value >> 8) & (uint16_t)0x000F);
|
||||
return value;
|
||||
}
|
||||
|
||||
float analogin_read(analogin_t *obj) {
|
||||
|
|
Loading…
Reference in New Issue