avr/uart
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Capitalized local constexpr variables to be more consistent

Browse Source
This commit is contained in:
BlackMark
2020-04-05 03:36:05 +02:00
parent 0e128bcb7d
commit fa0a65a94c
2 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
uart.hpp
View File

@@ -36,13 +36,13 @@ static constexpr size_t cntDigits()
template <typename T, size_t Base>
static constexpr size_t maxNumDigits()
{
constexpr T minVal = util::NumericLimits<T>::min();
constexpr T maxVal = util::NumericLimits<T>::max();
constexpr T MinVal = util::NumericLimits<T>::min();
constexpr T MaxVal = util::NumericLimits<T>::max();
constexpr T minDigits = cntDigits<T, MinVal, Base>();
constexpr T maxDigits = cntDigits<T, MaxVal, Base>();
constexpr T MinDigits = cntDigits<T, MinVal, Base>();
constexpr T MaxDigits = cntDigits<T, MaxVal, Base>();
return (minDigits < maxDigits) ? maxDigits : minDigits;
return (MinDigits < MaxDigits) ? MaxDigits : MinDigits;
}
} // namespace detail
@@ -120,8 +120,8 @@ class Uart {
static_assert(Base <= 16, "Numbers with base higher than 16 are not supported");
static_assert(Padding <= detail::maxNumDigits<T, Base>(), "Cannot pad more than maximum length of number");
constexpr char alphaChar = (LowerCase) ? 'a' : 'A';
constexpr size_t numDigits = detail::maxNumDigits<T, Base>();
constexpr char AlphaChar = (LowerCase) ? 'a' : 'A';
constexpr size_t NumDigits = detail::maxNumDigits<T, Base>();
T digits = val;
@@ -130,17 +130,17 @@ class Uart {
txByte('-');
}
data_t buffer[numDigits];
data_t *bufEnd = buffer + numDigits - 1;
data_t buffer[NumDigits];
data_t *bufEnd = buffer + NumDigits - 1;
do {
const data_t lastDigit = digits % Base;
*bufEnd-- = (lastDigit < 10) ? ('0' + lastDigit) : (alphaChar + lastDigit - 10);
*bufEnd-- = (lastDigit < 10) ? ('0' + lastDigit) : (AlphaChar + lastDigit - 10);
digits /= Base;
} while (digits > 0);
if (Padding > 0) {
size_t strLen = buffer + numDigits - (bufEnd + 1);
size_t strLen = buffer + NumDigits - (bufEnd + 1);
if (Padding > strLen) {
for (size_t i = Padding; i > strLen && bufEnd >= buffer; --i) {
@@ -149,7 +149,7 @@ class Uart {
}
}
for (data_t *buf = bufEnd + 1; buf < buffer + numDigits; ++buf)
for (data_t *buf = bufEnd + 1; buf < buffer + NumDigits; ++buf)
txByte(*buf);
}