Skip to content

Commit 79bc168

Browse files
authored
Update tinycbor submodule to v0.6.0 (#238)
* Update tinycbor submodule to v0.6.0 TinyCBOR 0.6.0 adds compilation flags that may be needed for a future update of the Zephyr port. * Update Makefile for TinyCBOR 0.6.0 * Update android and openthread port Makefiles for TinyCBOR 0.6.0
1 parent 68a2033 commit 79bc168

5 files changed

Lines changed: 8 additions & 4 deletions

File tree

deps/tinycbor.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ add_library(tinycbor-master OBJECT
22
${PROJECT_SOURCE_DIR}/deps/tinycbor/src/cborerrorstrings.c
33
${PROJECT_SOURCE_DIR}/deps/tinycbor/src/cborencoder.c
44
${PROJECT_SOURCE_DIR}/deps/tinycbor/src/cborencoder_close_container_checked.c
5+
${PROJECT_SOURCE_DIR}/deps/tinycbor/src/cborencoder_float.c
56
${PROJECT_SOURCE_DIR}/deps/tinycbor/src/cborparser.c
7+
${PROJECT_SOURCE_DIR}/deps/tinycbor/src/cborparser_float.c
68
${PROJECT_SOURCE_DIR}/deps/tinycbor/src/cborpretty.c
79
)
810

port/android/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ DTLS= \
140140

141141
DTLSFLAGS=-I../../deps/mbedtls/include -D__OC_RANDOM
142142

143-
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
143+
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
144144

145145
ifeq ($(PKI),1)
146146
CTIMESTAMP=../../api/c-timestamp/timestamp_tm.c

port/linux/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ DTLS= aes.c aesni.c arc4.c asn1parse.c asn1write.c base64.c \
8484
x509write_crt.c x509_create.c x509_csr.c ssl_msg.c constant_time.c
8585
DTLSFLAGS=-I../../deps/mbedtls/include -D__OC_RANDOM
8686

87-
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
87+
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
8888

8989

9090
PYTHON_DIR=../../python

port/openthread/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ PATH_BIN = output/${OPENTHREAD_BOARD}/bin
99

1010
CBOR = \
1111
../../deps/tinycbor/src/cborencoder.c \
12+
../../deps/tinycbor/src/cborencoder_float.c \
1213
../../deps/tinycbor/src/cborencoder_close_container_checked.c \
13-
../../deps/tinycbor/src/cborparser.c
14+
../../deps/tinycbor/src/cborparser.c \
15+
../../deps/tinycbor/src/cborparser_float.c
1416
# ../../deps/tinycbor/src/cbortojson.c
1517
# ../../deps/tinycbor/src/cborpretty.c
1618
# ../../deps/tinycbor/src/cborparser_dup_string.c

0 commit comments

Comments
 (0)