Skip to content

Match type of arguments to min() and max() #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Match type of arguments to min() and max() #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/ConsoleShell/ConsoleShell.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ void SetLedState()
void SetBrightness()
{
// clamp value intervalOn on 0 and PWMinterval
intervalOn = max(min(ledBrightness,PWMinterval),0);
intervalOn = max(min((unsigned long)ledBrightness,PWMinterval),0ul);
}

// Pulse Width Modulation to vary Led intensity
Expand Down
2 changes: 1 addition & 1 deletion utility/HeaterSim.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ void HeaterSim::CalcTemperature()
{
float rate = LN2/_halfTimeCooling;
unsigned long currentTime = millis();
if (currentTime >= _lastTime) _deltams = max(currentTime - _lastTime,1);
if (currentTime >= _lastTime) _deltams = max(currentTime - _lastTime,1ul);
_deltaTime = _deltams/ 1000.0f;
float deltaTemp = _boilerTemp - _ambientTemp;
float deltaTempAfterCooling = deltaTemp*exp(-rate*_deltaTime);
Expand Down