добавлена проверка - не превышает ли номер вывода из аргумента функции общее кол-во выводов

This commit is contained in:
klassents committed 2025-02-21 15:43:13 +07:00
1 parent 5b2e2eb1d5
commit fbaa4b931a
11 files changed
+171 -96

No files matched your search

+1 -4
View File
@@ -107,10 +107,7 @@ static const uint8_t A7 = PIN_A7;
// determines the address of the port by the board pin number to which this pin belongs on the MCU
GPIO_TypeDef* digitalPinToPort(uint32_t digPinNumber);
// determines the pin address inside the port by the board pin number
static inline HAL_PinsTypeDef digitalPinToBitMask(uint32_t digitalPinNumber)
{
return (HAL_PinsTypeDef)(1 << (digitalPinNumber & 0xF));
}
HAL_PinsTypeDef digitalPinToBitMask(uint32_t digitalPinNumber);
// total number of pins available for initialization
static inline uint16_t pinCommonQty(void)
{
+20 -11
View File
@@ -23,22 +23,31 @@
GPIO_TypeDef *digitalPinToPort(uint32_t digitalPinNumber)
{
if (digitalPinNumber < 16u)
GPIO_TypeDef* port = NULL;
if (digitalPinNumber < pinCommonQty())
{
return GPIO_0;
}
else if ((digitalPinNumber >= 16u) && (digitalPinNumber < 32u))
{
return GPIO_1;
}
else if ((digitalPinNumber >= 32u) && (digitalPinNumber < 40u))
{
return GPIO_2;
if (digitalPinNumber < 16u)
port = GPIO_0;
else if ((digitalPinNumber >= 16u) && (digitalPinNumber < 32u))
port = GPIO_1;
else if ((digitalPinNumber >= 32u) && (digitalPinNumber < 40u))
port = GPIO_2;
}
else
ErrorMsgHandler("digitalPinToPort(): pin number exceeds the total number of pins");
return port;
}
// determines the pin address inside the port by the board pin number
HAL_PinsTypeDef digitalPinToBitMask(uint32_t digitalPinNumber)
{
if (digitalPinNumber >= pinCommonQty())
{
return NULL;
ErrorMsgHandler("digitalPinToBitMask(): pin number exceeds the total number of pins");
return NC;
}
return (HAL_PinsTypeDef)(1 << (digitalPinNumber & 0xF));
}
// the function returns a reference to the OUTPUT address of the GPIO register