Index: scripts/MsgUtils/msgutils/templates/MsgProtoUtils_h.jinja
===================================================================
diff -u -rf9c6b488aa4135e8cd47ccd3fdc6c3ae1cd831aa -raaebfee335c74b0250864a6dce0555f866adadea
--- scripts/MsgUtils/msgutils/templates/MsgProtoUtils_h.jinja	(.../MsgProtoUtils_h.jinja)	(revision f9c6b488aa4135e8cd47ccd3fdc6c3ae1cd831aa)
+++ scripts/MsgUtils/msgutils/templates/MsgProtoUtils_h.jinja	(.../MsgProtoUtils_h.jinja)	(revision aaebfee335c74b0250864a6dce0555f866adadea)
@@ -21,11 +21,11 @@
 // payload: {{ msg_cpp.field_list(msg_id_value) | join(", ") }}
 // serializeProto:   msg struct -> QByteArray of serialized protobuf data (header populated from params)
 // deserializeProto: QByteArray of serialized protobuf data -> msg struct (false on parse failure)
-QByteArray serializeProto(const {{ msg['msg_name'] }}Payload &src, const QDateTime &timestamp, const QString &deviceSerialNum, quint16 msgId, qint16 sequence);
+bool serializeProto(const {{ msg['msg_name'] }}Payload &src, const QDateTime &timestamp, qint16 sequence, quint16 msgId, QByteArray &dst);
 bool deserializeProto(const QByteArray &bytes, {{ msg['msg_name'] }}Payload &dst);
 {%- endfor %}
 
-QByteArray canMessageToProtobufByteArray(const QDateTime &timestamp, const QString &deviceSerialNumber, const Can::Message &msg);
+bool canMessageToProtobufByteArray(const QDateTime &timestamp, const Can::Message &msg, QByteArray &dst);
 
 // Maps a msgId to its fully-qualified protobuf message name (e.g. "{{ cpp_namespace if cpp_namespace else 'messages' }}.messages.AlarmStatusData").
 // Returns an empty string if the msgId is unknown. Intended for descriptor-pool lookup