diff --git a/flight/libraries/math/mathmisc.c b/flight/libraries/math/mathmisc.c index d54d18908..25ddc9559 100644 --- a/flight/libraries/math/mathmisc.c +++ b/flight/libraries/math/mathmisc.c @@ -29,21 +29,4 @@ */ -// returns min(boundary1,boundary2) if valmax(boundary1,boundary2) -// returns val if min(boundary1,boundary2)<=val<=max(boundary1,boundary2) -float boundf(float val, float boundary1, float boundary2) -{ - if (boundary1 > boundary2) { - float tmp = boundary2; - boundary2 = boundary1; - boundary1 = tmp; - } - if (!(val >= boundary1)) { - val = boundary1; - } - if (!(val <= boundary2)) { - val = boundary2; - } - return val; -} +// space deliberately left empty, any non inline misc math functions can go here diff --git a/flight/libraries/math/mathmisc.h b/flight/libraries/math/mathmisc.h index c989ccffe..573743c51 100644 --- a/flight/libraries/math/mathmisc.h +++ b/flight/libraries/math/mathmisc.h @@ -34,6 +34,20 @@ // returns min(boundary1,boundary2) if valmax(boundary1,boundary2) // returns val if min(boundary1,boundary2)<=val<=max(boundary1,boundary2) -float boundf(float val, float boundary1, float boundary2); +static inline float boundf(float val, float boundary1, float boundary2) +{ + if (boundary1 > boundary2) { + float tmp = boundary2; + boundary2 = boundary1; + boundary1 = tmp; + } + if (!(val >= boundary1)) { + val = boundary1; + } + if (!(val <= boundary2)) { + val = boundary2; + } + return val; +} #endif /* MATHMISC_H */