Mirrors_Framework/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-06-01 09:25:09 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Add IDF 5 test yaml, add adc to IDF tests, fix adc for IDF 5 (#5379)

Browse Source
This commit is contained in:
Keith Burzinski
2023-09-12 18:36:17 -05:00
committed by GitHub
parent b8fa737bc9
commit 736dbfac13
4 changed files with 708 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci.yml
+1 -1
View File
@@ -226,7 +226,7 @@ jobs:
fail-fast: false fail-fast: false
max-parallel: 2 max-parallel: 2
matrix: matrix:
file: [1, 2, 3, 3.1, 4, 5, 6, 7, 8, 10] file: [1, 2, 3, 3.1, 4, 5, 6, 7, 8, 10, 11.5]
steps: steps:
- name: Check out code from GitHub - name: Check out code from GitHub
uses: actions/checkout@v4.0.0 uses: actions/checkout@v4.0.0
esphome/components/adc/adc_sensor.h
+4
View File
@@ -62,8 +62,12 @@ class ADCSensor : public sensor::Sensor, public PollingComponent, public voltage
adc1_channel_t channel1_{ADC1_CHANNEL_MAX}; adc1_channel_t channel1_{ADC1_CHANNEL_MAX};
adc2_channel_t channel2_{ADC2_CHANNEL_MAX}; adc2_channel_t channel2_{ADC2_CHANNEL_MAX};
bool autorange_{false}; bool autorange_{false};
#if ESP_IDF_VERSION_MAJOR >= 5
esp_adc_cal_characteristics_t cal_characteristics_[SOC_ADC_ATTEN_NUM] = {};
#else
esp_adc_cal_characteristics_t cal_characteristics_[ADC_ATTEN_MAX] = {}; esp_adc_cal_characteristics_t cal_characteristics_[ADC_ATTEN_MAX] = {};
#endif #endif
#endif
}; };
} // namespace adc } // namespace adc
tests/test11.5.yaml
+697
View File
File diff suppressed because it is too large Load Diff
tests/test5.yaml
+6
View File
@@ -392,6 +392,12 @@ select:
"Three": 3 "Three": 3
sensor: sensor:
- platform: adc
id: adc_sensor_p32
name: ADC pin 32
pin: 32
attenuation: 11db
update_interval: 1s
- platform: internal_temperature - platform: internal_temperature
name: Internal Temperature name: Internal Temperature
- platform: selec_meter - platform: selec_meter