From 1072369bc4a8df1199ef2fded2d753966def677f Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 28 Sep 2017 13:19:03 +0200 Subject: [PATCH] firmware: need extra cast for nanopb call in message.c --- firmware/messages.c | 3 ++- firmware/protob/.gitignore | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/firmware/messages.c b/firmware/messages.c index ad89dc688..d5d2ba553 100644 --- a/firmware/messages.c +++ b/firmware/messages.c @@ -320,7 +320,8 @@ void msg_read_tiny(const uint8_t *buf, int len) } const pb_field_t *fields = 0; - pb_istream_t stream = pb_istream_from_buffer(buf + 9, msg_size); + // upstream nanopb is missing const qualifier, so we have to cast :-/ + pb_istream_t stream = pb_istream_from_buffer((uint8_t *)buf + 9, msg_size); switch (msg_id) { case MessageType_MessageType_PinMatrixAck: diff --git a/firmware/protob/.gitignore b/firmware/protob/.gitignore index 8d944df5a..969d878a1 100644 --- a/firmware/protob/.gitignore +++ b/firmware/protob/.gitignore @@ -1,3 +1,6 @@ *.pb *_pb2.py +*.pb.c +*.pb.h +messages_map.h __pycache__/