diff --git a/deps/tinycbor b/deps/tinycbor index 70aba6ba51..d393c16f3e 160000 --- a/deps/tinycbor +++ b/deps/tinycbor @@ -1 +1 @@ -Subproject commit 70aba6ba51881e5b8d108c105a17ed9cdee6bc30 +Subproject commit d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7 diff --git a/deps/tinycbor.cmake b/deps/tinycbor.cmake index 6781a78440..e94af52aa4 100755 --- a/deps/tinycbor.cmake +++ b/deps/tinycbor.cmake @@ -2,7 +2,9 @@ add_library(tinycbor-master OBJECT ${PROJECT_SOURCE_DIR}/deps/tinycbor/src/cborerrorstrings.c ${PROJECT_SOURCE_DIR}/deps/tinycbor/src/cborencoder.c ${PROJECT_SOURCE_DIR}/deps/tinycbor/src/cborencoder_close_container_checked.c + ${PROJECT_SOURCE_DIR}/deps/tinycbor/src/cborencoder_float.c ${PROJECT_SOURCE_DIR}/deps/tinycbor/src/cborparser.c + ${PROJECT_SOURCE_DIR}/deps/tinycbor/src/cborparser_float.c ${PROJECT_SOURCE_DIR}/deps/tinycbor/src/cborpretty.c ) diff --git a/port/android/Makefile b/port/android/Makefile index 310fc0e58c..d002bbfb39 100644 --- a/port/android/Makefile +++ b/port/android/Makefile @@ -140,7 +140,7 @@ DTLS= \ DTLSFLAGS=-I../../deps/mbedtls/include -D__OC_RANDOM -CBOR=../../deps/tinycbor/src/cborencoder.c ../../deps/tinycbor/src/cborencoder_close_container_checked.c ../../deps/tinycbor/src/cborparser.c# ../../deps/tinycbor/src/cbortojson.c ../../deps/tinycbor/src/cborpretty.c ../../deps/tinycbor/src/cborparser_dup_string.c +CBOR=../../deps/tinycbor/src/cborencoder.c ../../deps/tinycbor/src/cborencoder_close_container_checked.c ../../deps/tinycbor/src/cborencoder_float.c ../../deps/tinycbor/src/cborparser.c ../../deps/tinycbor/src/cborparser_float.c# ../../deps/tinycbor/src/cbortojson.c ../../deps/tinycbor/src/cborpretty.c ../../deps/tinycbor/src/cborparser_dup_string.c ifeq ($(PKI),1) CTIMESTAMP=../../api/c-timestamp/timestamp_tm.c diff --git a/port/linux/Makefile b/port/linux/Makefile index a35cea230e..7d3f2996f7 100644 --- a/port/linux/Makefile +++ b/port/linux/Makefile @@ -84,7 +84,7 @@ DTLS= aes.c aesni.c arc4.c asn1parse.c asn1write.c base64.c \ x509write_crt.c x509_create.c x509_csr.c ssl_msg.c constant_time.c DTLSFLAGS=-I../../deps/mbedtls/include -D__OC_RANDOM -CBOR=../../deps/tinycbor/src/cborencoder.c ../../deps/tinycbor/src/cborencoder_close_container_checked.c ../../deps/tinycbor/src/cborparser.c# ../../deps/tinycbor/src/cbortojson.c ../../deps/tinycbor/src/cborpretty.c ../../deps/tinycbor/src/cborparser_dup_string.c +CBOR=../../deps/tinycbor/src/cborencoder.c ../../deps/tinycbor/src/cborencoder_close_container_checked.c ../../deps/tinycbor/src/cborencoder_float.c ../../deps/tinycbor/src/cborparser.c ../../deps/tinycbor/src/cborparser_float.c# ../../deps/tinycbor/src/cbortojson.c ../../deps/tinycbor/src/cborpretty.c ../../deps/tinycbor/src/cborparser_dup_string.c PYTHON_DIR=../../python diff --git a/port/openthread/Makefile b/port/openthread/Makefile index 71f0c05d01..a57b13eceb 100644 --- a/port/openthread/Makefile +++ b/port/openthread/Makefile @@ -9,8 +9,10 @@ PATH_BIN = output/${OPENTHREAD_BOARD}/bin CBOR = \ ../../deps/tinycbor/src/cborencoder.c \ + ../../deps/tinycbor/src/cborencoder_float.c \ ../../deps/tinycbor/src/cborencoder_close_container_checked.c \ - ../../deps/tinycbor/src/cborparser.c + ../../deps/tinycbor/src/cborparser.c \ + ../../deps/tinycbor/src/cborparser_float.c # ../../deps/tinycbor/src/cbortojson.c # ../../deps/tinycbor/src/cborpretty.c # ../../deps/tinycbor/src/cborparser_dup_string.c