djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7879 from milindmovasha/espressif_analogbufio_fix

Browse Source 
Bug fixes for analogbufio espressif implementation
This commit is contained in:
Dan Halbert 2023-04-19 13:17:59 -04:00 committed by GitHub
commit e105bf1690
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ports/espressif/common-hal/analogbufio/BufferedIn.c
View File

@ -46,8 +46,9 @@
#define NUM_SAMPLES_PER_INTERRUPT 256 #define NUM_SAMPLES_PER_INTERRUPT 256
#define NUM_ADC_CHANNELS 1 #define NUM_ADC_CHANNELS 1
#define DMA_BUFFER_SIZE 1024 #define DMA_BUFFER_SIZE 1024
#define ATTENUATION ADC_ATTEN_DB_0 #define ATTENUATION ADC_ATTEN_DB_11
#define ADC_READ_TIMEOUT_MS 2000 #define ADC_READ_TIMEOUT_MS 2000
#define ADC_PIN_MAX_VALUE 0xfff
#if defined(CONFIG_IDF_TARGET_ESP32) #if defined(CONFIG_IDF_TARGET_ESP32)
#define ADC_RESULT_BYTE 2 #define ADC_RESULT_BYTE 2
@ -239,6 +240,7 @@ uint32_t common_hal_analogbufio_bufferedin_readinto(analogbufio_bufferedin_obj_t
uint32_t captured_bytes = 0; uint32_t captured_bytes = 0;
esp_err_t ret; esp_err_t ret;
uint32_t ret_num = 0; uint32_t ret_num = 0;
uint32_t adc_reading = 0;
adc_digi_convert_mode_t convert_mode = ADC_CONV_SINGLE_UNIT_2; adc_digi_convert_mode_t convert_mode = ADC_CONV_SINGLE_UNIT_2;
adc_digi_output_format_t output_format = ADC_DIGI_OUTPUT_FORMAT_TYPE1; adc_digi_output_format_t output_format = ADC_DIGI_OUTPUT_FORMAT_TYPE1;
@ -264,11 +266,13 @@ uint32_t common_hal_analogbufio_bufferedin_readinto(analogbufio_bufferedin_obj_t
uint16_t *pBuffer = (uint16_t *)(void *)&buffer[captured_bytes]; uint16_t *pBuffer = (uint16_t *)(void *)&buffer[captured_bytes];
if (output_format == ADC_DIGI_OUTPUT_FORMAT_TYPE1) { if (output_format == ADC_DIGI_OUTPUT_FORMAT_TYPE1) {
#if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32S2) #if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32S2)
*pBuffer = pResult->type1.data; adc_reading = pResult->type1.data;
#endif #endif
} else { } else {
*pBuffer = pResult->type2.data; adc_reading = pResult->type2.data;
} }
adc_reading = adc_reading * ((1 << 16) - 1) / ADC_PIN_MAX_VALUE;
*pBuffer = (uint16_t)adc_reading;
captured_bytes += sizeof(uint16_t); captured_bytes += sizeof(uint16_t);
captured_samples++; captured_samples++;
} else { } else {