Index: scripts/MsgUtils/GenerateMsgDefsCpp.py
===================================================================
diff -u -rbde1243eb2ff6af2868f6c6ad0cb4f5760aaf68b -r402926738e7394ee2d3dc7add2e6d755f06a289d
--- scripts/MsgUtils/GenerateMsgDefsCpp.py	(.../GenerateMsgDefsCpp.py)	(revision bde1243eb2ff6af2868f6c6ad0cb4f5760aaf68b)
+++ scripts/MsgUtils/GenerateMsgDefsCpp.py	(.../GenerateMsgDefsCpp.py)	(revision 402926738e7394ee2d3dc7add2e6d755f06a289d)
@@ -30,8 +30,11 @@
             if args.source_dir is not None:
                 os.makedirs(args.source_dir, exist_ok=True)
             if args.device_name is not None:
-                msg_cpp.write_msg_defs_header(f"{args.device_name}", args.header_dir, args.namespace, args.proto)
-                msg_cpp.write_msg_defs_source(f"{args.device_name}", args.source_dir, args.namespace, args.proto)
+                msg_cpp.write_msg_defs_header(f"{args.device_name}", args.header_dir, args.namespace)
+                msg_cpp.write_msg_defs_source(f"{args.device_name}", args.source_dir, args.namespace)
+                if args.proto:
+                    msg_cpp.write_msg_proto_utils_header(f"{args.device_name}", args.header_dir, args.namespace)
+                    msg_cpp.write_msg_proto_utils_source(f"{args.device_name}", args.source_dir, args.namespace)
         except Exception as e:
             print('Error: %s' % e)
             sys.exit(1)