Moving makeWord() function defintion into WMath.cpp (out of WProgram.h).
This commit is contained in:
parent
da84adb1e9
commit
e42b8d7ef8
|
@ -55,3 +55,6 @@ long map(long x, long in_min, long in_max, long out_min, long out_max)
|
|||
{
|
||||
return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
|
||||
}
|
||||
|
||||
unsigned int makeWord(unsigned int w) { return w; }
|
||||
unsigned int makeWord(unsigned char h, unsigned char l) { return (h << 8) | l; }
|
|
@ -12,8 +12,8 @@
|
|||
#ifdef __cplusplus
|
||||
#include "HardwareSerial.h"
|
||||
|
||||
uint16_t makeWord(uint16_t w) { return w; }
|
||||
uint16_t makeWord(byte h, byte l) { return (h << 8) | l; }
|
||||
uint16_t makeWord(uint16_t w);
|
||||
uint16_t makeWord(byte h, byte l);
|
||||
|
||||
#define word(...) makeWord(__VA_ARGS__)
|
||||
|
||||
|
|
Loading…
Reference in New Issue