From a8c126ca2065242e64a8e3ea4911194f49b2882d Mon Sep 17 00:00:00 2001 From: Darkl0ud Date: Wed, 17 Apr 2024 23:53:01 -0400 Subject: [PATCH 1/2] Fixed typo in adc_continuous_data typedef Fixed typo in adc_continuous_data typedef --- cores/esp32/esp32-hal-adc.c | 6 +++--- cores/esp32/esp32-hal-adc.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cores/esp32/esp32-hal-adc.c b/cores/esp32/esp32-hal-adc.c index 94d2e226104..fa5422e7b1a 100644 --- a/cores/esp32/esp32-hal-adc.c +++ b/cores/esp32/esp32-hal-adc.c @@ -360,7 +360,7 @@ static uint8_t __adcContinuousAtten = ADC_11db; static uint8_t __adcContinuousWidth = SOC_ADC_DIGI_MAX_BITWIDTH; static uint8_t used_adc_channels = 0; -adc_continuos_data_t *adc_result = NULL; +adc_continuous_data_t *adc_result = NULL; static bool adcContinuousDetachBus(void *adc_unit_number) { adc_unit_t adc_unit = (adc_unit_t)adc_unit_number - 1; @@ -537,7 +537,7 @@ bool analogContinuous(uint8_t pins[], size_t pins_count, uint32_t conversions_pe } //Allocate and prepare result structure for adc readings - adc_result = malloc(pins_count * sizeof(adc_continuos_data_t)); + adc_result = malloc(pins_count * sizeof(adc_continuous_data_t)); for (int k = 0; k < pins_count; k++) { adc_result[k].pin = pins[k]; adc_result[k].channel = channel[k]; @@ -578,7 +578,7 @@ bool analogContinuous(uint8_t pins[], size_t pins_count, uint32_t conversions_pe return true; } -bool analogContinuousRead(adc_continuos_data_t **buffer, uint32_t timeout_ms) { +bool analogContinuousRead(adc_continuous_data_t **buffer, uint32_t timeout_ms) { if (adc_handle[ADC_UNIT_1].adc_continuous_handle != NULL) { uint32_t bytes_read = 0; uint32_t read_raw[used_adc_channels]; diff --git a/cores/esp32/esp32-hal-adc.h b/cores/esp32/esp32-hal-adc.h index 1597824fda3..fab27765dec 100644 --- a/cores/esp32/esp32-hal-adc.h +++ b/cores/esp32/esp32-hal-adc.h @@ -86,7 +86,7 @@ extern "C" { uint8_t channel; /*! Date: Thu, 18 Apr 2024 12:40:25 -0400 Subject: [PATCH 2/2] Additional typo fix for adc_continuous_data typedef Additional commit for previous commit (#9529) adding typo corrections within 1. /docs/en/api/adc.rst 2. /libraries/ESP32/examples/AnalogReadContinuous\AnalogReadContinuous.ino 3. tests/periman/periman.ino --- docs/en/api/adc.rst | 8 ++++---- .../AnalogReadContinuous/AnalogReadContinuous.ino | 2 +- tests/periman/periman.ino | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/en/api/adc.rst b/docs/en/api/adc.rst index cc9ad86180b..7c7fbc5ed94 100644 --- a/docs/en/api/adc.rst +++ b/docs/en/api/adc.rst @@ -184,7 +184,7 @@ If ``false`` is returned, error occurs and ADC continuous was not configured. analogContinuousRead ^^^^^^^^^^^^^^^^^^^^ -This function is used to read ADC continuous data to the result buffer. The result buffer is an array of ``adc_continuos_data_t``. +This function is used to read ADC continuous data to the result buffer. The result buffer is an array of ``adc_continuous_data_t``. .. code-block:: arduino @@ -193,13 +193,13 @@ This function is used to read ADC continuous data to the result buffer. The resu uint8_t channel; /*!