diff --git a/src/hal/bk7231/hal_adc_bk7231.c b/src/hal/bk7231/hal_adc_bk7231.c index f4deaff17..004e92677 100644 --- a/src/hal/bk7231/hal_adc_bk7231.c +++ b/src/hal/bk7231/hal_adc_bk7231.c @@ -16,14 +16,31 @@ void turnon_PA_in_temp_dect(void); static int adcToGpio[] = { - -1, // ADC0 - VBAT - 26, //GPIO26, // ADC1 - 24, //GPIO24, // ADC2 - 23,//GPIO23, // ADC3 - 28,//GPIO28, // ADC4 - 22,//GPIO22, // ADC5 - 21,//GPIO21, // ADC6 - 13,//GPIO13, // ADC7 + -1, // ADC0 - VBAT +#if PLATFORM_BK7238 + 26, //GPIO26, // ADC1 + 24, //GPIO24, // ADC2 + 20, //GPIO20, // ADC3 + 28, //GPIO28, // ADC4 + 1, //GPIO1, // ADC5 + 10, //GPIO10, // ADC6 +#elif PLATFORM_BK7231N + 26, //GPIO26, // ADC1 + 24, //GPIO24, // ADC2 + 23, //GPIO23, // ADC3 + 28, //GPIO28, // ADC4 + 22, //GPIO22, // ADC5 + 21, //GPIO21, // ADC6 + 13, //GPIO13, // ADC7 +#else + 4, //GPIO4, // ADC1 + 5, //GPIO5, // ADC2 + 23, //GPIO23, // ADC3 + 2, //GPIO2, // ADC4 + 3, //GPIO3, // ADC5 + 12, //GPIO12, // ADC6 + 13, //GPIO13, // ADC7 +#endif }; static int c_adcToGpio = sizeof(adcToGpio)/sizeof(adcToGpio[0]); diff --git a/src/hal/bk7231/hal_pins_bk7231.c b/src/hal/bk7231/hal_pins_bk7231.c index 553fd2a82..a84566fe3 100644 --- a/src/hal/bk7231/hal_pins_bk7231.c +++ b/src/hal/bk7231/hal_pins_bk7231.c @@ -39,14 +39,18 @@ const char *HAL_PIN_GetPinNameAlias(int index) #if PLATFORM_BK7238 case 1: return "RXD2/ADC5"; case 10: return "RXD1/ADC6"; - case 26: return "PWM5/ADC1"; - case 24: return "PWM4/ADC2"; case 20: return "ADC3"; case 28: return "ADC4"; #else case 1: return "RXD2"; case 10: return "RXD1"; case 23: return "ADC3"; + case 13: return "ADC7"; +#endif +#if PLATFORM_BK7238 || PLATFORM_BK7231N + case 24: return "PWM4/ADC2"; + case 26: return "PWM5/ADC1"; +#else case 24: return "PWM4"; case 26: return "PWM5"; #endif @@ -56,6 +60,17 @@ const char *HAL_PIN_GetPinNameAlias(int index) case 7: return "PWM1"; case 8: return "PWM2"; case 9: return "PWM3"; +#if PLATFORM_BK7231N + case 28: return "ADC4"; + case 22: return "ADC5"; + case 21: return "ADC6"; +#elif !PLATFORM_BK7238 + case 4: return "ADC1"; + case 5: return "ADC2"; + case 2: return "ADC4"; + case 3: return "ADC5"; + case 12: return "ADC6"; +#endif default: return "N/A"; } }