Index: scripts/MsgUtils/GenerateMsgDefsCpp.py
===================================================================
diff -u -rfd9c43b00259567ff49a3d9b31b98df75b47bc52 -ra52c25b8231e90a9de0421db171cde2336007733
--- scripts/MsgUtils/GenerateMsgDefsCpp.py	(.../GenerateMsgDefsCpp.py)	(revision fd9c43b00259567ff49a3d9b31b98df75b47bc52)
+++ scripts/MsgUtils/GenerateMsgDefsCpp.py	(.../GenerateMsgDefsCpp.py)	(revision a52c25b8231e90a9de0421db171cde2336007733)
@@ -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)