Skip to content

Commit ae3c297

Browse files
author
Marcus Sonestedt
committed
ServoPID: Minor cleanup in mock (reduce warnings)
1 parent a45b2eb commit ae3c297

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

ServoPID/TestServoPID/ArduinoMock.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ inline void setMockAnalogRead(const int pin, const int value)
2323
mock::gAnalogPins.at(pin) = value;
2424
}
2525

26-
template<typename T>
27-
T constrain(const T v, const T min, const T max)
26+
template<typename T, typename U>
27+
T constrain(const T v, const U min, const U max)
2828
{
29-
if (v < min)
30-
return min;
31-
if (v > max)
32-
return max;
29+
if (v < T(min))
30+
return T(min);
31+
if (v > T(max))
32+
return T(max);
3333
return v;
3434
}
3535

@@ -100,7 +100,7 @@ class MockSerial
100100
{
101101
dataRead.clear();
102102
dataWrite.clear();
103-
dataWrite.str(std::string());
103+
dataWrite.str({});
104104
}
105105

106106
std::vector<char> dataRead;

0 commit comments

Comments
 (0)