espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-05-22 01:27:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_adc_warning' into 'master'

Browse Source 
bugfix(adc): fix adc warning

See merge request sdk/ESP8266_RTOS_SDK!900
This commit is contained in:
Dong Heng
2019-04-18 13:10:51 +08:00
parent 28c49527f2 cac6080e1a
commit 06e1dfeb52
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp8266/driver/adc.c
View File

@ -130,8 +130,10 @@ esp_err_t adc_init(adc_config_t *config)
phy_init_data = (esp_phy_init_data_t *)esp_phy_get_init_data();
vdd33_const = phy_init_data->params[107];
ADC_CHECK((config->mode == ADC_READ_TOUT_MODE) ? (vdd33_const <= 255) : true, "To read the external voltage on TOUT(ADC) pin, vdd33_const need less than 255", ESP_FAIL);
ADC_CHECK((config->mode == ADC_READ_TOUT_MODE) ? (vdd33_const < 255) : true, "To read the external voltage on TOUT(ADC) pin, vdd33_const need less than 255", ESP_FAIL);
ADC_CHECK((config->mode == ADC_READ_VDD_MODE) ? (vdd33_const == 255) : true, "When adc measuring system voltage, vdd33_const must be set to 255,", ESP_FAIL);
ADC_CHECK(config->mode <= ADC_READ_MAX_MODE, "adc mode err", ESP_FAIL);
adc_handle = heap_caps_malloc(sizeof(adc_handle_t), MALLOC_CAP_8BIT);
ADC_CHECK(adc_handle, "adc handle malloc error", ESP_ERR_NO_MEM);

5
components/esp8266/include/driver/adc.h
View File

@ -25,8 +25,9 @@ extern "C" {
* @brief ADC working mode enumeration
*/
typedef enum {
ADC_READ_TOUT_MODE,
ADC_READ_VDD_MODE
ADC_READ_TOUT_MODE = 0,
ADC_READ_VDD_MODE,
ADC_READ_MAX_MODE
} adc_mode_t;
/**