diff options
author | David Crocker <dcrocker@eschertech.com> | 2017-12-02 15:11:48 +0300 |
---|---|---|
committer | David Crocker <dcrocker@eschertech.com> | 2017-12-02 15:11:48 +0300 |
commit | 4a0ee2e48a22d7ccba04d4907600fd40088abdab (patch) | |
tree | 0e2b70f8f5c0767eb2ee651408679c13a74d2ec9 /src/Pins.h | |
parent | b957662e14d919e2d3f3169b07ead7590824ce80 (diff) |
Version 1.20beta11+2
Merged in changes from dev branch
Diffstat (limited to 'src/Pins.h')
-rw-r--r-- | src/Pins.h | 21 |
1 files changed, 16 insertions, 5 deletions
@@ -14,6 +14,8 @@ # endif # elif defined(__SAM4E8E__) # define PLATFORM DuetNG +# elif defined(__SAME70Q21__) +# define PLATFORM SAME70_TEST # elif defined(__SAM4S8C__) # define PLATFORM DuetM # else @@ -21,10 +23,19 @@ # endif #endif -#define P_EXPAND(x) x -#define P_CONCAT(x,y) P_EXPAND(x)y -#define P_STR(x) #x -#define P_XSTR(x) P_STR(x) -#define P_INCLUDE_FILE P_XSTR(P_CONCAT(PLATFORM,P_CONCAT(/Pins_,P_CONCAT(PLATFORM,.h)))) +#if !defined(P_INCLUDE_FILE) +# define P_EXPAND(x) x +# define P_CONCAT(x,y) P_EXPAND(x)y +# define P_STR(x) #x +# define P_XSTR(x) P_STR(x) +# define P_INCLUDE_FILE P_XSTR(P_CONCAT(PLATFORM,P_CONCAT(/Pins_,P_CONCAT(PLATFORM,.h)))) +#endif #include P_INCLUDE_FILE + +#if (HAS_LWIP_NETWORKING + HAS_WIFI_NETWORKING) > 1 +# define HAS_MULTIPLE_NETWORK_INTERFACES 1 +#else +# define HAS_MULTIPLE_NETWORK_INTERFACES 0 +#endif + #endif // PINS_H__ |