sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-02-28 15:58:16 +00:00
Code Issues Releases Wiki Activity

Reverting definitions

Browse Source 
This was at least working... I will look at an alternative to pass all the tests.
This commit is contained in:
Edward Firmo 2024-12-10 02:00:19 +01:00
parent 21683945cd
commit 0dec3cc218
1 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
esphome/components/adc/adc_sensor.h
View File

@ -9,6 +9,7 @@
#ifdef USE_ESP32
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
#include "hal/adc_types.h" // This defines ADC_CHANNEL_MAX
#include "esp_adc/adc_oneshot.h"
#include "esp_adc/adc_cali.h"
#include "esp_adc/adc_cali_scheme.h"
@ -23,33 +24,28 @@ namespace adc {
#ifdef USE_ESP32
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
// Map legacy types to new ones for v5
typedef adc_channel_t adc1_channel_t;
typedef adc_channel_t adc2_channel_t;
// Map old channel names to new ones for compatibility
#define ADC1_CHANNEL_0 ADC_CHANNEL_0
#define ADC1_CHANNEL_1 ADC_CHANNEL_1
#define ADC1_CHANNEL_2 ADC_CHANNEL_2
#define ADC1_CHANNEL_3 ADC_CHANNEL_3
#define ADC1_CHANNEL_4 ADC_CHANNEL_4
#define ADC1_CHANNEL_5 ADC_CHANNEL_5
#define ADC1_CHANNEL_6 ADC_CHANNEL_6
#define ADC1_CHANNEL_7 ADC_CHANNEL_7
#define ADC1_CHANNEL_MAX ADC_CHANNEL_MAX
// ADC1 channel mapping
inline constexpr adc_channel_t ADC1_CHANNEL_0 = ADC_CHANNEL_0;
inline constexpr adc_channel_t ADC1_CHANNEL_1 = ADC_CHANNEL_1;
inline constexpr adc_channel_t ADC1_CHANNEL_2 = ADC_CHANNEL_2;
inline constexpr adc_channel_t ADC1_CHANNEL_3 = ADC_CHANNEL_3;
inline constexpr adc_channel_t ADC1_CHANNEL_4 = ADC_CHANNEL_4;
inline constexpr adc_channel_t ADC1_CHANNEL_5 = ADC_CHANNEL_5;
inline constexpr adc_channel_t ADC1_CHANNEL_6 = ADC_CHANNEL_6;
inline constexpr adc_channel_t ADC1_CHANNEL_7 = ADC_CHANNEL_7;
inline constexpr adc_channel_t ADC1_CHANNEL_MAX = ADC_CHANNEL_MAX;
// ADC2 channel mapping
inline constexpr adc_channel_t ADC2_CHANNEL_0 = ADC_CHANNEL_0;
inline constexpr adc_channel_t ADC2_CHANNEL_1 = ADC_CHANNEL_1;
inline constexpr adc_channel_t ADC2_CHANNEL_2 = ADC_CHANNEL_2;
inline constexpr adc_channel_t ADC2_CHANNEL_3 = ADC_CHANNEL_3;
inline constexpr adc_channel_t ADC2_CHANNEL_4 = ADC_CHANNEL_4;
inline constexpr adc_channel_t ADC2_CHANNEL_5 = ADC_CHANNEL_5;
inline constexpr adc_channel_t ADC2_CHANNEL_6 = ADC_CHANNEL_6;
inline constexpr adc_channel_t ADC2_CHANNEL_7 = ADC_CHANNEL_7;
inline constexpr adc_channel_t ADC2_CHANNEL_8 = ADC_CHANNEL_8;
inline constexpr adc_channel_t ADC2_CHANNEL_9 = ADC_CHANNEL_9;
inline constexpr adc_channel_t ADC2_CHANNEL_MAX = ADC_CHANNEL_MAX;
#define ADC2_CHANNEL_0 ADC_CHANNEL_0
#define ADC2_CHANNEL_1 ADC_CHANNEL_1
#define ADC2_CHANNEL_2 ADC_CHANNEL_2
#define ADC2_CHANNEL_3 ADC_CHANNEL_3
#define ADC2_CHANNEL_4 ADC_CHANNEL_4
#define ADC2_CHANNEL_5 ADC_CHANNEL_5
#define ADC2_CHANNEL_6 ADC_CHANNEL_6
#define ADC2_CHANNEL_7 ADC_CHANNEL_7
#define ADC2_CHANNEL_8 ADC_CHANNEL_8
#define ADC2_CHANNEL_9 ADC_CHANNEL_9
#define ADC2_CHANNEL_MAX ADC_CHANNEL_MAX
#endif // ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
// clang-format off
@ -117,7 +113,7 @@ class ADCSensor : public sensor::Sensor, public PollingComponent, public voltage
/// Configure the ADC to use a specific channel on ADC1.
/// This sets the channel for single-shot or continuous ADC measurements.
/// @param channel The ADC1 channel to configure, such as ADC_CHANNEL_0, ADC_CHANNEL_3, etc.
void set_channel1(adc1_channel_t channel) {
void set_channel1(adc_channel_t channel) {
this->channel_ = channel;
this->is_adc1_ = true;
this->do_setup_ = true;
@ -127,7 +123,7 @@ class ADCSensor : public sensor::Sensor, public PollingComponent, public voltage
/// This sets the channel for single-shot or continuous ADC measurements.
/// ADC2 is shared with other peripherals, so care must be taken to avoid conflicts.
/// @param channel The ADC2 channel to configure, such as ADC_CHANNEL_0, ADC_CHANNEL_3, etc.
void set_channel2(adc2_channel_t channel) {
void set_channel2(adc_channel_t channel) {
this->channel_ = channel;
this->is_adc1_ = false;
this->do_setup_ = true;