ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cleared data structures in analogin_init(); 

Set buffer for 1 sample in analogin_read_u16. Before it assumes the
buffer is set outside by the higher layer. Now it's temporarily
located on the stack since only the ADC value is returned.
pull/5703/head
Dave Wu 2017-12-13 16:04:33 +11:00
parent 9ebefcd63d
commit fc481049f8
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/api/analogin_api.c
View File

@ -47,7 +47,6 @@
#include "pinmap.h" #include "pinmap.h"
#include "PeripheralPins.h" #include "PeripheralPins.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@ -80,7 +79,10 @@ void analogin_init(analogin_t *obj, PinName pin)
ADCName peripheral; ADCName peripheral;
uint32_t function, channel; uint32_t function, channel;
peripheral = (ADCName)pinmap_peripheral(pin, &PinMap_ADC[0]); // gives peripheral memset(obj, 0, sizeof(analogin_t) );
memset( DeviceMemory, 0, sizeof( DeviceMemory ) );
peripheral = (ADCName)pinmap_peripheral(pin, &PinMap_ADC[0]); // gives peripheral
MBED_ASSERT(peripheral != (ADCName)NC); MBED_ASSERT(peripheral != (ADCName)NC);
/* verify read function */ /* verify read function */
@ -142,6 +144,7 @@ void analogin_init(analogin_t *obj, PinName pin)
/* Set the acquisition time. (Application need to change it based on the impedence) */ /* Set the acquisition time. (Application need to change it based on the impedence) */
adi_adc_SetAcquisitionTime(hDevice, obj->SampleCycles); adi_adc_SetAcquisitionTime(hDevice, obj->SampleCycles);
} }
/** Read the input voltage, represented as a float in the range [0.0, 1.0] /** Read the input voltage, represented as a float in the range [0.0, 1.0]
@ -165,6 +168,11 @@ uint16_t analogin_read_u16(analogin_t *obj)
{ {
ADI_ADC_HANDLE hDevice = obj->hDevice; ADI_ADC_HANDLE hDevice = obj->hDevice;
ADI_ADC_BUFFER *pAdcBuffer; ADI_ADC_BUFFER *pAdcBuffer;
uint32_t ADCsample;
obj->UserBuffer.pDataBuffer = &ADCsample;
obj->UserBuffer.nNumConversionPasses = 1;
obj->UserBuffer.nBuffSize = 1;
/* Submit the buffer to the driver */ /* Submit the buffer to the driver */
adi_adc_SubmitBuffer(hDevice, &obj->UserBuffer); adi_adc_SubmitBuffer(hDevice, &obj->UserBuffer);
@ -178,8 +186,9 @@ uint16_t analogin_read_u16(analogin_t *obj)
return( (uint16_t)( ((uint16_t *)pAdcBuffer->pDataBuffer)[(pAdcBuffer->nNumConversionPasses) - 1]) ); return( (uint16_t)( ((uint16_t *)pAdcBuffer->pDataBuffer)[(pAdcBuffer->nNumConversionPasses) - 1]) );
} }
/* Retrieve te active channel correspondoing to the input pin */ /* Retrieve the active channel corresponding to the input pin */
static uint32_t adi_pin2channel(PinName pin) { static uint32_t adi_pin2channel(PinName pin)
{
uint32_t activech; uint32_t activech;

12
targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/api/analogin_api.c
View File

@ -79,7 +79,10 @@ void analogin_init(analogin_t *obj, PinName pin)
ADCName peripheral; ADCName peripheral;
uint32_t function, channel; uint32_t function, channel;
peripheral = (ADCName)pinmap_peripheral(pin, &PinMap_ADC[0]); // gives peripheral memset(obj, 0, sizeof(analogin_t) );
memset( DeviceMemory, 0, sizeof( DeviceMemory ) );
peripheral = (ADCName)pinmap_peripheral(pin, &PinMap_ADC[0]); // gives peripheral
MBED_ASSERT(peripheral != (ADCName)NC); MBED_ASSERT(peripheral != (ADCName)NC);
/* verify read function */ /* verify read function */
@ -165,6 +168,11 @@ uint16_t analogin_read_u16(analogin_t *obj)
{ {
ADI_ADC_HANDLE hDevice = obj->hDevice; ADI_ADC_HANDLE hDevice = obj->hDevice;
ADI_ADC_BUFFER *pAdcBuffer; ADI_ADC_BUFFER *pAdcBuffer;
uint32_t ADCsample;
obj->UserBuffer.pDataBuffer = &ADCsample;
obj->UserBuffer.nNumConversionPasses = 1;
obj->UserBuffer.nBuffSize = 1;
/* Submit the buffer to the driver */ /* Submit the buffer to the driver */
adi_adc_SubmitBuffer(hDevice, &obj->UserBuffer); adi_adc_SubmitBuffer(hDevice, &obj->UserBuffer);
@ -178,7 +186,7 @@ uint16_t analogin_read_u16(analogin_t *obj)
return( (uint16_t)( ((uint16_t *)pAdcBuffer->pDataBuffer)[(pAdcBuffer->nNumConversionPasses) - 1]) ); return( (uint16_t)( ((uint16_t *)pAdcBuffer->pDataBuffer)[(pAdcBuffer->nNumConversionPasses) - 1]) );
} }
/* Retrieve te active channel correspondoing to the input pin */ /* Retrieve the active channel corresponding to the input pin */
static uint32_t adi_pin2channel(PinName pin) static uint32_t adi_pin2channel(PinName pin)
{ {