Skip to content

Commit cf0bcf2

Browse files
Fix ADC mappings (#1887)
1 parent 5f45f69 commit cf0bcf2

File tree

2 files changed

+42
-10
lines changed

2 files changed

+42
-10
lines changed

src/hal/bk7231/hal_adc_bk7231.c

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,31 @@
1616
void turnon_PA_in_temp_dect(void);
1717

1818
static int adcToGpio[] = {
19-
-1, // ADC0 - VBAT
20-
26, //GPIO26, // ADC1
21-
24, //GPIO24, // ADC2
22-
23,//GPIO23, // ADC3
23-
28,//GPIO28, // ADC4
24-
22,//GPIO22, // ADC5
25-
21,//GPIO21, // ADC6
26-
13,//GPIO13, // ADC7
19+
-1, // ADC0 - VBAT
20+
#if PLATFORM_BK7238
21+
26, //GPIO26, // ADC1
22+
24, //GPIO24, // ADC2
23+
20, //GPIO20, // ADC3
24+
28, //GPIO28, // ADC4
25+
1, //GPIO1, // ADC5
26+
10, //GPIO10, // ADC6
27+
#elif PLATFORM_BK7231N
28+
26, //GPIO26, // ADC1
29+
24, //GPIO24, // ADC2
30+
23, //GPIO23, // ADC3
31+
28, //GPIO28, // ADC4
32+
22, //GPIO22, // ADC5
33+
21, //GPIO21, // ADC6
34+
13, //GPIO13, // ADC7
35+
#else
36+
4, //GPIO4, // ADC1
37+
5, //GPIO5, // ADC2
38+
23, //GPIO23, // ADC3
39+
2, //GPIO2, // ADC4
40+
3, //GPIO3, // ADC5
41+
12, //GPIO12, // ADC6
42+
13, //GPIO13, // ADC7
43+
#endif
2744
};
2845
static int c_adcToGpio = sizeof(adcToGpio)/sizeof(adcToGpio[0]);
2946

src/hal/bk7231/hal_pins_bk7231.c

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,18 @@ const char *HAL_PIN_GetPinNameAlias(int index)
3939
#if PLATFORM_BK7238
4040
case 1: return "RXD2/ADC5";
4141
case 10: return "RXD1/ADC6";
42-
case 26: return "PWM5/ADC1";
43-
case 24: return "PWM4/ADC2";
4442
case 20: return "ADC3";
4543
case 28: return "ADC4";
4644
#else
4745
case 1: return "RXD2";
4846
case 10: return "RXD1";
4947
case 23: return "ADC3";
48+
case 13: return "ADC7";
49+
#endif
50+
#if PLATFORM_BK7238 || PLATFORM_BK7231N
51+
case 24: return "PWM4/ADC2";
52+
case 26: return "PWM5/ADC1";
53+
#else
5054
case 24: return "PWM4";
5155
case 26: return "PWM5";
5256
#endif
@@ -56,6 +60,17 @@ const char *HAL_PIN_GetPinNameAlias(int index)
5660
case 7: return "PWM1";
5761
case 8: return "PWM2";
5862
case 9: return "PWM3";
63+
#if PLATFORM_BK7231N
64+
case 28: return "ADC4";
65+
case 22: return "ADC5";
66+
case 21: return "ADC6";
67+
#elif !PLATFORM_BK7238
68+
case 4: return "ADC1";
69+
case 5: return "ADC2";
70+
case 2: return "ADC4";
71+
case 3: return "ADC5";
72+
case 12: return "ADC6";
73+
#endif
5974
default: return "N/A";
6075
}
6176
}

0 commit comments

Comments
 (0)