Skip to content

Commit 8558c68

Browse files
Icarus113dskulina
authored andcommitted
adc: fix adc1 channel 8 and 9 not defined bug on s3
1 parent 61a65f3 commit 8558c68

File tree

2 files changed

+6
-15
lines changed

2 files changed

+6
-15
lines changed

components/soc/esp32s3/adc_periph.c

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
1-
// Copyright 2015-2020 Espressif Systems (Shanghai) PTE LTD
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
//
7-
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
1+
/*
2+
* SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
146

157
#include "soc/adc_periph.h"
168

@@ -19,7 +11,7 @@ const int adc_channel_io_map[SOC_ADC_PERIPH_NUM][SOC_ADC_MAX_CHANNEL_NUM] = {
1911
/* ADC1 */
2012
{
2113
ADC1_CHANNEL_0_GPIO_NUM, ADC1_CHANNEL_1_GPIO_NUM, ADC1_CHANNEL_2_GPIO_NUM, ADC1_CHANNEL_3_GPIO_NUM, ADC1_CHANNEL_4_GPIO_NUM,
22-
ADC1_CHANNEL_5_GPIO_NUM, ADC1_CHANNEL_6_GPIO_NUM, ADC1_CHANNEL_7_GPIO_NUM, -1, -1
14+
ADC1_CHANNEL_5_GPIO_NUM, ADC1_CHANNEL_6_GPIO_NUM, ADC1_CHANNEL_7_GPIO_NUM, ADC1_CHANNEL_8_GPIO_NUM, ADC1_CHANNEL_9_GPIO_NUM
2315
},
2416
/* ADC2 */
2517
{

tools/ci/check_copyright_ignore.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1935,7 +1935,6 @@ components/soc/esp32s2/spi_periph.c
19351935
components/soc/esp32s2/touch_sensor_periph.c
19361936
components/soc/esp32s2/uart_periph.c
19371937
components/soc/esp32s2/usb_periph.c
1938-
components/soc/esp32s3/adc_periph.c
19391938
components/soc/esp32s3/dedic_gpio_periph.c
19401939
components/soc/esp32s3/gpio_periph.c
19411940
components/soc/esp32s3/i2c_periph.c

0 commit comments

Comments
 (0)