From e688fa8775b971bb559f6177aa8b3f3a5c9a9257 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 11 Oct 2019 10:00:55 +0200 Subject: [PATCH] vendor: update nanopb, remove build failure workaround This reverts commit 5cfa386e441b3ed21a1644e33009690b07e0ed02. --- legacy/firmware/Makefile | 2 +- vendor/nanopb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/legacy/firmware/Makefile b/legacy/firmware/Makefile index 06e427949..86cdb4a68 100644 --- a/legacy/firmware/Makefile +++ b/legacy/firmware/Makefile @@ -125,7 +125,7 @@ DEBUG_LINK ?= 0 DEBUG_LOG ?= 0 CFLAGS += -Wno-sequence-point -CFLAGS += -I../vendor/nanopb -Iprotob -DPB_FIELD_16BIT=1 -DPB_ENCODE_ARRAYS_UNPACKED=1 -Wno-unused-variable +CFLAGS += -I../vendor/nanopb -Iprotob -DPB_FIELD_16BIT=1 -DPB_ENCODE_ARRAYS_UNPACKED=1 CFLAGS += -DDEBUG_LINK=$(DEBUG_LINK) CFLAGS += -DDEBUG_LOG=$(DEBUG_LOG) CFLAGS += -DSCM_REVISION='"$(shell git rev-parse HEAD | sed 's:\(..\):\\x\1:g')"' diff --git a/vendor/nanopb b/vendor/nanopb index 252f41995..536fe5062 160000 --- a/vendor/nanopb +++ b/vendor/nanopb @@ -1 +1 @@ -Subproject commit 252f4199540a113a37d19de5ba051922909c810d +Subproject commit 536fe50629c3e9c88a0a4c367929ea0f10e53ddf