Commit 08012d94 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

add msp430fr5994 to ArduinoJSON and mpack embedded detection

parent 30512a43

include/lib/ArduinoJson/Configuration.hpp

+1 −0
Original line number Diff line number Diff line
@@ -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

include/lib/mpack/mpack.h

+2 −2
Original line number Diff line number Diff line
@@ -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

include/lib/mpmalloc.h

0 → 100644
+16 −0
Original line number Diff line number Diff line 
#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