3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-23 12:04:19 +00:00
Code Issues Releases Wiki Activity

Improve NOMORE, NOLESS, and LIMIT macros

Browse Source
This commit is contained in:
etagle 2018-05-16 17:16:07 -03:00 committed by Scott Lahteine
parent 40d7e12827
commit 06fd4d7b28
1 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,10 +91,50 @@
#define SIGN(a) ((a>0)-(a<0)) #define SIGN(a) ((a>0)-(a<0))
#define IS_POWER_OF_2(x) ((x) && !((x) & ((x) - 1))) #define IS_POWER_OF_2(x) ((x) && !((x) & ((x) - 1)))
// Macros to contrain values // Macros to constrain values
#define NOLESS(v,n) do{ if (v < n) v = n; }while(0) // Avoid double evaluation of arguments to NOMORE/NOLESS/LIMIT
#define NOMORE(v,n) do{ if (v > n) v = n; }while(0) #undef NOMORE
#define LIMIT(v,n1,n2) do{ if (v < n1) v = n1; else if (v > n2) v = n2; }while(0) #undef NOLESS
#undef LIMIT
#ifdef __cplusplus
// C++11 solution that is standards compliant.
template <class V, class N> static inline constexpr void NOLESS(V& v, const N n) {
if (v < n) v = n;
}
template <class V, class N> static inline constexpr void NOMORE(V& v, const N n) {
if (v > n) v = n;
}
template <class V, class N1, class N2> static inline constexpr void LIMIT(V& v, const N1 n1, const N2 n2) {
if (v < n1) v = n1;
else if (v > n2) v = n2;
}
#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 NOLESS(v, n) \
do { \
__typeof__(n) _n = (n); \
if (v < _n) v = _n; \
} while(0)
#define NOMORE(v, n) \
do { \
__typeof__(n) _n = (n); \
if (v > _n) v = _n; \
} while(0)
#define LIMIT(v, n1, n2) \
do { \
__typeof__(n1) _n1 = (n1); \
__typeof__(n2) _n2 = (n2); \
if (v < _n1) v = _n1; \
else if (v > _n2) v = _n2; \
} while(0)
#endif
// Macros to support option testing // Macros to support option testing
#define _CAT(a, ...) a ## __VA_ARGS__ #define _CAT(a, ...) a ## __VA_ARGS__