File tree Expand file tree Collapse file tree 1 file changed +6
-5
lines changed Expand file tree Collapse file tree 1 file changed +6
-5
lines changed Original file line number Diff line number Diff line change @@ -47,24 +47,25 @@ int8_t digitalPinToTouchChannel(uint8_t pin)
47
47
48
48
int8_t digitalPinToAnalogChannel (uint8_t pin )
49
49
{
50
- uint8_t channel ;
51
- int8_t ret = -1 ;
50
+ uint8_t channel = 0 ;
52
51
if (pin < SOC_GPIO_PIN_COUNT ) {
53
52
for (uint8_t i = 0 ; i < SOC_ADC_PERIPH_NUM ; i ++ ) {
54
53
for (uint8_t j = 0 ; j < SOC_ADC_MAX_CHANNEL_NUM ; j ++ ) {
55
54
if (adc_channel_io_map [i ][j ] == pin ) {
56
- ret = channel ;
57
- break ;
55
+ return channel ;
58
56
}
59
57
channel ++ ;
60
58
}
61
59
}
62
60
}
63
- return ret ;
61
+ return -1 ;
64
62
}
65
63
66
64
int8_t analogChannelToDigitalPin (uint8_t channel )
67
65
{
66
+ if (channel >= (SOC_ADC_PERIPH_NUM * SOC_ADC_MAX_CHANNEL_NUM )) {
67
+ return -1 ;
68
+ }
68
69
uint8_t adc_unit = (channel / SOC_ADC_MAX_CHANNEL_NUM );
69
70
uint8_t adc_chan = (channel % SOC_ADC_MAX_CHANNEL_NUM );
70
71
return adc_channel_io_map [adc_unit ][adc_chan ];
You can’t perform that action at this time.
0 commit comments