diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2018-12-11 11:30:19 +0100 |
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2018-12-11 11:30:19 +0100 |
| commit | 08012d944e822b80893ee797eadff2a7c20fee2b (patch) | |
| tree | cf522dbeeb729c88903dc9f005093c347afa662f | |
| parent | 30512a43ded0648f825060c919667b24c972faea (diff) | |
add msp430fr5994 to ArduinoJSON and mpack embedded detection
| -rw-r--r-- | include/lib/ArduinoJson/Configuration.hpp | 1 | ||||
| -rw-r--r-- | include/lib/mpack/mpack.h | 4 | ||||
| -rw-r--r-- | include/lib/mpmalloc.h | 16 |
3 files changed, 19 insertions, 2 deletions
diff --git a/include/lib/ArduinoJson/Configuration.hpp b/include/lib/ArduinoJson/Configuration.hpp index cba885c..0e1a4de 100644 --- a/include/lib/ArduinoJson/Configuration.hpp +++ b/include/lib/ArduinoJson/Configuration.hpp @@ -8,6 +8,7 @@ #ifndef ARDUINOJSON_EMBEDDED_MODE #if defined(ARDUINO) || defined(__IAR_SYSTEMS_ICC__) || defined(__XC) || \ defined(__ARMCC_VERSION) || defined(MULTIPASS_ARCH_msp430fr5969lp) || \ + defined(MULTIPASS_ARCH_msp430fr5994lp) || \ defined(MULTIPASS_ARCH_arduino_nano) || defined(MULTIPASS_ARCH_blinkenrocket) || \ defined(MULTIPASS_ARCH_esp8266) #define ARDUINOJSON_EMBEDDED_MODE 1 diff --git a/include/lib/mpack/mpack.h b/include/lib/mpack/mpack.h index cfadf78..b4404f3 100644 --- a/include/lib/mpack/mpack.h +++ b/include/lib/mpack/mpack.h @@ -144,7 +144,7 @@ * for debugging and in allocation helpers. */ #ifndef MPACK_STDLIB -#if defined(MULTIPASS_ARCH_msp430fr5969lp) || \ +#if defined(MULTIPASS_ARCH_msp430fr5969lp) || defined(MULTIPASS_ARCH_msp430fr5994lp) || \ defined(MULTIPASS_ARCH_arduino_nano) || defined(MULTIPASS_ARCH_blinkenrocket) || \ defined(MULTIPASS_ARCH_esp8266) #define MPACK_STDLIB 0 @@ -160,7 +160,7 @@ * reading/writing C files and makes debugging easier. */ #ifndef MPACK_STDIO -#if defined(MULTIPASS_ARCH_msp430fr5969lp) || \ +#if defined(MULTIPASS_ARCH_msp430fr5969lp) || defined(MULTIPASS_ARCH_msp430fr5994lp) || \ defined(MULTIPASS_ARCH_arduino_nano) || defined(MULTIPASS_ARCH_blinkenrocket) || \ defined(MULTIPASS_ARCH_esp8266) #define MPACK_STDIO 0 diff --git a/include/lib/mpmalloc.h b/include/lib/mpmalloc.h new file mode 100644 index 0000000..0699042 --- /dev/null +++ b/include/lib/mpmalloc.h @@ -0,0 +1,16 @@ +#ifndef MPMALLOC_H +#define MPMALLOC_H + +#ifdef __cplusplus +extern "C" { +#endif + +void* mpcalloc(size_t nmemb, size_t size); +void* mpmalloc(size_t size); +void mpfree(void* addr); + +#ifdef __cplusplus +} +#endif + +#endif |