bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Replace MIN# / MAX# with variadic MIN / MAX (#11960)

Browse Source
This commit is contained in:
AnoNymous
2018-09-30 11:59:14 +02:00
committed by Scott Lahteine
parent e10f730478
commit b30ca652ae
9 changed files with 91 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Marlin/src/core/macros.h
View File

@ -20,8 +20,9 @@
*
*/
#ifndef _CORE_MACROS_H_
#define _CORE_MACROS_H_
#pragma once
#include "minmax.h"
#define NUM_AXIS 4
#define ABCE 4
@ -93,10 +94,6 @@
#define IS_POWER_OF_2(x) ((x) && !((x) & ((x) - 1)))
// Macros to constrain values
// Avoid double evaluation of arguments to NOMORE/NOLESS/LIMIT
#undef NOMORE
#undef NOLESS
#undef LIMIT
#ifdef __cplusplus
// C++11 solution that is standards compliant.
@ -207,49 +204,13 @@
#define CEILING(x,y) (((x) + (y) - 1) / (y))
// Avoid double evaluation of arguments on MIN/MAX/ABS
#undef MIN
#undef MAX
#undef ABS
#ifdef __cplusplus
// C++11 solution that is standards compliant. Return type is deduced automatically
template <class L, class R> static inline constexpr auto MIN(const L lhs, const R rhs) -> decltype(lhs + rhs) {
return lhs < rhs ? lhs : rhs;
}
template <class L, class R> static inline constexpr auto MAX(const L lhs, const R rhs) -> decltype(lhs + rhs){
return lhs > rhs ? lhs : rhs;
}
template <class T> static inline constexpr const T ABS(const T v) {
return v >= 0 ? v : -v;
}
template <class T> static inline constexpr const T ABS(const T v) { return v >= 0 ? v : -v; }
#else
// Using GCC extensions, but Travis GCC version does not like it and gives
// "error: statement-expressions are not allowed outside functions nor in template-argument lists"
#define MIN(a, b) \
({__typeof__(a) _a = (a); \
__typeof__(b) _b = (b); \
_a < _b ? _a : _b;})
#define MAX(a, b) \
({__typeof__(a) _a = (a); \
__typeof__(b) _b = (b); \
_a > _b ? _a : _b;})
#define ABS(a) \
({__typeof__(a) _a = (a); \
_a >= 0 ? _a : -_a;})
#define ABS(a) ({__typeof__(a) _a = (a); _a >= 0 ? _a : -_a;})
#endif
#define MIN3(a, b, c) MIN(MIN(a, b), c)
#define MIN4(a, b, c, d) MIN(MIN3(a, b, c), d)
#define MIN5(a, b, c, d, e) MIN(MIN4(a, b, c, d), e)
#define MAX3(a, b, c) MAX(MAX(a, b), c)
#define MAX4(a, b, c, d) MAX(MAX3(a, b, c), d)
#define MAX5(a, b, c, d, e) MAX(MAX4(a, b, c, d), e)
#define UNEAR_ZERO(x) ((x) < 0.000001f)
#define NEAR_ZERO(x) WITHIN(x, -0.000001f, 0.000001f)
#define NEAR(x,y) NEAR_ZERO((x)-(y))
@ -269,5 +230,3 @@
#define LROUND(x) lroundf(x)
#define FMOD(x, y) fmodf(x, y)
#define HYPOT(x,y) SQRT(HYPOT2(x,y))
#endif // _CORE_MACROS_H_